diff --git a/internal/controller/node/plan_execution_integration_test.go b/internal/controller/node/plan_execution_integration_test.go index e97899c..d415142 100644 --- a/internal/controller/node/plan_execution_integration_test.go +++ b/internal/controller/node/plan_execution_integration_test.go @@ -95,6 +95,7 @@ func TestIntegrationFullProgressionSnapshotMode(t *testing.T) { driveTask(t, g, r, mock, fetch, planner.TaskConfigureGenesis) driveTask(t, g, r, mock, fetch, planner.TaskConfigApply) + driveTask(t, g, r, mock, fetch, planner.TaskConfigureStateSync) driveTask(t, g, r, mock, fetch, planner.TaskConfigValidate) driveTask(t, g, r, mock, fetch, planner.TaskMarkReady) diff --git a/internal/controller/node/plan_execution_test.go b/internal/controller/node/plan_execution_test.go index e471772..c5aab73 100644 --- a/internal/controller/node/plan_execution_test.go +++ b/internal/controller/node/plan_execution_test.go @@ -262,7 +262,7 @@ func TestBuildPlan_Snapshot(t *testing.T) { p, _ := planner.ForNode(snapshotNode()) plan := mustBuildPlan(t, p, snapshotNode()) got := taskTypes(plan) - want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskConfigValidate, planner.TaskMarkReady} + want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskConfigureStateSync, planner.TaskConfigValidate, planner.TaskMarkReady} assertProgression(t, got, want) } @@ -274,7 +274,7 @@ func TestBuildPlan_SnapshotWithPeers(t *testing.T) { p, _ := planner.ForNode(node) plan := mustBuildPlan(t, p, node) got := taskTypes(plan) - want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskDiscoverPeers, planner.TaskConfigValidate, planner.TaskMarkReady} + want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskDiscoverPeers, planner.TaskConfigureStateSync, planner.TaskConfigValidate, planner.TaskMarkReady} assertProgression(t, got, want) } @@ -311,7 +311,7 @@ func TestBuildPlan_Replayer(t *testing.T) { p, _ := planner.ForNode(node) plan := mustBuildPlan(t, p, node) got := taskTypes(plan) - want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskDiscoverPeers, planner.TaskConfigValidate, planner.TaskMarkReady} + want := []string{planner.TaskSnapshotRestore, planner.TaskConfigureGenesis, planner.TaskConfigApply, planner.TaskDiscoverPeers, planner.TaskConfigureStateSync, planner.TaskConfigValidate, planner.TaskMarkReady} assertProgression(t, got, want) } @@ -330,8 +330,8 @@ func TestBuildPlanPhaseAndTasks(t *testing.T) { if plan.Phase != seiv1alpha1.TaskPlanActive { t.Errorf("phase = %q, want Active", plan.Phase) } - if len(plan.Tasks) != 5 { - t.Fatalf("expected 5 tasks, got %d: %v", len(plan.Tasks), taskTypes(plan)) + if len(plan.Tasks) != 6 { + t.Fatalf("expected 6 tasks, got %d: %v", len(plan.Tasks), taskTypes(plan)) } for _, pt := range plan.Tasks { if pt.Status != seiv1alpha1.TaskPending { diff --git a/internal/planner/bootstrap.go b/internal/planner/bootstrap.go index 55f0a9e..0173cb9 100644 --- a/internal/planner/bootstrap.go +++ b/internal/planner/bootstrap.go @@ -89,7 +89,7 @@ func buildBootstrapProgression(peers []seiv1alpha1.PeerSource, snap *seiv1alpha1 if len(peers) > 0 { prog = insertBefore(prog, TaskConfigValidate, TaskDiscoverPeers) } - if hasStateSync(snap) { + if snap != nil { prog = insertBefore(prog, TaskConfigValidate, TaskConfigureStateSync) } diff --git a/internal/planner/planner.go b/internal/planner/planner.go index 8a14f84..793e85a 100644 --- a/internal/planner/planner.go +++ b/internal/planner/planner.go @@ -248,7 +248,7 @@ func buildBasePlan( if len(peers) > 0 { prog = insertBefore(prog, TaskConfigValidate, TaskDiscoverPeers) } - if hasStateSync(snap) { + if snap != nil { prog = insertBefore(prog, TaskConfigValidate, TaskConfigureStateSync) } diff --git a/manifests/samples/seinode/pacific-1-shadow-replayer.yaml b/manifests/samples/seinode/pacific-1-shadow-replayer.yaml index efd89dc..5a2101e 100644 --- a/manifests/samples/seinode/pacific-1-shadow-replayer.yaml +++ b/manifests/samples/seinode/pacific-1-shadow-replayer.yaml @@ -39,4 +39,4 @@ spec: bootstrapImage: "ghcr.io/sei-protocol/sei:v6.3.0" trustPeriod: "9999h0m0s" resultExport: - canonicalRpc: "http://pacific-1-archive-0.pacific-1-archive.default.svc.cluster.local:26657" + canonicalRpc: "http://rpc.pacific-1.prod.platform.sei.io:26657"