ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate...

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 <sage@redhat.com>

diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc
index 953df293f9cd2817ea452a6bc2227d5b44d30aae..e28fd527119fb87019577d748eb717a2d5b26943 100644 (file)
--- 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) {