From a28282b157bb3063e3ef6c88e79a5864454caaa2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 1 May 2017 13:21:30 -0400 Subject: [PATCH] ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate thrashing If the PG moves we will reconnect and fail to time out. Wait for longer so that we mask the effects of osd thrashing. Fixes: http://tracker.ceph.com/issues/19433 Signed-off-by: Sage Weil --- src/test/librados/watch_notify.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc index 953df293f9cd..e28fd527119f 100644 --- a/src/test/librados/watch_notify.cc +++ b/src/test/librados/watch_notify.cc @@ -795,7 +795,9 @@ TEST_F(LibRadosWatchNotify, Watch3Timeout) { ASSERT_LT(age, age_bound * 1000); ASSERT_GT(age, 0); rados_conf_set(cluster, "objecter_inject_no_watch_ping", "true"); - int left = 2 * timeout; + // allow a long time here since an osd peering event will renew our + // watch. + int left = 16 * timeout; std::cout << "waiting up to " << left << " for osd to time us out ..." << std::endl; while (notify_err == 0 && --left) { -- 2.47.3