[PLAT-13827][PLAT-13933]Software installation must be skipped if a ma…

…ster node is already configured on retry and Start node uses the wrong flag to check if ysql is enabled Summary: Install software for master only if it is not yet configured. Test Plan: Trivial change + itests Reviewers: cwang, sanketh, yshchetinin Reviewed By: cwang Subscribers: yugaware Differential Revision: https://phorge.dev.yugabyte.com/D34961
yugabyte · May 11, 2024 · 7c9b8d5 · 7c9b8d5
1 parent b430fa3
commit 7c9b8d5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/StartNodeInUniverse.java b/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/StartNodeInUniverse.java
@@ -152,7 +152,7 @@ public void run() {
         createConfigureServerTasks(nodeCollection, params -> params.updateMasterAddrsOnly = true)
             .setSubTaskGroupType(SubTaskGroupType.StartingNodeProcesses);
         // Start tservers on tserver nodes.
-        createStartTserverProcessTasks(nodeCollection, cluster.userIntent.isYSQLAuthEnabled());
+        createStartTserverProcessTasks(nodeCollection, cluster.userIntent.enableYSQL);
 
         if (followerLagCheckEnabled) {
           createCheckFollowerLagTask(currentNode, ServerType.TSERVER)

diff --git a/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/UniverseDefinitionTaskBase.java b/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/UniverseDefinitionTaskBase.java
@@ -632,12 +632,11 @@ public void createStartMasterOnNodeTasks(
       boolean ignoreStopError) {
 
     Set<NodeDetails> nodeSet = ImmutableSet.of(currentNode);
-
-    // Check that installed MASTER software version is consistent.
-    createSoftwareInstallTasks(
-        nodeSet, ServerType.MASTER, null, SubTaskGroupType.InstallingSoftware);
-
     if (currentNode.masterState != MasterState.Configured) {
+      // Check that installed MASTER software version is consistent.
+      createSoftwareInstallTasks(
+          nodeSet, ServerType.MASTER, null, SubTaskGroupType.InstallingSoftware);
+
       // TODO Configuration subtasks may be skipped if it is already a master.
       // Update master configuration on the node.
       createConfigureServerTasks(

diff --git a/managed/src/test/java/com/yugabyte/yw/commissioner/tasks/StartNodeInUniverseTest.java b/managed/src/test/java/com/yugabyte/yw/commissioner/tasks/StartNodeInUniverseTest.java
@@ -12,12 +12,14 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
@@ -130,6 +132,14 @@ public void setUp() {
 
     setFollowerLagMock();
     when(mockClient.getLeaderMasterHostAndPort()).thenReturn(HostAndPort.fromHost("10.0.0.1"));
+    doAnswer(
+            inv -> {
+              ObjectNode res = Json.mapper().createObjectNode();
+              res.put("response", "success");
+              return res;
+            })
+        .when(mockYsqlQueryExecutor)
+        .executeQueryInNodeShell(any(), any(), any(), anyBoolean());
   }
 
   private TaskInfo submitTask(NodeTaskParams taskParams, String nodeName) {
@@ -168,6 +178,7 @@ private Universe setMasters(Universe universe, String... nodeNames) {
           TaskType.AnsibleConfigureServers,
           TaskType.AnsibleClusterServerCtl,
           TaskType.WaitForServer,
+          TaskType.WaitForServer,
           TaskType.CheckFollowerLag,
           TaskType.SetNodeState,
           TaskType.SwamperTargetsFileUpdate,
@@ -180,7 +191,8 @@ private Universe setMasters(Universe universe, String... nodeNames) {
           Json.toJson(ImmutableMap.of()),
           Json.toJson(ImmutableMap.of()),
           Json.toJson(ImmutableMap.of("process", "tserver", "command", "start")),
-          Json.toJson(ImmutableMap.of()),
+          Json.toJson(ImmutableMap.of("serverType", "TSERVER")),
+          Json.toJson(ImmutableMap.of("serverType", "YSQLSERVER")),
           Json.toJson(ImmutableMap.of()),
           Json.toJson(ImmutableMap.of("state", "Live")),
           Json.toJson(ImmutableMap.of()),
@@ -211,6 +223,7 @@ private Universe setMasters(Universe universe, String... nodeNames) {
           TaskType.AnsibleConfigureServers,
           TaskType.AnsibleClusterServerCtl,
           TaskType.WaitForServer,
+          TaskType.WaitForServer,
           TaskType.CheckFollowerLag,
           TaskType.SetNodeState,
           TaskType.SwamperTargetsFileUpdate,
@@ -236,6 +249,7 @@ private Universe setMasters(Universe universe, String... nodeNames) {
           Json.toJson(ImmutableMap.of()),
           Json.toJson(ImmutableMap.of("process", "tserver", "command", "start")),
           Json.toJson(ImmutableMap.of("serverType", "TSERVER")),
+          Json.toJson(ImmutableMap.of("serverType", "YSQLSERVER")),
           Json.toJson(ImmutableMap.of()),
           Json.toJson(ImmutableMap.of("state", "Live")),
           Json.toJson(ImmutableMap.of()),