Fix conflicts

Signed-off-by: Rohit Nayak <rohit@planetscale.com>

go/vt/vtctl/workflow/server.go

@@ -3271,20 +3271,6 @@ func (s *Server) switchWrites(ctx context.Context, req *vtctldatapb.WorkflowSwit
 				time.Sleep(lockTablesCycleDelay)
 			}
 		}
-<<<<<<< HEAD
-
-=======
-		// Get the source positions now that writes are stopped, the streams were stopped (e.g.
-		// intra-keyspace materializations that write on the source), and we know for certain
-		// that any in progress writes are done.
-		if err := ts.gatherSourcePositions(ctx); err != nil {
-			return handleError("failed to gather replication positions on migration sources", err)
-		}
-
-		if err := confirmKeyspaceLocksHeld(); err != nil {
-			return handleError("locks were lost", err)
-		}
->>>>>>> 70114ad687 (Multi-tenant workflow SwitchWrites: Don't add denied tables on cancelMigration() (#17782))
 		ts.Logger().Infof("Waiting for streams to catchup")
 		if err := sw.waitForCatchup(ctx, timeout); err != nil {
 			if cerr := sw.cancelMigration(ctx, sm); cerr != nil {

go/vt/vtctl/workflow/traffic_switcher.go

@@ -1017,16 +1017,8 @@ func (ts *trafficSwitcher) cancelMigration(ctx context.Context, sm *StreamMigrat
 	defer cmCancel()
 
 	if ts.MigrationType() == binlogdatapb.MigrationType_TABLES {
-<<<<<<< HEAD
+		ts.Logger().Infof("cancelMigration (%v): allowing writes on source tables", ts.WorkflowName())
 		err = ts.changeTableSourceWrites(cmCtx, allowWrites)
-=======
-		if !ts.IsMultiTenantMigration() {
-			ts.Logger().Infof("cancelMigration (%v): adding denied tables to target", ts.WorkflowName())
-			err = ts.switchDeniedTables(cmCtx, true /* revert */)
-		} else {
-			ts.Logger().Infof("cancelMigration (%v): multi-tenant, not adding denied tables to target", ts.WorkflowName())
-		}
->>>>>>> 70114ad687 (Multi-tenant workflow SwitchWrites: Don't add denied tables on cancelMigration() (#17782))
 	} else {
 		ts.Logger().Infof("cancelMigration (%v): allowing writes on source shards", ts.WorkflowName())
 		err = ts.changeShardsAccess(cmCtx, ts.SourceKeyspaceName(), ts.SourceShards(), allowWrites)

go/vt/vttablet/tabletmanager/vreplication/controller.go

@@ -95,13 +95,9 @@ func newController(ctx context.Context, params map[string]string, dbClientFactor
 	}
 	ct.id = int32(id)
 	ct.workflow = params["workflow"]
-<<<<<<< HEAD
-	ct.lastWorkflowError = vterrors.NewLastError(fmt.Sprintf("VReplication controller %d for workflow %q", ct.id, ct.workflow), maxTimeToRetryError)
-=======
 	log.Infof("creating controller with id: %v, name: %v, cell: %v, tabletTypes: %v", ct.id, ct.workflow, cell, tabletTypesStr)
 
-	ct.lastWorkflowError = vterrors.NewLastError(fmt.Sprintf("VReplication controller %d for workflow %q", ct.id, ct.workflow), workflowConfig.MaxTimeToRetryError)
->>>>>>> 70114ad687 (Multi-tenant workflow SwitchWrites: Don't add denied tables on cancelMigration() (#17782))
+	ct.lastWorkflowError = vterrors.NewLastError(fmt.Sprintf("VReplication controller %d for workflow %q", ct.id, ct.workflow), maxTimeToRetryError)
 
 	state := params["state"]
 	blpStats.State.Store(state)

go/vt/vttablet/tabletmanager/vreplication/vplayer.go

@@ -112,13 +112,6 @@ func newVPlayer(vr *vreplicator, settings binlogplayer.VRSettings, copyState map
 		settings.StopPos = pausePos
 		saveStop = false
 	}
-<<<<<<< HEAD
-
-=======
-	log.Infof("Starting VReplication player id: %v, name: %v, startPos: %v, stop: %v", vr.id, vr.WorkflowName, settings.StartPos, settings.StopPos)
-	log.V(2).Infof("Starting VReplication player id: %v, startPos: %v, stop: %v, filter: %+v",
-		vr.id, settings.StartPos, settings.StopPos, vr.source.Filter)
->>>>>>> 70114ad687 (Multi-tenant workflow SwitchWrites: Don't add denied tables on cancelMigration() (#17782))
 	queryFunc := func(ctx context.Context, sql string) (*sqltypes.Result, error) {
 		return vr.dbClient.ExecuteWithRetry(ctx, sql)
 	}