From: sdong Date: Wed, 14 Dec 2022 20:06:24 +0000 (-0800) Subject: ~SleepingBackgroundTask() to wake up the sleeping task (#11036) X-Git-Tag: v7.10.2~45 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1928902a6f3a33647b3b2a67cd13282f5b1f320f;p=rocksdb.git ~SleepingBackgroundTask() to wake up the sleeping task (#11036) Summary: Right now, in unit tests, when background tests are sleeping using SleepingBackgroundTask, and the test exits with test assertion failure, the process will hang and it might prevent us to see the test failure message in CI runs. Try to wake up the thread so that the test can exit correctly. Pull Request resolved: https://github.com/facebook/rocksdb/pull/11036 Test Plan: Watch CI succeeds Reviewed By: riversand963 Differential Revision: D42020489 fbshipit-source-id: 5b8441b18d5f67bbb3ade59a1225a8d3c860c2eb --- diff --git a/test_util/testutil.h b/test_util/testutil.h index 1f43156ab..c2289dd81 100644 --- a/test_util/testutil.h +++ b/test_util/testutil.h @@ -363,6 +363,16 @@ class SleepingBackgroundTask { done_with_sleep_(false), sleeping_(false) {} + ~SleepingBackgroundTask() { + MutexLock l(&mutex_); + should_sleep_ = false; + while (sleeping_) { + assert(!should_sleep_); + bg_cv_.SignalAll(); + bg_cv_.Wait(); + } + } + bool IsSleeping() { MutexLock l(&mutex_); return sleeping_;