dev: wait for all nodes in cluster

Altinity · Nov 28, 2024 · f97edd2 · f97edd2
1 parent 7ae82ad
commit f97edd2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/pkg/apis/clickhouse.altinity.com/v1/type_host.go b/pkg/apis/clickhouse.altinity.com/v1/type_host.go
@@ -603,3 +603,14 @@ func (host *Host) IsZero() bool {
 func (host *Host) IsNonZero() bool {
 	return host != nil
 }
+
+func (host *Host) ShouldIncludeIntoCluster() bool {
+	switch {
+	case host.IsStopped():
+		return false
+	case host.GetCluster().HostsCount() < 2:
+		return false
+	default:
+		return true
+	}
+}
diff --git a/pkg/controller/chi/worker-chi-reconciler.go b/pkg/controller/chi/worker-chi-reconciler.go
@@ -235,6 +235,15 @@ func (w *worker) reconcileCRAuxObjectsFinal(ctx context.Context, cr *api.ClickHo
 	cr.GetRuntime().LockCommonConfig()
 	err = w.reconcileConfigMapCommon(ctx, cr)
 	cr.GetRuntime().UnlockCommonConfig()
+
+	// Wait for all hosts to be included into cluster
+	cr.WalkHosts(func(host *api.Host) error {
+		if host.ShouldIncludeIntoCluster() {
+			_ = w.waitHostInCluster(ctx, host)
+		}
+		return nil
+	})
+
 	return err
 }