Fix ScyllaDB version upgrade being stuck on Pod staying in maintenance mode #1267
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
zimnx
force-pushed
the
mz/1252-maintenance-mode-fix
branch
from
9193ace
to
73b44b1
Compare
zimnx
changed the title
zimnx
force-pushed
the
mz/1252-maintenance-mode-fix
branch
from
73b44b1
to
0d2c8e8
Compare
rzetelskik
reviewed
Jun 2, 2023
There was a problem hiding this comment.
Well done tracking the issue. As for the fix - it's imperative and prone to fail with disruptions, e.g. deleting the service during the upgrade would result in unexpected behaviour. Having said that I don't see a different approach to fixing this without changing the upgrade procedure, but that's something to keep in mind.
| oldService: &corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: map[string]string{ | ||
| naming.NodeMaintenanceLabel: "42", |
There was a problem hiding this comment.
nit: s/"42"/""
Looks unnecessarily obfuscated
There was a problem hiding this comment.
value doesn't matter, "" is as good as "42". Leaving as is to save CI respins.
tnozicka
force-pushed
the
mz/1252-maintenance-mode-fix
branch
from
0d2c8e8
to
d201b7b
Compare
zimnx
force-pushed
the
mz/1252-maintenance-mode-fix
branch
from
d201b7b
to
1c05996
Compare
…e mode Service controller copied maintenance mode label into required object from cached informer when it was present. Labels are also rewritten from existing objects in all Apply methods. If maitenance mode label was removed in between when required object is constructed, and Apply method is called, it would make it persitently available in the Service object. Instead adding it to required object, it should be carried over from existing object only in Apply method, because this label is managed by patches. Fixes scylladb#1252
zimnx
force-pushed
the
mz/1252-maintenance-mode-fix
branch
from
1c05996
to
78f142f
Compare
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.
Service controller copied maintenance mode label into required object from cached informer when it was present.
Labels are also rewritten from existing objects in all Apply methods. If maitenance mode label was removed in between when required object is constructed, and Apply method is called, it would make it persitently available in the Service object.
Instead adding it to required object, it should be carried over from existing object only in Apply method, because this label is managed by patches.
Fixes #1252