Debug logging for flake hunting

Signed-off-by: Matt Lord <[email protected]>
vitessio · Mar 27, 2024 · d65c345 · d65c345
1 parent 2f066de
commit d65c345
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/go/test/endtoend/vreplication/helper_test.go b/go/test/endtoend/vreplication/helper_test.go
@@ -368,6 +368,7 @@ func waitForWorkflowState(t *testing.T, vc *VitessCluster, ksWorkflow string, wa
 					streamInfos.ForEach(func(attributeKey, attributeValue gjson.Result) bool { // for each attribute in the stream
 						// we need to wait for all streams to have the desired state
 						state = attributeValue.Get("State").String()
+						t.Logf("Workflow %s, on %s, state: %s", ksWorkflow, tabletId.String(), state)
 						if state == wantState {
 							for i := 0; i < len(fieldEqualityChecks); i++ {
 								if kvparts := strings.Split(fieldEqualityChecks[i], "=="); len(kvparts) == 2 {
@@ -379,6 +380,9 @@ func waitForWorkflowState(t *testing.T, vc *VitessCluster, ksWorkflow string, wa
 									}
 								}
 							}
+							if wantState == binlogdatapb.VReplicationWorkflowState_Running.String() && attributeValue.Get("Pos").String() == "" {
+								done = false
+							}
 						} else {
 							done = false
 						}

diff --git a/go/test/endtoend/vreplication/resharding_workflows_v2_test.go b/go/test/endtoend/vreplication/resharding_workflows_v2_test.go
@@ -446,9 +446,6 @@ func testReshardV2Workflow(t *testing.T) {
 
 	createAdditionalCustomerShards(t, "-40,40-80,80-c0,c0-")
 	createReshardWorkflow(t, "-80,80-", "-40,40-80,80-c0,c0-")
-	if !strings.Contains(lastOutput, "Status: Running") {
-		t.Fail()
-	}
 	validateReadsRouteToSource(t, "replica")
 	validateWritesRouteToSource(t)
 
@@ -473,7 +470,6 @@ func testMoveTablesV2Workflow(t *testing.T) {
 	// The purge table should get skipped/ignored
 	// If it's not then we'll get an error as the table doesn't exist in the vschema
 	createMoveTablesWorkflow(t, "customer,loadtest,vdiff_order,reftable,_vt_PURGE_4f9194b43b2011eb8a0104ed332e05c2_20221210194431")
-	require.Contains(t, lastOutput, "Status: Running")
 	waitForWorkflowState(t, vc, ksWorkflow, binlogdatapb.VReplicationWorkflowState_Running.String())
 	validateReadsRouteToSource(t, "replica")
 	validateWritesRouteToSource(t)

diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go
@@ -3285,10 +3285,14 @@ func (s *Server) canSwitch(ctx context.Context, ts *trafficSwitcher, state *Stat
 		log.Infof("writes already switched no need to check lag")
 		return "", nil
 	}
+	ts.Logger().Infof("Checking if we can switch traffic for workflow %s.%s with starting state: %s",
+		state.TargetKeyspace, state.Workflow, state.String())
 	wf, err := s.GetWorkflow(ctx, state.TargetKeyspace, state.Workflow, false, shards)
 	if err != nil {
 		return "", err
 	}
+	ts.Logger().Infof("Checking if we can switch traffic for workflow %s.%s with GetWorkflow result: %+v",
+		state.TargetKeyspace, state.Workflow, wf)
 	for _, stream := range wf.ShardStreams {
 		for _, st := range stream.GetStreams() {
 			if st.Message == Frozen {