RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #41147 into master

Browse Source 
* refs/pull/41147/head:
	ceph_test_rados_api_service: stop threads before asserting
	ceph_test_rados_api_service: more retries for servicemkap

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Sage Weil 2021-05-05 14:08:11 -04:00
commit b36bab6f2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/librados/service.cc
View File

@ -120,7 +120,7 @@ TEST(LibRadosService, StatusFormat) {
});
}
int retry = 5;
int retry = 15;
while (retry) {
rados_t cluster;
@ -163,7 +163,6 @@ TEST(LibRadosService, StatusFormat) {
sleep(2);
retry--;
}
ASSERT_NE(0, retry);
{
std::scoped_lock<std::mutex> l(lock);
@ -173,6 +172,7 @@ TEST(LibRadosService, StatusFormat) {
for (int i = 0; i < nthreads; ++i)
threads[i].join();
ASSERT_NE(0, retry);
ASSERT_EQ(setrlimit(RLIMIT_NOFILE, &rold), 0);
}