[PLAT-16250] Retry of edit universe blacklists the already added or j…

…oined tservers

Summary: By the time a new tserver is started, it is already blacklisted. This state is used to not blacklist the node again on retry if it is already started.

Test Plan:
Manually tested by aborting and retrying the task at
1. Before blacklisting.
2. After blacklisting but before it is removed from the blacklist.
3. Retry to have it removed from the blacklist.

Reviewers: cwang, yshchetinin, sanketh

Reviewed By: cwang

Subscribers: yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D40738

managed/src/main/java/com/yugabyte/yw/commissioner/tasks/EditUniverseTaskBase.java

@@ -2,6 +2,7 @@
 package com.yugabyte.yw.commissioner.tasks;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
 import com.yugabyte.yw.commissioner.BaseTaskDependencies;
 import com.yugabyte.yw.commissioner.TaskExecutor;
 import com.yugabyte.yw.commissioner.UpgradeTaskBase;
@@ -26,6 +27,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -282,11 +284,19 @@ protected void editCluster(
 
     Set<NodeDetails> newTservers = PlacementInfoUtil.getTserversToProvision(nodes);
     if (!newTservers.isEmpty()) {
-      // Blacklist all the new tservers before starting so that they do not join.
-      // Idempotent as same set of servers are blacklisted.
-      createModifyBlackListTask(
-              newTservers /* addNodes */, null /* removeNodes */, false /* isLeaderBlacklist */)
-          .setSubTaskGroupType(SubTaskGroupType.ConfigureUniverse);
+      Set<NodeDetails> nonLiveNewTservers =
+          isFirstTry()
+              ? newTservers
+              : new HashSet<>(Sets.difference(newTservers, getLiveTserverNodes(universe)));
+      if (!nonLiveNewTservers.isEmpty()) {
+        // Blacklist all the new stopped tservers before starting so that they do not join.
+        // Idempotent as same set of servers are blacklisted.
+        createModifyBlackListTask(
+                nonLiveNewTservers /* addNodes */,
+                null /* removeNodes */,
+                false /* isLeaderBlacklist */)
+            .setSubTaskGroupType(SubTaskGroupType.ConfigureUniverse);
+      }
 
       // Make sure clock skew is low enough.
       createWaitForClockSyncTasks(universe, newTservers)

managed/src/test/java/com/yugabyte/yw/commissioner/tasks/EditUniverseTest.java

@@ -64,6 +64,7 @@
 import org.yb.client.ChangeMasterClusterConfigResponse;
 import org.yb.client.GetLoadMovePercentResponse;
 import org.yb.client.GetMasterClusterConfigResponse;
+import org.yb.client.ListLiveTabletServersResponse;
 import org.yb.client.ListMasterRaftPeersResponse;
 import org.yb.client.ListTabletServersResponse;
 import org.yb.master.CatalogEntityInfo;
@@ -218,9 +219,12 @@ public void setUp() {
       when(mockClient.waitForAreLeadersOnPreferredOnlyCondition(anyLong())).thenReturn(true);
       mockClockSyncResponse(mockNodeUniverseManager);
       mockLocaleCheckResponse(mockNodeUniverseManager);
-
       when(mockClient.getLoadMoveCompletion())
           .thenReturn(new GetLoadMovePercentResponse(0, "", 100.0, 0, 0, null));
+      ListLiveTabletServersResponse mockListLiveTabletServersResponse =
+          mock(ListLiveTabletServersResponse.class);
+      when(mockListLiveTabletServersResponse.getTabletServers()).thenReturn(new ArrayList<>());
+      when(mockClient.listLiveTabletServers()).thenReturn(mockListLiveTabletServersResponse);
     } catch (Exception e) {
       fail();
     }