MB-45459: Pass old item to persistenceFailureStatOvercounts

Currently we pass the old queue time to the
persistenceFailureStatOvercounts stats (stat changes applied if a
flush fails) which is required as the queue time may change for the
next item flushed. The same issue exists for dirtyQueuePendingWrites
which may change if the item changes size. Pass the entire old item
to the persistenceFailureStatOvercounts instead.

Change-Id: I9caa796522b876a5b6d96685832951aac0d8579c
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/151033
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: BenHuddleston

engines/ep/src/checkpoint.cc

@@ -352,13 +352,12 @@ QueueDirtyResult Checkpoint::queueDirty(const queued_item& qi,
                             (*(*backupPCursor->second).currentPos)
                                     ->getBySeqno();
                     if (backupPCursorSeqno <= currMutationId) {
-                        // Pass the old queueTime in. When we return and update
-                        // the stats we'll use the new queueTime and the flush
-                        // will pick up the new queueTime too so we need to
-                        // patch the increment of the original stat
-                        // update/queueTime
+                        // Pass the oldItem in. When we return and update
+                        // the stats we'll use the new item and the flush
+                        // will pick up the new item too so we have to match
+                        // the original (oldItem) increment with a decrement
                         checkpointManager->persistenceFailureStatOvercounts
-                                .accountItem(*qi, oldItem->getQueuedTime());
+                                .accountItem(*oldItem);
                     }
 
                     decrCursorIfSameKey();

engines/ep/tests/module_tests/evp_store_single_threaded_test.cc

@@ -7057,7 +7057,7 @@ TEST_P(STParamCouchstoreBucketTest,
     kvstore->setPostFlushHook([this, &vb]() {
         store_item(vbid,
                    makeStoredDocKey("keyA"),
-                   "value",
+                   "biggerValue",
                    0 /*exptime*/,
                    {cb::engine_errc::success} /*expected*/,
                    PROTOCOL_BINARY_RAW_BYTES);
@@ -7084,6 +7084,7 @@ TEST_P(STParamCouchstoreBucketTest,
     EXPECT_EQ(0, vb.dirtyQueueSize);
     EXPECT_EQ(0, vb.dirtyQueueAge);
     EXPECT_EQ(0, vb.dirtyQueueMem);
+    EXPECT_EQ(0, vb.dirtyQueuePendingWrites);
 }
 
 TEST_P(STParameterizedBucketTest, CkptMgrDedupeStatsCorrectSmallToLarge) {