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.

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

Continue fix for 9871 #352

Merged
merged 1 commit into from
Nov 6, 2014
Merged

Continue fix for 9871 #352

merged 1 commit into from
Nov 6, 2014

Conversation

dmick
Copy link
Member

@dmick dmick commented Oct 30, 2014

The existing logic was too tortured, and the previous fix was bad.
Rewrite to extract "get_statuses()" to a worker, and make it
extremely clear which VM hostkeys are being updated and why.

Signed-off-by: Dan Mick [email protected]

@dmick
Copy link
Member Author

dmick commented Oct 30, 2014

@ZackC. @wusui claims it resolved his issue. I've stared at it long enough that I can't see remaining issues, and the logging may help make this less mysterious for others.

@ceph-jenkins
Copy link

Tests failed for this pull request.
Refer to this link for build results: http://jenkins.ceph.com/job/teuthology-pull-requests/653/

@wusui
Copy link
Contributor

wusui commented Oct 30, 2014

Code looks okay to me.

The log.info message added produced some unexpected info on list

@dmick
Copy link
Member Author

dmick commented Oct 30, 2014

argh wrong @. @zmc, thoughts?

machine)
# Delete this variable to avoid linter errors when we redefine it
# in a list comprehension below
del machine
Copy link
Member

Choose a reason for hiding this comment

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

instead of dancing around the linter, why not just use a different variable like 'fqdn' ?

Copy link
Member Author

Choose a reason for hiding this comment

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

wasn't my code; I just factored it into the function. I wondered about that too. probably unnecessary altogether now that it's in a separate function, but I wasn't 100% sure what "linter" meant.

Copy link
Member Author

Choose a reason for hiding this comment

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

I researched: I refer you to 883c97d :) but it can probably just disappear now that it's in a different function.

Copy link
Member Author

Choose a reason for hiding this comment

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

repushed again and removed comment and del

@zmc
Copy link
Member

zmc commented Oct 30, 2014

Could you paste some sample output for posterity please?

@zmc
Copy link
Member

zmc commented Oct 30, 2014

Also - I fixed the unit test (that I broke and is unrelated to this), so if you rebase you'll pick that up.

@dmick
Copy link
Member Author

dmick commented Oct 30, 2014

$ teuthology-lock --brief
2014-10-30 15:42:14,507.507 INFO:teuthology.lock:updating host keys for vpm023.front.sepia.ceph.com vpm083.front.sepia.ceph.com vpm099.front.sepia.ceph.com vpm122.front.sepia.ceph.com
2014-10-30 15:42:15,023.023 INFO:teuthology.lock:Checking vpm099.front.sepia.ceph.com
2014-10-30 15:42:15,023.023 INFO:teuthology.lock:Checking vpm023.front.sepia.ceph.com
2014-10-30 15:42:15,023.023 INFO:teuthology.lock:New key found. Updating...
2014-10-30 15:42:25,239.239 INFO:teuthology.lock:Checking vpm083.front.sepia.ceph.com
2014-10-30 15:42:25,239.239 INFO:teuthology.lock:Checking vpm122.front.sepia.ceph.com
burnupi11.front.sepia.ceph.com locked dmick@angus "Calamari frontend to long-running cluster"
burnupi23.front.sepia.ceph.com locked dmick@angus "Calamari Jenkins build slave #2"
.
.
vpm023.front.sepia.ceph.com locked dmick@angus "None"
vpm083.front.sepia.ceph.com locked dmick@angus "None"
vpm099.front.sepia.ceph.com locked dmick@angus "None"
vpm122.front.sepia.ceph.com locked dmick@angus "None"

@dmick dmick force-pushed the wip-update-vm-hostkeys branch from 3fb604c to 344a80e Compare October 31, 2014 02:05
@ceph-jenkins
Copy link

Tests passed for this pull request.
Refer to this link for build results: http://jenkins.ceph.com/job/teuthology-pull-requests/655/

@dmick
Copy link
Member Author

dmick commented Oct 31, 2014

rebased to master

The existing logic was too tortured, and the previous fix was bad.
Rewrite to extract "get_statuses()" to a worker, and make it
extremely clear which VM hostkeys are being updated and why.

Signed-off-by: Dan Mick <[email protected]>
@dmick dmick force-pushed the wip-update-vm-hostkeys branch from 344a80e to 416528e Compare October 31, 2014 02:21
@ceph-jenkins
Copy link

Tests passed for this pull request.
Refer to this link for build results: http://jenkins.ceph.com/job/teuthology-pull-requests/656/

zmc added a commit that referenced this pull request Nov 6, 2014
@zmc zmc merged commit 137daaf into master Nov 6, 2014
@zmc zmc deleted the wip-update-vm-hostkeys branch November 6, 2014 20:22
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