[BACKPORT 2.20][PLAT-12803]: Make configure db task abortable

Summary: Made configure db api abortable Original diff/commit: 291a7b5/D32581 Test Plan: Tested manually aborting and re-triggering the task Reviewers: anijhawan Reviewed By: anijhawan Subscribers: yugaware Tags: #jenkins-ready Differential Revision: https://phorge.dev.yugabyte.com/D32611
yugabyte · Feb 23, 2024 · 69a0840 · 69a0840
1 parent 13d2f1a
commit 69a0840
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/UniverseTaskBase.java b/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/UniverseTaskBase.java
@@ -267,7 +267,6 @@ public abstract class UniverseTaskBase extends AbstractTaskBase {
           TaskType.EditKubernetesUniverse,
           TaskType.RestartUniverseKubernetesUpgrade,
           TaskType.CertsRotateKubernetesUpgrade,
-          TaskType.ConfigureDBApisKubernetes,
           TaskType.GFlagsUpgrade,
           TaskType.SoftwareUpgrade,
           TaskType.SoftwareUpgradeYB,

diff --git a/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/upgrade/ConfigureDBApis.java b/managed/src/main/java/com/yugabyte/yw/commissioner/tasks/upgrade/ConfigureDBApis.java
@@ -4,6 +4,7 @@
 
 import com.google.inject.Inject;
 import com.yugabyte.yw.commissioner.BaseTaskDependencies;
+import com.yugabyte.yw.commissioner.ITask.Abortable;
 import com.yugabyte.yw.commissioner.UpgradeTaskBase;
 import com.yugabyte.yw.commissioner.UserTaskDetails.SubTaskGroupType;
 import com.yugabyte.yw.forms.ConfigureDBApiParams;
@@ -17,6 +18,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Abortable
 public class ConfigureDBApis extends UpgradeTaskBase {
 
   @Inject

diff --git a/...d/src/main/java/com/yugabyte/yw/commissioner/tasks/upgrade/ConfigureDBApisKubernetes.java b/...d/src/main/java/com/yugabyte/yw/commissioner/tasks/upgrade/ConfigureDBApisKubernetes.java
@@ -4,13 +4,15 @@
 
 import com.google.inject.Inject;
 import com.yugabyte.yw.commissioner.BaseTaskDependencies;
+import com.yugabyte.yw.commissioner.ITask.Abortable;
 import com.yugabyte.yw.commissioner.KubernetesUpgradeTaskBase;
 import com.yugabyte.yw.commissioner.UserTaskDetails.SubTaskGroupType;
 import com.yugabyte.yw.forms.ConfigureDBApiParams;
 import com.yugabyte.yw.forms.UniverseTaskParams;
 import com.yugabyte.yw.forms.UniverseTaskParams.CommunicationPorts;
 import com.yugabyte.yw.models.Universe;
 
+@Abortable
 public class ConfigureDBApisKubernetes extends KubernetesUpgradeTaskBase {
 
   @Inject