cluster: pre-compute Zone's primary region

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/cluster/env.go

@@ -163,18 +163,10 @@ func genEnvZoneNodes(z *Zone) string {
 }
 
 func genEnvZoneRegion(z *Zone) string {
-	var region string
+	if z != nil && z.region != nil {
-
+		return z.region.Name
-	z.ForEachRegion(func(r *Region) bool {
+	}
-		if r.IsPrimary() {
+	return ""
-			region = r.Name
-			return true
-		}
-
-		return false
-	})
-
-	return region
 }
 
 func genEnvZoneCephMonNames(m Machines) string {

pkg/cluster/regions.go

@@ -102,6 +102,7 @@ func (m *Cluster) initRegions(_ *ScanOptions) error {
 
 	m.sortRegions()
 	m.scanRegionID()
+	m.computeZonesRegion()
 	return nil
 }
 
@@ -277,6 +278,35 @@ func (m *Cluster) scanRegionID() {
 	}
 }
 
+func (m *Cluster) computeZonesRegion() {
+	fn := func(r *Region, z *Zone) {
+		if z.region != nil {
+			m.error(nil).
+				WithField("zone", z.Name).
+				WithField("region", []string{
+					z.region.Name,
+					r.Name,
+				}).
+				Print("zone in two regions")
+		} else {
+			z.region = r
+		}
+	}
+
+	m.ForEachRegion(func(r *Region) bool {
+		var term bool
+
+		if r.IsPrimary() {
+			r.ForEachZone(func(z *Zone) bool {
+				fn(r, z)
+				return term
+			})
+		}
+
+		return term
+	})
+}
+
 func (m *Cluster) getRegion(name string) (*Region, bool) {
 	for i := range m.Regions {
 		r := &m.Regions[i]

pkg/cluster/zones.go

@@ -19,6 +19,7 @@ type ZoneIterator interface {
 // affinity.
 type Zone struct {
 	zones  *Cluster
+	region *Region
 	logger `json:"-" yaml:"-"`
 
 	ID      rings.ZoneID