Skip to content

Move setLastReconciledSpec to after successful transition start #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jennifer-xiong25 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move setLastReconciledSpec to after successful transition start #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions ...org/apache/flink/kubernetes/operator/controller/bluegreen/BlueGreenDeploymentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,18 @@ public UpdateControl<FlinkBlueGreenDeployment> checkAndInitiateDeployment(
.rescheduleAfter(getReconciliationReschedInterval(context));
}

setLastReconciledSpec(context);
try {
return startTransition(
context, currentBlueGreenDeploymentType, currentFlinkDeployment);
var result =
startTransition(
context,
currentBlueGreenDeploymentType,
currentFlinkDeployment);
// Only stamp lastReconciledSpec after the transition
// succeeds. If stamped before and the transition
// fails/aborts, lastReconciledSpec drifts from the
// active child's actual spec
setLastReconciledSpec(context);
return result;
} catch (Exception e) {
var error = "Could not start Transition. Details: " + e.getMessage();
context.getDeploymentStatus().setSavepointTriggerId(null);
Expand All @@ -180,10 +188,12 @@ public UpdateControl<FlinkBlueGreenDeployment> checkAndInitiateDeployment(
"Savepoint redeploy triggered for '{}', using initialSavepointPath: {}",
context.getBgDeployment().getMetadata().getName(),
Objects.toString(jobSpec.getInitialSavepointPath(), "<none>"));
setLastReconciledSpec(context);
try {
return startSavepointRedeployTransition(
context, currentBlueGreenDeploymentType);
var result =
startSavepointRedeployTransition(
context, currentBlueGreenDeploymentType);
setLastReconciledSpec(context);
return result;
} catch (Exception e) {
var error =
"Could not start Savepoint Redeploy Transition. Details: "
Expand Down
7 changes: 7 additions & 0 deletions ...g/apache/flink/kubernetes/operator/controller/FlinkBlueGreenDeploymentControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,13 @@ public void verifySavepointFetchFailureRecovery(FlinkVersion flinkVersion) throw
rs = reconcile(rs.deployment);
assertFailingWithError(rs, "Could not start Transition", error);

// lastReconciledSpec must NOT contain the failed spec change — otherwise
// subsequent deploys see no diff and fall into PATCH_CHILD (in-place
// upgrade) instead of a proper B/G transition
assertFalse(
rs.reconciledStatus.getLastReconciledSpec().contains(customValue),
"lastReconciledSpec should not be stamped when transition fails");

// Recovery: Clear the fetch error and try again with new spec change
flinkService.clearSavepointFetchError();
customValue = UUID.randomUUID().toString() + "_recovery";
Expand Down