Merge pull request #1700 from Expensify/main

Update expensify_prod branch
Expensify · Apr 17, 2024 · 36b56dd · 36b56dd
2 parents 147e6e3 + 28e6573
commit 36b56dd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/BedrockCore.cpp b/BedrockCore.cpp
@@ -125,7 +125,6 @@ void BedrockCore::prePeekCommand(unique_ptr<BedrockCommand>& command) {
 }
 
 BedrockCore::RESULT BedrockCore::peekCommand(unique_ptr<BedrockCommand>& command, bool exclusive) {
-    AutoTimer timer(command, exclusive ? BedrockCommand::BLOCKING_PEEK : BedrockCommand::PEEK);
     BedrockServer::ScopedStateSnapshot snapshot(_server);
     command->lastPeekedOrProcessedInState = _server.getState();
 
@@ -146,6 +145,9 @@ BedrockCore::RESULT BedrockCore::peekCommand(unique_ptr<BedrockCommand>& command
                 STHROW("501 Failed to begin " + (exclusive ? "exclusive"s : "shared"s) + " transaction");
             }
 
+            // We start the timer here to avoid including the time spent acquiring the lock _sharedData.commitLock
+            AutoTimer timer(command, exclusive ? BedrockCommand::BLOCKING_PEEK : BedrockCommand::PEEK);
+
             // Make sure no writes happen while in peek command
             _db.setQueryOnly(true);