ceph: generate fsid if needed, and export FSID on env #10

Merged
amery merged 3 commits from pr-amery-ceph-fsid into main 1 year ago
  1. 1
      .vscode/settings.json
  2. 6
      cmd/jpictl/env.go
  3. 8
      pkg/zones/ceph.go
  4. 20
      pkg/zones/env.go

1
.vscode/settings.json vendored

@ -2,6 +2,7 @@
"cSpell.words": [
"ceph",
"darvaza",
"gofrs",
"jpictl",
"zerolog"
]

6
cmd/jpictl/env.go

@ -16,7 +16,11 @@ var envCmd = &cobra.Command{
return err
}
_, err = m.Env(*envExport).WriteTo(os.Stdout)
env, err := m.Env(*envExport)
if err != nil {
return err
}
_, err = env.WriteTo(os.Stdout)
return err
},
}

8
pkg/zones/ceph.go

@ -14,8 +14,12 @@ import (
// GetCephFSID returns our Ceph's FSID
func (m *Zones) GetCephFSID() (uuid.UUID, error) {
if core.IsZero(m.CephFSID) {
// TODO: generate one
return uuid.Nil, nil
// generate one
v, err := uuid.NewV4()
if err != nil {
return uuid.Nil, err
}
m.CephFSID = v
}
return m.CephFSID, nil
}

20
pkg/zones/env.go

@ -11,15 +11,24 @@ import (
type Env struct {
ZoneIterator
export bool
cephFSID string
export bool
}
// Env returns a shell environment factory
func (m *Zones) Env(export bool) *Env {
return &Env{
func (m *Zones) Env(export bool) (*Env, error) {
fsid, err := m.GetCephFSID()
if err != nil {
return nil, err
}
env := &Env{
ZoneIterator: m,
cephFSID: fsid.String(),
export: export,
}
return env, nil
}
// Zones returns the list of Zone IDs
@ -38,7 +47,12 @@ func (m *Env) Zones() []int {
func (m *Env) WriteTo(w io.Writer) (int64, error) {
var buf bytes.Buffer
if m.cephFSID != "" {
m.writeEnvVar(&buf, m.cephFSID, "FSID")
}
m.writeEnvVarInts(&buf, m.Zones(), "ZONES")
m.ForEachZone(func(z *Zone) bool {
m.writeEnvZone(&buf, z)
return false

Loading…
Cancel
Save