Skip to content
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

Jump to bottom

Bug 1812584: clustermembercontroller: skip if member found with hostname #247

Closed
wants to merge 1 commit into from
Closed

Bug 1812584: clustermembercontroller: skip if member found with hostname #247

wants to merge 1 commit into from

Conversation

alaypatel07
Copy link
Contributor

In 4.3 the etcd member name was in the form of etcd-member-.
During upgrade cluster member controller should not add a member with
if etcd-member- is running.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 9, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 9, 2020
@alaypatel07
Copy link
Contributor Author

/retest

deads2k
deads2k reviewed Mar 10, 2020
View reviewed changes
pkg/etcdcli/etcdcli.go Outdated
@@ -247,7 +247,7 @@ func (g *etcdClientGetter) GetMember(name string) (*etcdserverpb.Member, error)
return nil, err
}
for _, m := range members {
if m.Name == name {
if strings.Contains(m.Name, name) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this is the wrong fix. Have a FuzzyMatchDeprecated43_memberName or some such method. Don't break this method.

@alaypatel07 alaypatel07 force-pushed the fix-member-name branch 2 times, most recently from d65967d to 6dc113b Compare March 11, 2020 15:47
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 11, 2020
@alaypatel07 alaypatel07 changed the title etcdcli: fix get member name for upgrades clustermembercontroller: check if it is an upgrade, skip if member found with hostname Mar 11, 2020
@alaypatel07 alaypatel07 changed the title clustermembercontroller: check if it is an upgrade, skip if member found with hostname clustermembercontroller: skip if member found with hostname Mar 11, 2020
@alaypatel07 alaypatel07 force-pushed the fix-member-name branch 2 times, most recently from ffb794c to d0caf8b Compare March 11, 2020 16:11
deads2k
deads2k reviewed Mar 11, 2020
View reviewed changes
pkg/operator/clustermembercontroller/clustermembercontroller.go Outdated
case err != nil:
return nil, err
default:
klog.Infof("skipping unready pod %q because it is already an etcd member: %#v with hostname: %s", pod.Name, etcdMember, pod.Spec.Hostname)
Copy link
Contributor

Choose a reason for hiding this comment

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

will this be constantly printed in the upgrade cases? if so, V(4)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it will only be temporary and very rare to find. Can still push it to V(4)

@deads2k
Copy link
Contributor

deads2k commented Mar 11, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2020
@alaypatel07
Copy link
Contributor Author

/hold

walking through with @hexfusion to vet if this will work

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 11, 2020
@alaypatel07
etcdcli: fix get member name for upgrades
a5a2477 
In 4.3 the etcd member name was populated as the hostname from discovery
init container.During upgrade cluster member controller should not add
a member with <node-name> if a member with <hostname> is running.
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 11, 2020
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 12, 2020
@hexfusion hexfusion changed the title clustermembercontroller: skip if member found with hostname Bug 1812584: clustermembercontroller: skip if member found with hostname Mar 12, 2020
@openshift-ci-robot
Copy link

@alaypatel07: This pull request references Bugzilla bug 1812584, which is invalid:

  • expected the bug to target the "4.5.0" release, but it targets "4.4.0" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1812584: clustermembercontroller: skip if member found with hostname

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 12, 2020
@hexfusion
Copy link
Contributor

/hold canel

@hexfusion
Copy link
Contributor

/retest

@hexfusion
Copy link
Contributor

/skip

@hexfusion
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alaypatel07, deads2k, hexfusion

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [alaypatel07,deads2k,hexfusion]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hexfusion hexfusion closed this Mar 12, 2020
@hexfusion
Copy link
Contributor

continued on #253

@alaypatel07 alaypatel07 mentioned this pull request Mar 12, 2020
Merged
@openshift-ci-robot
Copy link

@alaypatel07: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure a5a2477 link /test e2e-azure

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

@hexfusion hexfusion Awaiting requested review from hexfusion

@sttts sttts Awaiting requested review from sttts

Assignees

@hexfusion hexfusion

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alaypatel07 @deads2k @openshift-ci-robot @hexfusion