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

lock/ops.py: Fix retry mechanism for unlock_one #1675

Merged
merged 1 commit into from Sep 20, 2021

Conversation

amathuria
Copy link
Contributor

In unlock_one, we currently have a retry mechanism that is only triggered on a particular exception. With this change, we retry the request to unlock no matter what the cause of failure.

Fixes: https://tracker.ceph.com/issues/50921
Signed-off-by: Aishwarya Mathuria amathuri@redhat.com

jdurgin
jdurgin previously approved these changes Sep 15, 2021
djgalloway
djgalloway previously approved these changes Sep 15, 2021
@jdurgin
Copy link
Member

jdurgin commented Sep 15, 2021

@susebot run deploy

@susebot
Copy link

susebot commented Sep 15, 2021

Commit 10ca8ee is NOT OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/367/

@jdurgin
Copy link
Member

jdurgin commented Sep 15, 2021

deploy test ran into a pip error installing pulpito dependencies: ``` Downloading ipdb-0.8.1.zip (20 kB)

:stderr:     ERROR: Command errored out with exit status 1:
     command: /home/pulpito/pulpito/virtualenv/bin/python3 -c 'import io, os, sys, setuptools, tokenize; sys.argv[0] = '"'"'/tmp/pip-install-9jbzjnmq/ipdb_1f91995e0d2d467387aba72fcf3178d8/setup.py'"'"'; __file__='"'"'/tmp/pip-install-9jbzjnmq/ipdb_1f91995e0d2d467387aba72fcf3178d8/setup.py'"'"';f = getattr(tokenize, '"'"'open'"'"', open)(__file__) if os.path.exists(__file__) else io.StringIO('"'"'from setuptools import setup; setup()'"'"');code = f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /tmp/pip-pip-egg-info-78un2e2f
         cwd: /tmp/pip-install-9jbzjnmq/ipdb_1f91995e0d2d467387aba72fcf3178d8/
    Complete output (1 lines):
    error in ipdb setup command: use_2to3 is invalid.

@zmc
Copy link
Member

zmc commented Sep 15, 2021

@jdurgin ceph/pulpito#85

@jdurgin
Copy link
Member

jdurgin commented Sep 15, 2021

@susebot run deploy

@susebot
Copy link

susebot commented Sep 16, 2021

Commit 10ca8ee is OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/370/

Copy link
Member

@zmc zmc left a comment

Choose a reason for hiding this comment

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

Good catch on this fix! I'm requesting one change just to avoid surprising behavioral changes that are unrelated to the bug this fixes.

teuthology/lock/ops.py Outdated Show resolved Hide resolved
In unlock_one, we currently have a retry mechanism that is only triggered on a particular exception. With this change, we retry the request to unlock no matter what the cause of failure.

Fixes: https://tracker.ceph.com/issues/50921
Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
@jdurgin
Copy link
Member

jdurgin commented Sep 17, 2021

@susebot run deploy

@susebot
Copy link

susebot commented Sep 17, 2021

Commit c25926b is OK.
Check tests results in the Jenkins job: https://ceph-ci.suse.de/job/pr-teuthology-deploy/371/

@jdurgin
Copy link
Member

jdurgin commented Sep 20, 2021

@zmc look ok now?

Copy link
Member

@zmc zmc left a comment

Choose a reason for hiding this comment

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

Thanks!

@zmc zmc merged commit d3a488f into ceph:master Sep 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants