From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Oct 2019 15:00:43 +0000 (-0500)
Subject: Revert "test: librados startup/shutdown racer test"
X-Git-Tag: v15.1.0~1134^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3010d3a531ab21e8d3d2753b2a40526fd33589c9;p=ceph.git

Revert "test: librados startup/shutdown racer test"

This reverts commit 9b6ed03e607fe150c40f977043788efbd5116ddd.

Reverting this until we have a fix for https://tracker.ceph.com/issues/42026

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index 0c351db2d264..5f7fdd889f5a 100644
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -16,8 +16,6 @@
 #include "test/librados/test.h"
 #include "test/librados/TestCase.h"
 #include "gtest/gtest.h"
-#include <sys/time.h>
-#include <sys/resource.h>
 
 #include <errno.h>
 #include <map>
@@ -310,36 +308,3 @@ TEST_F(LibRadosMisc, MinCompatClient) {
   ASSERT_LE(-1, require_min_compat_client);
   ASSERT_GT(CEPH_RELEASE_MAX, require_min_compat_client);
 }
-
-static void shutdown_racer_func()
-{
-  const int niter = 32;
-  rados_t rad;
-  int i;
-
-  for (i = 0; i < niter; ++i) {
-    ASSERT_EQ("", connect_cluster(&rad));
-    rados_shutdown(rad);
-  }
-}
-
-// See trackers #20988 and #42026
-TEST_F(LibRadosMisc, ShutdownRace)
-{
-  const int nthreads = 128;
-  std::thread threads[nthreads];
-
-  // Need a bunch of fd's for this test
-  struct rlimit rold, rnew;
-  ASSERT_EQ(getrlimit(RLIMIT_NOFILE, &rold), 0);
-  rnew = rold;
-  rnew.rlim_cur = rnew.rlim_max;
-  ASSERT_EQ(setrlimit(RLIMIT_NOFILE, &rnew), 0);
-
-  for (int i = 0; i < nthreads; ++i)
-    threads[i] = std::thread(shutdown_racer_func);
-
-  for (int i = 0; i < nthreads; ++i)
-    threads[i].join();
-  ASSERT_EQ(setrlimit(RLIMIT_NOFILE, &rold), 0);
-}