MB-35612: replace needs to check for pending operation

The replace path was missing a check for the key having a pending
operation.

In the bug report in the case of a sync-delete in progress replace
views the StoredValue as deleted and incorrectly returns KEY_ENOENT.

Change-Id: I62af9207edf41f77230243c844fcfbc0bf703e25
Reviewed-on: http://review.couchbase.org/113578
Reviewed-by: Dave Rigby <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: jimwwalker

engines/ep/src/vbucket.cc

@@ -1599,6 +1599,10 @@ ENGINE_ERROR_CODE VBucket::replace(
         auto* v = htRes.selectSVToModify(itm);
         auto& hbl = htRes.getHBL();
 
+        if (v && v->isPending()) {
+            return ENGINE_SYNC_WRITE_IN_PROGRESS;
+        }
+
         if (v && v->isCompleted()) {
             v = nullptr;
         }

engines/ep/tests/module_tests/evp_store_durability_test.cc

@@ -171,6 +171,7 @@ class DurabilityEPBucketTest : public STParameterizedBucketTest {
     void verifyCollectionItemCount(VBucket& vb,
                                    CollectionID cID,
                                    uint64_t expectedValue);
+
 };
 
 /**
@@ -204,6 +205,17 @@ class DurabilityBucketTest : public STParameterizedBucketTest {
      */
     void testTakeoverDestinationHandlesPreparedSyncWrites(
             cb::durability::Level level);
+
+    // Call a number of operations where we expect a sync_write in progress
+    // error
+    void checkForSyncWriteInProgess(Item& pendingItem) {
+        auto* anotherClient = create_mock_cookie();
+        ASSERT_EQ(ENGINE_SYNC_WRITE_IN_PROGRESS,
+                  store->set(pendingItem, anotherClient, {}));
+        ASSERT_EQ(ENGINE_SYNC_WRITE_IN_PROGRESS,
+                  store->replace(pendingItem, anotherClient, {}));
+        destroy_mock_cookie(anotherClient);
+    }
 };
 
 class DurabilityEphemeralBucketTest : public STParameterizedBucketTest {
@@ -625,6 +637,8 @@ TEST_P(DurabilityBucketTest, SyncWriteSyncDelete) {
             ENGINE_EWOULDBLOCK,
             store->deleteItem(key, cas, vbid, cookie, reqs, nullptr, delInfo));
 
+    checkForSyncWriteInProgess(*pending);
+
     EXPECT_EQ(1, vb.getNumItems());
     EXPECT_EQ(1, vb.ht.getNumPreparedSyncWrites());