Fix: Resource doesn't re-reconcile after completed update #3468
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
super-harsh
requested review from
davefellows,
theunrepentantgeek,
matthchr and
babbageclunk
as code owners
theunrepentantgeek
approved these changes
Oct 27, 2023
matthchr
reviewed
Oct 29, 2023
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
Hmm, the added test seems to fail? |
Codecov Report
@@ Coverage Diff @@
## main #3468 +/- ##
==========================================
- Coverage 54.31% 54.25% -0.07%
==========================================
Files 1545 1573 +28
Lines 651527 653631 +2104
==========================================
+ Hits 353882 354600 +718
- Misses 240078 241456 +1378
- Partials 57567 57575 +8
|
matthchr
reviewed
Nov 7, 2023
| @@ -65,7 +67,7 @@ func Test_Latest_Reconciled_Generation_Reconciles_AllEvents(t *testing.T) { | |||
| old := agentPool.DeepCopy() | |||
| agentPool.Spec.OrchestratorVersion = to.Ptr("1.27.1") | |||
|
|
|||
| tc.Patch(old, agentPool) | |||
| tc.PatchResourceAndWaitForState(old, agentPool, metav1.ConditionFalse, conditions.ConditionSeverityInfo) | |||
There was a problem hiding this comment.
Did you confirm that doing this was still able to trigger the test on the behavior we wanted (that 2 PUTs happen before the first reconcile is finished)?
There was a problem hiding this comment.
Yep, It does take that - generation mismatch path on re-runs.
matthchr
approved these changes
Nov 7, 2023
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 7, 2023
* Add latest reconciled generation check * Add tests and minor refactor * Add header * Fix test race --------- Co-authored-by: Bevan Arps <bevan.arps@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #3451
What this PR does / why we need it:
This PR adds a latest-reconciled-generation annotation to the resource every time the reconciler receives a createOrUpdate event and further is checked in
MonitorResourceCreation. We need this check inMonitorResourceCreationsince when a subsequent update is received, it always has aresume-poller-tokenannotation which makes the reconciler think that it's monitoring the resource and the update never happened.The generation check runs once the poller is done or runs into an error, and requeues the resource if generation set by API server does not match with the annotation or else returns successfully.