Merge pull request 'ceph: add initial ceph support. reading and writing m/ceph.conf' (#9)

Reviewed-on: #9

go.mod

@@ -3,7 +3,7 @@ module git.jpi.io/amery/jpictl
 go 1.19
 
 require (
-	asciigoat.org/ini v0.2.4
+	asciigoat.org/ini v0.2.5
 	darvaza.org/core v0.9.8
 	darvaza.org/resolver v0.5.4
 	darvaza.org/sidecar v0.0.2

go.sum

@@ -1,7 +1,7 @@
 asciigoat.org/core v0.3.9 h1:hgDDz4ecm3ZvehX++m8A/IzAt+B5oDPiRtxatzfUHPQ=
 asciigoat.org/core v0.3.9/go.mod h1:CAaHwyw8MpAq4a1MYtN2dxJrsK+hmIdW50OndaQZYPI=
-asciigoat.org/ini v0.2.4 h1:fTswCCBle65kTq9AuyN7q7RjYJ5sVTxi9zCAKWSbP6A=
+asciigoat.org/ini v0.2.5 h1:4gRIp9rU+XQt8+HMqZO5R7GavMv9Yl2+N+je6djDIAE=
-asciigoat.org/ini v0.2.4/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
+asciigoat.org/ini v0.2.5/go.mod h1:gmXzJ9XFqf1NLk5nQkj04USQ4tMtdRJHNQX6vp3DzjU=
 darvaza.org/core v0.9.8 h1:luLxgfUc2pzuusYPo/Z/dC/qr9XZPKpSQw8/kS7zNUM=
 darvaza.org/core v0.9.8/go.mod h1:Dbme64naxeshQfxcVJX9ZT7AiGyIY8kldfuELVtf8mw=
 darvaza.org/resolver v0.5.4 h1:dlSBNV14yYsp7Kg7ipwYOMNsLbrpeXa8Z0HBTa0Ryxs=

pkg/ceph/config.go

@@ -1,8 +1,11 @@
 package ceph
 
 import (
+	"bytes"
+	"fmt"
 	"io"
 	"net/netip"
+	"strings"
 
 	"github.com/gofrs/uuid/v5"
 
@@ -17,11 +20,37 @@ type Config struct {
 // GlobalConfig represents the [global] section of a ceph.conf file
 type GlobalConfig struct {
 	FSID           uuid.UUID    `ini:"fsid"`
-	Monitors       []string     `ini:"mon_host,comma"`
+	Monitors       []string     `ini:"mon_initial_members,comma"`
-	MonitorsAddr   []netip.Addr `ini:"mon_initial_members,comma"`
+	MonitorsAddr   []netip.Addr `ini:"mon_host,comma"`
 	ClusterNetwork netip.Prefix `ini:"cluster_network"`
 }
 
+// WriteTo writes a Wireguard [Config] onto the provided [io.Writer]
+func (cfg *Config) WriteTo(w io.Writer) (int64, error) {
+	var buf bytes.Buffer
+
+	writeGlobalToBuffer(&buf, &cfg.Global)
+	return buf.WriteTo(w)
+}
+
+func writeGlobalToBuffer(w *bytes.Buffer, c *GlobalConfig) {
+	_, _ = w.WriteString("[global]\n")
+	_, _ = fmt.Fprintf(w, "%s = %s\n", "fsid", c.FSID.String())
+	_, _ = fmt.Fprintf(w, "%s = %s\n", "mon_initial_members", strings.Join(c.Monitors, ", "))
+	_, _ = fmt.Fprintf(w, "%s = %s\n", "mon_host", joinAddrs(c.MonitorsAddr, ", "))
+	_, _ = fmt.Fprintf(w, "%s = %s\n", "cluster_network", c.ClusterNetwork.String())
+}
+
+func joinAddrs(addrs []netip.Addr, sep string) string {
+	s := make([]string, len(addrs))
+
+	for i, addr := range addrs {
+		s[i] = addr.String()
+	}
+
+	return strings.Join(s, sep)
+}
+
 // NewConfigFromReader parses the ceph.conf file
 func NewConfigFromReader(r io.Reader) (*Config, error) {
 	doc, err := basic.Decode(r)

pkg/ceph/config_parser.go

@@ -43,6 +43,8 @@ func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
 	// revive:enable:cyclomatic
 	// revive:enable:cognitive-complexity
 
+	// TODO: refactor when asciigoat's ini parser learns to do reflection
+
 	switch field.Key {
 	case "fsid":
 		if !core.IsZero(cfg.FSID) {

pkg/zones/ceph.go

@@ -2,6 +2,7 @@ package zones
 
 import (
 	"bytes"
+	"net/netip"
 	"sort"
 
 	"darvaza.org/core"
@@ -30,6 +31,48 @@ func (m *Zones) GetCephConfig() (*ceph.Config, error) {
 	return ceph.NewConfigFromReader(r)
 }
 
+// WriteCephConfig writes the ceph.conf file
+func (m *Zones) WriteCephConfig(cfg *ceph.Config) error {
+	f, err := m.CreateTruncFile("ceph.conf")
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	_, err = cfg.WriteTo(f)
+	return err
+}
+
+// GenCephConfig prepares a ceph.Config using the cluster information
+func (m *Zones) GenCephConfig() (*ceph.Config, error) {
+	fsid, err := m.GetCephFSID()
+	if err != nil {
+		return nil, err
+	}
+
+	cfg := &ceph.Config{
+		Global: ceph.GlobalConfig{
+			FSID: fsid,
+			ClusterNetwork: netip.PrefixFrom(
+				netip.AddrFrom4([4]byte{10, 0, 0, 0}),
+				8,
+			),
+		},
+	}
+
+	m.ForEachZone(func(z *Zone) bool {
+		for _, p := range z.GetCephMonitors() {
+			addr, _ := RingOneAddress(z.ID, p.ID)
+
+			cfg.Global.Monitors = append(cfg.Global.Monitors, p.Name)
+			cfg.Global.MonitorsAddr = append(cfg.Global.MonitorsAddr, addr)
+		}
+		return false
+	})
+
+	return cfg, nil
+}
+
 // GetCephMonitors returns the set of Ceph monitors on
 // the zone
 func (z *Zone) GetCephMonitors() Machines {

pkg/zones/ceph_scan.go

@@ -53,7 +53,7 @@ func (err CephMissingMonitorError) Error() string {
 
 func (err *CephMissingMonitorError) writeNames(w *strings.Builder) {
 	if len(err.Names) > 0 {
-		_, _ = w.WriteString(" mon_host:")
+		_, _ = w.WriteString(" mon_initial_members:")
 		for i, name := range err.Names {
 			if i != 0 {
 				_, _ = w.WriteRune(',')
@@ -64,12 +64,14 @@ func (err *CephMissingMonitorError) writeNames(w *strings.Builder) {
 }
 
 func (err *CephMissingMonitorError) writeAddrs(w *strings.Builder) {
-	_, _ = w.WriteString(" mon_initial_members:")
+	if len(err.Addrs) > 0 {
-	for i, addr := range err.Addrs {
+		_, _ = w.WriteString(" mon_host:")
-		if i != 0 {
+		for i, addr := range err.Addrs {
-			_, _ = w.WriteRune(',')
+			if i != 0 {
+				_, _ = w.WriteRune(',')
+			}
+			_, _ = w.WriteString(addr.String())
 		}
-		_, _ = w.WriteString(addr.String())
 	}
 }
 
@@ -157,14 +159,19 @@ func (m *Zones) scanCephMonitors(_ *ScanOptions) error {
 		return err
 	}
 
-	// flag monitors based on config
+	if cfg != nil {
-	todo := newCephScanTODO(cfg)
+		// store FSID
-	m.ForEachMachine(func(p *Machine) bool {
+		m.CephFSID = cfg.Global.FSID
-		p.CephMonitor = todo.checkMachine(p)
+
-		return false
+		// flag monitors based on config
-	})
+		todo := newCephScanTODO(cfg)
-	if err := todo.Missing(); err != nil {
+		m.ForEachMachine(func(p *Machine) bool {
-		return core.Wrap(err, "ceph")
+			p.CephMonitor = todo.checkMachine(p)
+			return false
+		})
+		if err := todo.Missing(); err != nil {
+			return core.Wrap(err, "ceph")
+		}
 	}
 
 	// make sure every zone has one

pkg/zones/sync.go

@@ -4,6 +4,7 @@ package zones
 func (m *Zones) SyncAll() error {
 	for _, fn := range []func() error{
 		m.SyncAllWireguard,
+		m.SyncAllCeph,
 	} {
 		if err := fn(); err != nil {
 			return err
@@ -31,3 +32,13 @@ func (m *Zones) SyncAllWireguard() error {
 
 	return nil
 }
+
+// SyncAllCeph updates the ceph.conf file
+func (m *Zones) SyncAllCeph() error {
+	cfg, err := m.GenCephConfig()
+	if err != nil {
+		return err
+	}
+
+	return m.WriteCephConfig(cfg)
+}