reorder shard lock

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jul 8, 2024 · a044d91 · a044d91
1 parent b21725b
commit a044d91
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go
@@ -707,13 +707,6 @@ func (tm *TabletManager) setReplicationSourceRepairReplication(ctx context.Conte
 		return err
 	}
 
-	ctx, unlock, lockErr := tm.TopoServer.LockShard(ctx, parent.Tablet.GetKeyspace(), parent.Tablet.GetShard(), fmt.Sprintf("repairReplication to %v as parent)", topoproto.TabletAliasString(parentAlias)))
-	if lockErr != nil {
-		return lockErr
-	}
-
-	defer unlock(&err)
-
 	currentPrimary, err := tm.TopoServer.GetTablet(ctx, parentAlias)
 	if err != nil {
 		return vterrors.Wrapf(err, "cannot read primary tablet %v", parentAlias)
@@ -736,6 +729,13 @@ func (tm *TabletManager) setReplicationSourceRepairReplication(ctx context.Conte
 		return err
 	}
 
+	ctx, unlock, lockErr := tm.TopoServer.LockShard(ctx, parent.Tablet.GetKeyspace(), parent.Tablet.GetShard(), fmt.Sprintf("repairReplication to %v as parent)", topoproto.TabletAliasString(parentAlias)))
+	if lockErr != nil {
+		return lockErr
+	}
+
+	defer unlock(&err)
+
 	return tm.setReplicationSourceLocked(ctx, parentAlias, timeCreatedNS, waitPosition, forceStartReplication, semiSyncAction)
 }