From 173dba0c3b0c47c184b028cf40364cff7b08f243 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 2 Mar 2024 22:17:15 +0000 Subject: [PATCH] cluster: decouple getRegion() from finishRegion() Signed-off-by: Alejandro Mery --- pkg/cluster/regions.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/regions.go b/pkg/cluster/regions.go index 03ac85e..509720e 100644 --- a/pkg/cluster/regions.go +++ b/pkg/cluster/regions.go @@ -168,7 +168,7 @@ func (m *Cluster) finishRegion(r *Region) { r.m = m sub := []string{} for _, name := range r.Regions { - r2, ok := m.getRegion(name) + r2, ok := m.getFinishRegion(name) if !ok { m.warn(nil).WithField("region", name).Print("unknown region") continue @@ -183,9 +183,7 @@ func (m *Cluster) finishRegion(r *Region) { func (m *Cluster) getRegion(name string) (*Region, bool) { for i := range m.Regions { r := &m.Regions[i] - if name == r.Name { - m.finishRegion(r) return r, true } } @@ -193,6 +191,15 @@ func (m *Cluster) getRegion(name string) (*Region, bool) { return nil, false } +func (m *Cluster) getFinishRegion(name string) (*Region, bool) { + if r, ok := m.getRegion(name); ok { + m.finishRegion(r) + return r, true + } + + return nil, false +} + // SyncRegions writes to the file system the regions this [Zone] // belongs to. func (z *Zone) SyncRegions() error {