MB-34422: Interlock vbucket delete and warmup

Change-Id: Icbdc4c9e1e8832dd846eefc14dab25bcd69243fc
Reviewed-on: http://review.couchbase.org/112341
Reviewed-by: James Harrison <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>
Tested-by: Dave Rigby <[email protected]>

Author: jimwwalker

engines/ep/src/ep_engine.cc

@@ -5830,6 +5830,10 @@ cb::mcbp::Status EventuallyPersistentEngine::startFlusher(const char** msg,
 ENGINE_ERROR_CODE EventuallyPersistentEngine::deleteVBucket(
         Vbid vbucket, bool waitForCompletion, const void* cookie) {
     ENGINE_ERROR_CODE status = ENGINE_SUCCESS;
+    if (getKVBucket()->maybeWaitForVBucketWarmup(cookie)) {
+        return ENGINE_EWOULDBLOCK;
+    }
+
     void* es = getEngineSpecific(cookie);
     if (waitForCompletion) {
         if (es == nullptr) {

engines/ep/tests/module_tests/evp_store_warmup_test.cc

@@ -232,6 +232,7 @@ TEST_F(WarmupTest, OperationsInterlockedWithWarmup) {
     const void* statsCookie1 = create_mock_cookie();
     const void* statsCookie2 = create_mock_cookie();
     const void* statsCookie3 = create_mock_cookie();
+    const void* delVbCookie = create_mock_cookie();
 
     std::unordered_map<const void*, int> notifications;
     notifications[setVBStateCookie] =
@@ -248,6 +249,7 @@ TEST_F(WarmupTest, OperationsInterlockedWithWarmup) {
             get_number_of_mock_cookie_io_notifications(statsCookie2);
     notifications[statsCookie3] =
             get_number_of_mock_cookie_io_notifications(statsCookie3);
+    notifications[delVbCookie] = get_number_of_mock_cookie_io_notifications(delVbCookie);
 
     auto dummyAddStats = [](const char*,
                             const uint16_t,
@@ -285,6 +287,9 @@ TEST_F(WarmupTest, OperationsInterlockedWithWarmup) {
                   engine->get_stats(
                           statsCookie3, "vbucket-seqno", dummyAddStats));
 
+        EXPECT_EQ(ENGINE_EWOULDBLOCK,
+                  engine->deleteVBucket(vbid, true, delVbCookie));
+
         executor.runCurrentTask();
     }
 
@@ -318,6 +323,8 @@ TEST_F(WarmupTest, OperationsInterlockedWithWarmup) {
     EXPECT_EQ(ENGINE_SUCCESS,
               engine->get_stats(statsCookie3, "vbucket-seqno", dummyAddStats));
 
+    EXPECT_EQ(ENGINE_SUCCESS, engine->deleteVBucket(vbid, false, delVbCookie));
+
     // finish warmup so the test can exit
     while (engine->getKVBucket()->isWarmingUp()) {
         CheckedExecutor executor(task_executor, readerQueue);