Merge pull request ceph#48014 from idryomov/wip-57116-cont

test/{librbd, rgw}: increase delay between and number of bind attempts Reviewed-by: Casey Bodley <[email protected]> Reviewed-by: Laura Flores <[email protected]>
mitsu-ko · Sep 8, 2022 · f4bb197 · f4bb197
2 parents 0cdd0c4 + 48016ea
commit f4bb197
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/test/librbd/migration/test_mock_HttpClient.cc b/src/test/librbd/migration/test_mock_HttpClient.cc
@@ -86,7 +86,7 @@ class TestMockMigrationHttpClient : public TestMockFixture {
 
   // if we have a racing where another thread manages to bind and listen the
   // port picked by this acceptor, try again.
-  static constexpr int MAX_BIND_RETRIES = 42;
+  static constexpr int MAX_BIND_RETRIES = 60;
 
   void create_acceptor(bool reuse) {
     for (int retries = 0;; retries++) {
@@ -105,7 +105,7 @@ class TestMockMigrationHttpClient : public TestMockFixture {
 	}
       }
       // backoff a little bit
-      usleep(retries * 10'000);
+      sleep(1);
     }
     m_server_port = m_acceptor->local_endpoint().port();
   }

diff --git a/src/test/rgw/test_http_manager.cc b/src/test/rgw/test_http_manager.cc
@@ -29,7 +29,7 @@ namespace {
 
   // if we have a racing where another thread manages to bind and listen the
   // port picked by this acceptor, try again.
-  static constexpr int MAX_BIND_RETRIES = 42;
+  static constexpr int MAX_BIND_RETRIES = 60;
 
   tcp::acceptor try_bind(boost::asio::io_context& ioctx) {
     using tcp = boost::asio::ip::tcp;
@@ -50,7 +50,7 @@ namespace {
 	}
       }
       // backoff a little bit
-      usleep(retries * 10'000);
+      sleep(1);
     }
     return acceptor;
   }