Skip to content

Commit b1cb9ca

Browse files
vipul-ybvipul-yb
committed
[PLAT-20668]: Fix universe details state during canary upgrade pause
Summary: Canary software upgrades resume the original task (same user task UUID) in SoftwareUpgradeYB/UpgradeTaskBase instead of starting a new one. On resume, freezing the universe again with the same userTaskUUID previously failed with "Universe ... is already frozen" from UniverseTaskBase.getFreezeUniverseUpdater, and the higher-level guard in createFreezeUniverseTaskIfNeeded simply skipped scheduling FreezeUniverse altogether, leaving placementModificationTaskUuid set and blocking subsequent operations like finalizeUpgrade. This change treats a canary pause as a clean unlock: Mark updateSucceeded = true on pause, so the universe is not surfaced as failed. Clear updatingTask / updatingTaskUUID at pause; keep placementModificationTaskUuid as the paused-upgrade marker. Resume/verify gates (UpgradeUniverseHandler.resumeCanarySoftwareUpgrade, SoftwareUpgradeYB.isResumeTask, SoftwareUpgradeParams.verifyParams) match against placementModificationTaskUuid This change makes FreezeUniverse safe to re-run within the same user task, and hence unblocks finalise after a canary upgrade resume completes: placementModificationTaskUuid is now correctly cleared when the canary upgrade reaches PreFinalize Test Plan: Perform a canary software upgrade and then finalise the upgrade. Added local provider tests Reviewers: nsingh, #yba-api-review! Reviewed By: nsingh Subscribers: yugaware Differential Revision: https://phorge.dev.yugabyte.com/D52739
1 parent c68a942 commit b1cb9ca

9 files changed

