From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Dec 2014 17:52:04 +0000 (-0800)
Subject: ceph_test_rados_api_watch_notify: wait longer for osd to time us out
X-Git-Tag: v0.91~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e32e3bd82191fda9cf8078451ccf5b3e2053b20;p=ceph.git

ceph_test_rados_api_watch_notify: wait longer for osd to time us out

If cluster is thrashing this can fail.

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 ce4684656c3..3e508025a9b 100644
--- a/src/test/librados/watch_notify.cc
+++ b/src/test/librados/watch_notify.cc
@@ -231,7 +231,7 @@ TEST_F(LibRadosWatchNotify, Watch2Delete) {
 			 watch_notify2_test_cb,
 			 watch_notify2_test_errcb, NULL));
   ASSERT_EQ(0, rados_remove(ioctx, notify_oid));
-  int left = 180;
+  int left = 300;
   std::cout << "waiting up to " << left << " for disconnect notification ..."
 	    << std::endl;
   while (notify_err == 0 && --left) {
@@ -262,7 +262,7 @@ TEST_F(LibRadosWatchNotify, Watch2Timeout) {
   ASSERT_LT(age, age_bound * 1000);
   ASSERT_GT(age, 0);
   rados_conf_set(cluster, "objecter_inject_no_watch_ping", "true");
-  int left = 180;
+  int left = 300;
   std::cout << "waiting up to " << left << " for osd to time us out ..."
 	    << std::endl;
   while (notify_err == 0 && --left) {