Skip to content

Commit e282b15

Browse files
committed
[BACKPORT-2024.1][PLAT-14858][PLAT-14822] [Retryability]fault injection tests for smartResize are failing
Summary: Fixed resize node retries and added unit test. Original diff: b4fd3fc/D37026 Test Plan: sbt test Reviewers: nsingh, cwang, svarshney Reviewed By: svarshney Subscribers: yugaware, cwang Differential Revision: https://phorge.dev.yugabyte.com/D37568
1 parent 3021850 commit e282b15

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,6 @@ private void createRollingUpgradeTaskFlow(
436436
}
437437
}
438438

439-
if (context.postAction != null) {
440-
context.postAction.accept(node);
441-
}
442439
// Run post node upgrade hooks
443440
createHookTriggerTasks(singletonNodeList, false, true);
444441
createSetNodeStateTask(node, NodeState.Live).setSubTaskGroupType(subGroupType);
@@ -447,6 +444,10 @@ private void createRollingUpgradeTaskFlow(
447444
taskParams().getUniverseUUID(),
448445
processTypes,
449446
SetNodeState.getStartKey(node.getNodeName(), nodeState));
447+
448+
if (context.postAction != null) {
449+
context.postAction.accept(node);
450+
}
450451
}
451452

452453
if (!isLoadBalancerOn) {

managed/src/test/java/com/yugabyte/yw/commissioner/tasks/upgrade/ResizeNodeTest.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@
2929
import com.yugabyte.yw.commissioner.tasks.UniverseTaskBase.ServerType;
3030
import com.yugabyte.yw.common.ApiUtils;
3131
import com.yugabyte.yw.common.PlacementInfoUtil;
32+
import com.yugabyte.yw.common.TestUtils;
3233
import com.yugabyte.yw.common.gflags.SpecificGFlags;
3334
import com.yugabyte.yw.common.utils.Pair;
3435
import com.yugabyte.yw.forms.ResizeNodeParams;
3536
import com.yugabyte.yw.forms.UniverseDefinitionTaskParams;
3637
import com.yugabyte.yw.forms.UpgradeTaskParams;
38+
import com.yugabyte.yw.models.CustomerTask;
3739
import com.yugabyte.yw.models.InstanceType;
3840
import com.yugabyte.yw.models.RuntimeConfigEntry;
3941
import com.yugabyte.yw.models.TaskInfo;
@@ -1369,6 +1371,25 @@ public void testResetInstanceForAZ() {
13691371
}
13701372
}
13711373

1374+
@Test
1375+
public void testResizeNodeRetries() {
1376+
ResizeNodeParams taskParams = new ResizeNodeParams();
1377+
taskParams.expectedUniverseVersion = -1;
1378+
taskParams.setUniverseUUID(defaultUniverse.getUniverseUUID());
1379+
taskParams.creatingUser = defaultUser;
1380+
taskParams.clusters = defaultUniverse.getUniverseDetails().clusters;
1381+
taskParams.clusters.get(0).userIntent.instanceType = NEW_INSTANCE_TYPE;
1382+
TestUtils.setFakeHttpContext(defaultUser);
1383+
super.verifyTaskRetries(
1384+
defaultCustomer,
1385+
CustomerTask.TaskType.ResizeNode,
1386+
CustomerTask.TargetType.Universe,
1387+
defaultUniverse.getUniverseUUID(),
1388+
TaskType.ResizeNode,
1389+
taskParams,
1390+
false);
1391+
}
1392+
13721393
private void assertUniverseData(boolean increaseVolume, boolean changeInstance) {
13731394
assertUniverseData(increaseVolume, changeInstance, true, false);
13741395
}
@@ -1666,7 +1687,7 @@ private void createTasksTypesForNode(
16661687
taskTypesSequence.add(index++, TaskType.CheckFollowerLag);
16671688
}
16681689
if (changeInstance) {
1669-
taskTypesSequence.add(index++, TaskType.UpdateNodeDetails);
1690+
taskTypesSequence.add(index + 2, TaskType.UpdateNodeDetails);
16701691
}
16711692
}
16721693

0 commit comments

Comments
 (0)