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

nautilus: ceph_test_rados_api_{watch_notify,misc}: tolerate some timeouts #35049

Merged
merged 8 commits into from
May 22, 2020

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented May 13, 2020

backport tracker: https://tracker.ceph.com/issues/45224

NOTE: the following revert from the master PR was not included because the commit being reverted was never backported to nautilus:

  • Revert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60"

backport of #34011
parent tracker: https://tracker.ceph.com/issues/44062

this backport was staged using ceph-backport.sh version 15.1.1.389
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@smithfarm smithfarm added this to the nautilus milestone May 13, 2020
smithfarm and others added 8 commits May 13, 2020 17:45
This reverts commit 65e81e6.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Conflicts:
    reverted the nautilus commit instead of cherry-picking the revert of
    the master commit
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4fda9d5)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit baeb051)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 52d706c)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7c19c15)
When running under valgrind (and thrashing) things can be slow.  Tell
tests in case they need to tolerate timeouts.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 40a7bce)
See https://tracker.ceph.com/issues/44062

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2183edc)
@yuriw
Copy link
Contributor

yuriw commented May 13, 2020

Copy link
Contributor

@badone badone left a comment

Choose a reason for hiding this comment

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

Looks OK to me.

@yuriw yuriw merged commit fd80879 into ceph:nautilus May 22, 2020
@smithfarm smithfarm deleted the wip-45224-nautilus branch May 25, 2020 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants