amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zones: extend scan to ensure every zone has a ceph monitor

Browse Source 
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
Alejandro Mery
2023-09-05 11:03:53 +00:00
parent b772ec0a3d
commit cea8362fe6
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/zones/ceph_scan.go
+13 -6
View File
@@ -53,7 +53,7 @@ func (err CephMissingMonitorError) Error() string {
func (err *CephMissingMonitorError) writeNames(w *strings.Builder) { func (err *CephMissingMonitorError) writeNames(w *strings.Builder) {
if len(err.Names) > 0 { if len(err.Names) > 0 {
_, _ = w.WriteString(" mon_host:") _, _ = w.WriteString(" mon_initial_members:")
for i, name := range err.Names { for i, name := range err.Names {
if i != 0 { if i != 0 {
_, _ = w.WriteRune(',') _, _ = w.WriteRune(',')
@@ -64,12 +64,14 @@ func (err *CephMissingMonitorError) writeNames(w *strings.Builder) {
} }
func (err *CephMissingMonitorError) writeAddrs(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())
} }
} }
@@ -172,5 +174,10 @@ func (m *Zones) scanCephMonitors(_ *ScanOptions) error {
} }
} }
// make sure every zone has one
m.ForEachZone(func(z *Zone) bool {
_ = z.GetCephMonitors()
return false
})
return nil return nil
} }