Skip to content

UPSTREAM: 49285: do not mutate statefulset on update #15328

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.

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

Merged
merged 1 commit into from
Jul 20, 2017

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Jul 19, 2017

No description provided.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 19, 2017

[test]

@@ -450,7 +450,11 @@ func (ssc *StatefulSetController) sync(key string) error {
// syncStatefulSet syncs a tuple of (statefulset, []*v1.Pod).
func (ssc *StatefulSetController) syncStatefulSet(set *apps.StatefulSet, pods []*v1.Pod) error {
glog.V(4).Infof("Syncing StatefulSet %v/%v with %d pods", set.Namespace, set.Name, len(pods))
if err := ssc.control.UpdateStatefulSet(set, pods); err != nil {
setCopy, err := api.Scheme.DeepCopy(set)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably go deeper into UpdateStatefulSet when we know the mutation will happen, will tweak this if this confirms the tests pass.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably go deeper into UpdateStatefulSet when we know the mutation will happen, will tweak this if this confirms the tests pass.

It should go deeper, but if this works it's ok to bring out the big hammer to make progress as long as you still chase it down.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really surprised the mutation detector didn't catch this upstream...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also didn't see anything in the call tree below this that mutated without copying first... I might be missing something, but the fact that the diff was only on the kind and apiVersion fields is odd to me

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also didn't see anything in the call tree below this that mutated without copying first... I might be missing something, but the fact that the diff was only on the kind and apiVersion fields is odd to me

Suggests that it's getting converted, encoded, or something. It wasn't obvious to me either.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah seems like decoded to internal version, I will open upstream pull and we can take it from there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfojtik mfojtik mentioned this pull request Jul 19, 2017
@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 19, 2017

flake: #15329

[test] again

@deads2k
Copy link
Contributor

deads2k commented Jul 19, 2017

@mfojtik open upstream to match please.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 19, 2017

@deads2k will give it one more [test] to be sure... do we have time to investigate what actually mutate or we are fine with this and follow up issue?

@deads2k
Copy link
Contributor

deads2k commented Jul 19, 2017

@deads2k will give it one more [test] to be sure... do we have time to investigate what actually mutate or we are fine with this and follow up issue?

I'd like to see an upstream PR opened, so that this title can be updated,so the future rebaser can figure out how to handle this. Otherwise, no objection.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 20, 2017

flake: #15359

[test]

@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 20, 2017

@mfojtik
Copy link
Contributor Author

mfojtik commented Jul 20, 2017

@deads2k i ran test on this 4 times and haven't seen the mutation shutdown

@mfojtik mfojtik changed the title UPSTREAM: 00000: do not mutate statefulset on update UPSTREAM: 49285: do not mutate statefulset on update Jul 20, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to df1437e

@deads2k
Copy link
Contributor

deads2k commented Jul 20, 2017

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 20, 2017

continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 5

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to df1437e

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3320/) (Base Commit: b4eb3b9) (PR Branch Commit: df1437e)

@deads2k
Copy link
Contributor

deads2k commented Jul 20, 2017

Isolated change to fix a flake. Merging on green test.

@deads2k deads2k merged commit eee9e4b into openshift:master Jul 20, 2017
@mfojtik mfojtik deleted the fix-mutation branch September 5, 2018 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants