Skip to content

Commit 9142970

Browse files
committed
[PLAT-14315] [k8s] Make disk increase task independent of the universe health
Summary: Added logic to skip prechecks for k8s universe disk update task (as there is no other way to fix broken universe) Test Plan: 1) run disk update on k8s universe verify no precheck tasks created 2) Stop tserver manually in k8s universe run resize node and verify it is successful Reviewers: hzare, anijhawan Reviewed By: anijhawan Subscribers: anijhawan, yugaware Differential Revision: https://phorge.dev.yugabyte.com/D40509
1 parent 949dca8 commit 9142970

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

managed/src/main/java/com/yugabyte/yw/commissioner/KubernetesUpgradeTaskBase.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,19 @@ protected boolean isBlacklistLeaders() {
6363
return getOrCreateExecutionContext().isBlacklistLeaders();
6464
}
6565

66+
@Override
67+
protected boolean isSkipPrechecks() {
68+
return taskParams().skipNodeChecks;
69+
}
70+
6671
@Override
6772
protected void createPrecheckTasks(Universe universe) {
6873
MastersAndTservers nodesToBeRestarted = getNodesToBeRestarted();
6974
log.debug("Nodes to be restarted {}", nodesToBeRestarted);
7075
if (taskParams().upgradeOption == UpgradeOption.ROLLING_UPGRADE
7176
&& nodesToBeRestarted != null
72-
&& !nodesToBeRestarted.isEmpty()) {
77+
&& !nodesToBeRestarted.isEmpty()
78+
&& !isSkipPrechecks()) {
7379
Optional<NodeDetails> nonLive =
7480
nodesToBeRestarted.getAllNodes().stream()
7581
.filter(n -> n.state != NodeDetails.NodeState.Live)
@@ -92,7 +98,7 @@ protected void createPrecheckTasks(Universe universe) {
9298

9399
@Override
94100
protected void addBasicPrecheckTasks() {
95-
if (isFirstTry()) {
101+
if (isFirstTry() && !isSkipPrechecks()) {
96102
verifyClustersConsistency();
97103
}
98104
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ protected boolean isBlacklistLeaders() {
8686
return false; // TODO: Modify blacklist is disabled by default for k8s now for some reason.
8787
}
8888

89+
protected boolean isSkipPrechecks() {
90+
return false;
91+
}
92+
8993
public static class KubernetesPlacement {
9094
public PlacementInfo placementInfo;
9195
public Map<UUID, Integer> masters;
@@ -1035,10 +1039,12 @@ public void upgradePodsTask(
10351039
final List<NodeDetails> nodeList = partition.nodeList;
10361040
final List<String> podNames = partition.podNames;
10371041
for (NodeDetails node : nodeList) {
1038-
createNodePrecheckTasks(
1039-
node, serverTypes, SubTaskGroupType.ConfigureUniverse, true, softwareVersion);
1042+
if (!isSkipPrechecks()) {
1043+
createNodePrecheckTasks(
1044+
node, serverTypes, SubTaskGroupType.ConfigureUniverse, true, softwareVersion);
1045+
}
10401046
}
1041-
if (!isReadOnlyCluster) {
1047+
if (!isReadOnlyCluster && !isSkipPrechecks()) {
10421048
createCheckNodesAreSafeToTakeDownTask(
10431049
Collections.singletonList(
10441050
UpgradeTaskBase.MastersAndTservers.from(nodeList, serverTypes)),

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ protected ResizeNodeParams taskParams() {
4747
return (ResizeNodeParams) taskParams;
4848
}
4949

50+
@Override
51+
protected boolean isSkipPrechecks() {
52+
return true;
53+
}
54+
5055
@Override
5156
public void run() {
5257
try {
@@ -59,7 +64,6 @@ public void run() {
5964
taskParams().expectedUniverseVersion, null /* Txn callback */);
6065
taskParams().useNewHelmNamingStyle = universe.getUniverseDetails().useNewHelmNamingStyle;
6166
preTaskActions();
62-
addBasicPrecheckTasks();
6367

6468
// String softwareVersion = userIntent.ybSoftwareVersion;
6569
// primary and readonly clusters disk resize

0 commit comments

Comments
 (0)