Lines changed: 174 additions & 22 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,16 @@ public void runUpgrade(
385385
setTaskQueueAndRun(
386386
() -> clearLeaderBlacklistIfAvailable(SubTaskGroupType.ConfigureUniverse));
387387
}
388+
if (error == null && isPauseRequested) {
389+
// A canary pause is intentional; mark update as succeeded so the universe is not
390+
// surfaced as failed/broken while paused. The unlock updater that follows reads it.
391+
saveUniverseDetails(
392+
universe -> {
393+
UniverseDefinitionTaskParams details = universe.getUniverseDetails();
394+
details.updateSucceeded = true;
395+
universe.setUniverseDetails(details);
396+
});
397+
}
388398
} finally {
389399
try {
390400
unlockXClusterUniverses(lockedXClusterUniversesUuidSet, false /* ignoreErrors */);

‎managed/src/main/java/com/yugabyte/yw/commissioner/tasks/UniverseTaskBase.java‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.yugabyte.yw.commissioner.Common.CloudType;
2828
import com.yugabyte.yw.commissioner.ITask;
2929
import com.yugabyte.yw.commissioner.NodeAgentEnabler;
30+
import com.yugabyte.yw.commissioner.TaskExecutor.RunnableTask;
3031
import com.yugabyte.yw.commissioner.TaskExecutor.SubTaskGroup;
3132
import com.yugabyte.yw.commissioner.UserTaskDetails;
3233
import com.yugabyte.yw.commissioner.UserTaskDetails.SubTaskGroupType;
@@ -985,16 +986,25 @@ public void run(Universe universe) {
985986
if (updaterConfig.getCallback() != null) {
986987
updaterConfig.getCallback().accept(universe);
987988
}
988-
// TODO When checkSuccess = false, lock and unlock are not reverse of each other, but this
989-
// existing behaviour is retained to not cause regression.
990989
boolean clearUpdatingTask =
991-
(universeDetails.updateSucceeded && updaterConfig.isCheckSuccess());
990+
universeDetails.updateSucceeded && updaterConfig.isCheckSuccess();
992991

992+
// TODO When checkSuccess = false, lock and unlock are not reverse of each other, but this
993+
// existing behaviour is retained to not cause regression.
993994
if (clearUpdatingTask || updaterConfig.isRollbackPerformed()) {
994995
if (PLACEMENT_MODIFICATION_TASKS.contains(universeDetails.updatingTask)) {
995-
universeDetails.placementModificationTaskUuid = null;
996-
// Do not save the transient state in the universe.
997-
universeDetails.nodeDetailsSet.forEach(n -> n.masterState = null);
996+
boolean pausedTask =
997+
getTaskExecutor()
998+
.maybeGetRunnableTask(getUserTaskUUID())
999+
.map(RunnableTask::isPaused)
1000+
.orElse(false);
1001+
// Keep placementModificationTaskUuid set while paused so resume can match this
1002+
// upgrade.
1003+
if (!pausedTask) {
1004+
universeDetails.placementModificationTaskUuid = null;
1005+
// Do not save the transient state in the universe.
1006+
universeDetails.nodeDetailsSet.forEach(n -> n.masterState = null);
1007+
}
9981008
}
9991009
}
10001010
if (clearUpdatingTask) {

‎managed/src/main/java/com/yugabyte/yw/commissioner/tasks/upgrade/SoftwareUpgradeYB.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,8 @@ private boolean isResumeTask() {
12871287
!= UniverseDefinitionTaskParams.SoftwareUpgradeState.Paused) {
12881288
return false;
12891289
}
1290-
if (!getUserTaskUUID().equals(universe.getUniverseDetails().updatingTaskUUID)) {
1290+
UniverseDefinitionTaskParams d = universe.getUniverseDetails();
1291+
if (!getUserTaskUUID().equals(d.placementModificationTaskUuid)) {
12911292
return false;
12921293
}
12931294
List<TaskInfo> subtasks = TaskInfo.getOrBadRequest(getUserTaskUUID()).getSubTasks();

‎managed/src/main/java/com/yugabyte/yw/controllers/handlers/UpgradeUniverseHandler.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,9 +1165,12 @@ public UUID resumeCanarySoftwareUpgrade(UUID customerUUID, UUID universeUUID, UU
11651165
throw new PlatformServiceException(
11661166
BAD_REQUEST, "Universe is not in Paused software upgrade state.");
11671167
}
1168-
if (!taskUUID.equals(universe.getUniverseDetails().updatingTaskUUID)) {
1168+
UniverseDefinitionTaskParams details = universe.getUniverseDetails();
1169+
if (!taskUUID.equals(details.placementModificationTaskUuid)) {
11691170
throw new PlatformServiceException(
1170-
BAD_REQUEST, "Task does not match the universe's updating task.");
1171+
BAD_REQUEST,
1172+
"Task does not match the universe's paused canary upgrade"
1173+
+ " (placementModificationTaskUuid).");
11711174
}
11721175
params.setPreviousTaskUUID(taskUUID);
11731176
params.expectedUniverseVersion = -1;

‎managed/src/main/java/com/yugabyte/yw/forms/SoftwareUpgradeParams.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.yugabyte.yw.models.common.YbaApi.YbaApiVisibility;
2323
import io.swagger.annotations.ApiModelProperty;
2424
import java.util.List;
25+
import java.util.Objects;
2526
import java.util.Set;
2627
import java.util.UUID;
2728
import java.util.stream.Collectors;
@@ -106,10 +107,10 @@ public void verifyParams(Universe universe, boolean isFirstTry) {
106107
if (canaryUpgradeConfig != null) {
107108
if (softwareUpgradeState == SoftwareUpgradeState.Paused) {
108109
UUID previousTaskUUID = getPreviousTaskUUID();
109-
UUID updatingTaskUUID = universe.getUniverseDetails().updatingTaskUUID;
110-
if (previousTaskUUID == null
111-
|| updatingTaskUUID == null
112-
|| !previousTaskUUID.equals(updatingTaskUUID)) {
110+
UUID placementTaskUUID = universe.getUniverseDetails().placementModificationTaskUuid;
111+
boolean matchesPaused =
112+
previousTaskUUID != null && Objects.equals(previousTaskUUID, placementTaskUUID);
113+
if (!matchesPaused) {
113114
throw new PlatformServiceException(
114115
BAD_REQUEST,
115116
"Universe has a paused canary software upgrade. Submit a resume or rollback instead"

‎managed/src/test/java/com/yugabyte/yw/commissioner/tasks/local/SoftwareUpgradeLocalTest.java‎

Lines changed: 98 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static org.junit.Assert.assertEquals;
99
import static org.junit.Assert.assertFalse;
1010
import static org.junit.Assert.assertNotNull;
11+
import static org.junit.Assert.assertNull;
1112
import static org.junit.Assert.assertThrows;
1213
import static org.junit.Assert.assertTrue;
1314

@@ -368,6 +369,11 @@ public void testCanarySoftwareUpgradeMasterPauseThenFirstAzPause() throws Interr
368369

369370
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
370371
assertEquals(SoftwareUpgradeState.Paused, universe.getUniverseDetails().softwareUpgradeState);
372+
UniverseDefinitionTaskParams dAfterMasterPause = universe.getUniverseDetails();
373+
assertTrue(dAfterMasterPause.updateSucceeded);
374+
assertNull(dAfterMasterPause.updatingTaskUUID);
375+
assertNull(dAfterMasterPause.updatingTask);
376+
assertEquals(taskUuid, dAfterMasterPause.placementModificationTaskUuid);
371377
PrevYBSoftwareConfig prev = universe.getUniverseDetails().prevYBSoftwareConfig;
372378
assertNotNull(prev);
373379
assertTrue(allMasterAzsCompleted(prev));
@@ -399,6 +405,11 @@ public void testCanarySoftwareUpgradeMasterPauseThenFirstAzPause() throws Interr
399405

400406
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
401407
assertEquals(SoftwareUpgradeState.Paused, universe.getUniverseDetails().softwareUpgradeState);
408+
UniverseDefinitionTaskParams dAfterAzPause = universe.getUniverseDetails();
409+
assertTrue(dAfterAzPause.updateSucceeded);
410+
assertNull(dAfterAzPause.updatingTaskUUID);
411+
assertNull(dAfterAzPause.updatingTask);
412+
assertEquals(resumedUuid, dAfterAzPause.placementModificationTaskUuid);
402413
prev = universe.getUniverseDetails().prevYBSoftwareConfig;
403414
assertNotNull(prev);
404415
assertTrue(
@@ -416,12 +427,37 @@ public void testCanarySoftwareUpgradeMasterPauseThenFirstAzPause() throws Interr
416427
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
417428
assertEquals(
418429
SoftwareUpgradeState.PreFinalize, universe.getUniverseDetails().softwareUpgradeState);
430+
UniverseDefinitionTaskParams dPreFinalize = universe.getUniverseDetails();
431+
assertNull(dPreFinalize.placementModificationTaskUuid);
432+
assertNull(dPreFinalize.updatingTaskUUID);
433+
assertNull(dPreFinalize.updatingTask);
419434

420-
Optional<ObjectNode> finalStatus = getTaskStatus(finalTask.getUuid());
421-
assertTrue(finalStatus.isPresent());
435+
assertTaskStatusSoftwareUpgradeProgressMatchesUniverse(finalTask.getUuid(), universe);
436+
437+
FinalizeUpgradeParams finalizeUpgradeParams = new FinalizeUpgradeParams();
438+
finalizeUpgradeParams.setUniverseUUID(universe.getUniverseUUID());
439+
finalizeUpgradeParams.expectedUniverseVersion = -1;
440+
TaskInfo finalizeTaskInfo =
441+
waitForTask(
442+
upgradeUniverseHandler.finalizeUpgrade(
443+
finalizeUpgradeParams,
444+
customer,
445+
Universe.getOrBadRequest(universe.getUniverseUUID())));
446+
assertEquals(Success, finalizeTaskInfo.getTaskState());
447+
448+
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
449+
assertEquals(SoftwareUpgradeState.Ready, universe.getUniverseDetails().softwareUpgradeState);
450+
assertFalse(universe.getUniverseDetails().isSoftwareRollbackAllowed);
451+
UniverseDefinitionTaskParams dReady = universe.getUniverseDetails();
452+
assertNull(dReady.updatingTaskUUID);
453+
assertNull(dReady.placementModificationTaskUuid);
454+
assertNull(dReady.updatingTask);
455+
456+
Optional<ObjectNode> statusAfterFinalize = getTaskStatus(finalTask.getUuid());
457+
assertTrue(statusAfterFinalize.isPresent());
422458
assertFalse(
423-
"Task status should omit softwareUpgradeProgress after software upgrade phase completes",
424-
finalStatus.get().has("softwareUpgradeProgress"));
459+
"Task status should omit softwareUpgradeProgress after finalize completes",
460+
statusAfterFinalize.get().has("softwareUpgradeProgress"));
425461
}
426462

427463
/**
@@ -506,6 +542,64 @@ public void testCanaryUpgradePauseThenRollback() throws InterruptedException {
506542
verifyPayload();
507543
}
508544

545+
@Test
546+
public void testScaleUpBlockedDuringCanaryPauseAllowedAfterPreFinalize()
547+
throws InterruptedException {
548+
Universe universe = createUniversePausedAfterCanaryMasterPhase();
549+
int originalNumNodes = universe.getUniverseDetails().getPrimaryCluster().userIntent.numNodes;
550+
UUID pausedTaskUuid = universe.getUniverseDetails().placementModificationTaskUuid;
551+
assertNotNull(pausedTaskUuid);
552+
553+
changeNumberOfNodesInPrimary(universe, 1);
554+
final Universe universeForEdit = universe;
555+
PlatformServiceException editWhilePaused =
556+
assertThrows(
557+
PlatformServiceException.class,
558+
() ->
559+
universeCRUDHandler.update(
560+
customer,
561+
Universe.getOrBadRequest(universeForEdit.getUniverseUUID()),
562+
universeForEdit.getUniverseDetails()));
563+
assertThat(editWhilePaused.getMessage(), containsString("paused canary software upgrade"));
564+
565+
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
566+
assertEquals(SoftwareUpgradeState.Paused, universe.getUniverseDetails().softwareUpgradeState);
567+
assertEquals(pausedTaskUuid, universe.getUniverseDetails().placementModificationTaskUuid);
568+
assertFalse(universe.getUniverseDetails().updateInProgress);
569+
assertEquals(
570+
originalNumNodes, universe.getUniverseDetails().getPrimaryCluster().userIntent.numNodes);
571+
572+
UUID resumedUuid =
573+
upgradeUniverseHandler.resumeCanarySoftwareUpgrade(
574+
customer.getUuid(), universe.getUniverseUUID(), pausedTaskUuid);
575+
TaskInfo resumeTask = waitForTask(resumedUuid, 500, 3600);
576+
assertEquals(Success, resumeTask.getTaskState());
577+
578+
universe = Universe.getOrBadRequest(universe.getUniverseUUID());
579+
assertEquals(
580+
SoftwareUpgradeState.PreFinalize, universe.getUniverseDetails().softwareUpgradeState);
581+
UniverseDefinitionTaskParams dPreFinalize = universe.getUniverseDetails();
582+
assertNull(dPreFinalize.placementModificationTaskUuid);
583+
assertNull(dPreFinalize.updatingTaskUUID);
584+
assertNull(dPreFinalize.updatingTask);
585+
586+
Universe fresh = Universe.getOrBadRequest(universe.getUniverseUUID());
587+
changeNumberOfNodesInPrimary(fresh, 1);
588+
UUID editTaskUuid =
589+
universeCRUDHandler.update(
590+
customer,
591+
Universe.getOrBadRequest(fresh.getUniverseUUID()),
592+
fresh.getUniverseDetails());
593+
TaskInfo editInfo = waitForTask(editTaskUuid, fresh);
594+
assertEquals(Success, editInfo.getTaskState());
595+
596+
Universe afterEdit = Universe.getOrBadRequest(universe.getUniverseUUID());
597+
assertEquals(
598+
originalNumNodes + 1,
599+
afterEdit.getUniverseDetails().getPrimaryCluster().userIntent.numNodes);
600+
verifyUniverseState(afterEdit);
601+
}
602+
509603
@Test
510604
public void testCanaryPauseBlocksGFlagsAndEditUniverse() throws InterruptedException {
511605
Universe universe = createUniversePausedAfterCanaryMasterPhase();

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ public void testCanaryResumeAfterMasters() throws InterruptedException {
12441244
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
12451245
assertEquals(
12461246
SoftwareUpgradeState.Paused, defaultUniverse.getUniverseDetails().softwareUpgradeState);
1247-
assertEquals(taskUUID, defaultUniverse.getUniverseDetails().updatingTaskUUID);
1247+
assertCanaryPauseUniverseTaskFields(defaultUniverse, taskUUID);
12481248
PrevYBSoftwareConfig prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
12491249
assertNotNull(prev);
12501250
assertTrue("Masters phase should be completed before pause", allMasterAzsCompleted(prev));
@@ -1263,6 +1263,31 @@ public void testCanaryResumeAfterMasters() throws InterruptedException {
12631263
assertEquals(
12641264
SoftwareUpgradeState.PreFinalize,
12651265
defaultUniverse.getUniverseDetails().softwareUpgradeState);
1266+
assertPreFinalizeClearsSoftwareUpgradeTaskTracking(defaultUniverse);
1267+
}
1268+
1269+
/**
1270+
* After a successful canary run that ends in PreFinalize, unlock should clear task tracking
1271+
* fields (including on resume when FreezeUniverse subtask is skipped).
1272+
*/
1273+
private void assertPreFinalizeClearsSoftwareUpgradeTaskTracking(Universe universe) {
1274+
UniverseDefinitionTaskParams d = universe.getUniverseDetails();
1275+
assertNull(d.placementModificationTaskUuid);
1276+
assertNull(d.updatingTaskUUID);
1277+
assertNull(d.updatingTask);
1278+
}
1279+
1280+
/** Universe fields expected while a canary software upgrade is paused (between pause points). */
1281+
private void assertCanaryPauseUniverseTaskFields(Universe universe, UUID expectedTaskUuid) {
1282+
UniverseDefinitionTaskParams d = universe.getUniverseDetails();
1283+
assertTrue("Canary pause should not surface as updateSucceeded=false", d.updateSucceeded);
1284+
assertNull("updatingTaskUUID should be cleared at canary pause", d.updatingTaskUUID);
1285+
assertNull("updatingTask should be cleared at canary pause", d.updatingTask);
1286+
assertEquals(
1287+
"placementModificationTaskUuid is the marker for the paused upgrade",
1288+
expectedTaskUuid,
1289+
d.placementModificationTaskUuid);
1290+
assertEquals(SoftwareUpgradeState.Paused, d.softwareUpgradeState);
12661291
}
12671292

12681293
/**
@@ -1326,6 +1351,7 @@ public void testCanaryPausesWithoutSleepConfig() throws InterruptedException {
13261351
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
13271352
assertEquals(
13281353
SoftwareUpgradeState.Paused, defaultUniverse.getUniverseDetails().softwareUpgradeState);
1354+
assertCanaryPauseUniverseTaskFields(defaultUniverse, taskUUID);
13291355
PrevYBSoftwareConfig prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
13301356
assertNotNull(prev);
13311357
assertTrue(allMasterAzsCompleted(prev));
@@ -1371,6 +1397,7 @@ public void testCanaryTserverAZPauseFirstAZ() throws InterruptedException {
13711397
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
13721398
assertEquals(
13731399
SoftwareUpgradeState.Paused, defaultUniverse.getUniverseDetails().softwareUpgradeState);
1400+
assertCanaryPauseUniverseTaskFields(defaultUniverse, taskUUID);
13741401
PrevYBSoftwareConfig prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
13751402
assertNotNull(prev);
13761403
assertTrue(allMasterAzsCompleted(prev));
@@ -1420,6 +1447,7 @@ public void testCanaryTserverAZPauseResumeAndPauseNextAZ() throws InterruptedExc
14201447
assertEquals(TaskInfo.State.Paused, taskInfo.getTaskState());
14211448

14221449
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
1450+
assertCanaryPauseUniverseTaskFields(defaultUniverse, taskUUID);
14231451
PrevYBSoftwareConfig prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
14241452
assertNotNull(prev);
14251453
assertTrue(primaryTserverAzCompleted(prev, defaultUniverse, az1.getUuid()));
@@ -1437,6 +1465,7 @@ public void testCanaryTserverAZPauseResumeAndPauseNextAZ() throws InterruptedExc
14371465
assertEquals(TaskInfo.State.Paused, taskInfo.getTaskState());
14381466

14391467
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
1468+
assertCanaryPauseUniverseTaskFields(defaultUniverse, resumedUUID);
14401469
prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
14411470
assertNotNull(prev);
14421471
assertTrue(
@@ -1462,6 +1491,7 @@ public void testCanaryTserverAZPauseResumeAndPauseNextAZ() throws InterruptedExc
14621491
assertEquals(
14631492
SoftwareUpgradeState.PreFinalize,
14641493
defaultUniverse.getUniverseDetails().softwareUpgradeState);
1494+
assertPreFinalizeClearsSoftwareUpgradeTaskTracking(defaultUniverse);
14651495
}
14661496

14671497
@Test
@@ -1507,6 +1537,7 @@ public void testCanaryMasterPauseThenTserverAZPause() throws InterruptedExceptio
15071537
assertEquals(TaskInfo.State.Paused, taskInfo.getTaskState());
15081538

15091539
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
1540+
assertCanaryPauseUniverseTaskFields(defaultUniverse, taskUUID);
15101541
PrevYBSoftwareConfig prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
15111542
assertNotNull(prev);
15121543
assertTrue("Masters should be completed", allMasterAzsCompleted(prev));
@@ -1526,6 +1557,7 @@ public void testCanaryMasterPauseThenTserverAZPause() throws InterruptedExceptio
15261557
assertEquals(TaskInfo.State.Paused, taskInfo.getTaskState());
15271558

15281559
defaultUniverse = Universe.getOrBadRequest(defaultUniverse.getUniverseUUID());
1560+
assertCanaryPauseUniverseTaskFields(defaultUniverse, resumedUUID);
15291561
prev = defaultUniverse.getUniverseDetails().prevYBSoftwareConfig;
15301562
assertNotNull(prev);
15311563
assertTrue(primaryTserverAzCompleted(prev, defaultUniverse, az1.getUuid()));
@@ -1545,6 +1577,7 @@ public void testCanaryMasterPauseThenTserverAZPause() throws InterruptedExceptio
15451577
assertEquals(
15461578
SoftwareUpgradeState.PreFinalize,
15471579
defaultUniverse.getUniverseDetails().softwareUpgradeState);
1580+
assertPreFinalizeClearsSoftwareUpgradeTaskTracking(defaultUniverse);
15481581
}
15491582

15501583
@Test

‎managed/src/test/java/com/yugabyte/yw/controllers/UpgradeUniverseControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ public void testResumeCanarySoftwareUpgradeSuccess() {
611611
u -> {
612612
UniverseDefinitionTaskParams details = u.getUniverseDetails();
613613
details.softwareUpgradeState = SoftwareUpgradeState.Paused;
614-
details.updatingTaskUUID = taskUUID;
614+
details.placementModificationTaskUuid = taskUUID;
615615
u.setUniverseDetails(details);
616616
});
617617

‎managed/src/test/java/com/yugabyte/yw/controllers/handlers/UpgradeUniverseHandlerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ public void testResumeCanarySoftwareUpgrade() {
14641464
UniverseDefinitionTaskParams details = universe.getUniverseDetails();
14651465
details.softwareUpgradeState =
14661466
UniverseDefinitionTaskParams.SoftwareUpgradeState.Paused;
1467-
details.updatingTaskUUID = taskUUID;
1467+
details.placementModificationTaskUuid = taskUUID;
14681468
universe.setUniverseDetails(details);
14691469
});
14701470

@@ -1613,7 +1613,7 @@ public void testResumeCanarySoftwareUpgradeRejectsTaskUUIDMismatch() {
16131613
UniverseDefinitionTaskParams details = universe.getUniverseDetails();
16141614
details.softwareUpgradeState =
16151615
UniverseDefinitionTaskParams.SoftwareUpgradeState.Paused;
1616-
details.updatingTaskUUID = otherTaskUUID;
1616+
details.placementModificationTaskUuid = otherTaskUUID;
16171617
universe.setUniverseDetails(details);
16181618
});
16191619

@@ -1688,7 +1688,7 @@ public void testResumeCanarySoftwareUpgradeUpdatesCustomerTask() {
16881688
UniverseDefinitionTaskParams details = universe.getUniverseDetails();
16891689
details.softwareUpgradeState =
16901690
UniverseDefinitionTaskParams.SoftwareUpgradeState.Paused;
1691-
details.updatingTaskUUID = taskUUID;
1691+
details.placementModificationTaskUuid = taskUUID;
16921692
universe.setUniverseDetails(details);
16931693
});
16941694

0 commit comments

Comments
 (0)