From a016515915268ac93f6d72e49f6da075a1c2715d Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Wed, 12 Feb 2025 15:36:47 -0500 Subject: [PATCH] Fix dropTargets Signed-off-by: Matt Lord --- go/vt/vtctl/workflow/server.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/go/vt/vtctl/workflow/server.go b/go/vt/vtctl/workflow/server.go index a5f9e23da45..e6a241659ed 100644 --- a/go/vt/vtctl/workflow/server.go +++ b/go/vt/vtctl/workflow/server.go @@ -1948,15 +1948,13 @@ func (s *Server) dropTargets(ctx context.Context, ts *trafficSwitcher, keepData, } // Lock the target keyspace. - if ts.TargetKeyspaceName() != ts.SourceKeyspaceName() { - lockCtx, targetUnlock, lockErr := sw.lockKeyspace(ctx, ts.TargetKeyspaceName(), "DropTargets") - if lockErr != nil { - return defaultErrorHandler(ts.Logger(), fmt.Sprintf("failed to lock the %s keyspace", ts.TargetKeyspaceName()), - lockErr) - } - defer targetUnlock(&err) - ctx = lockCtx + lockCtx, targetUnlock, lockErr := sw.lockKeyspace(ctx, ts.TargetKeyspaceName(), "DropTargets") + if lockErr != nil { + return defaultErrorHandler(ts.Logger(), fmt.Sprintf("failed to lock the %s keyspace", ts.TargetKeyspaceName()), + lockErr) } + defer targetUnlock(&err) + ctx = lockCtx // Stop the workflow before we delete the artifacts so that it doesn't try and // continue doing work, and producing errors, as we delete the related artifacts.