From fce5994603c7e32021ef614b4afb47e057b8a248 Mon Sep 17 00:00:00 2001
From: Zhongyi Xie <xiez@fb.com>
Date: Wed, 7 Nov 2018 14:03:47 -0800
Subject: [PATCH] Add more sync point to fix flaky test GroupCommitTest

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/4637

Differential Revision: D12963727

Pulled By: miasantreble

fbshipit-source-id: 76053501afbecc6ef388ddc56542fa0185243e3f
---
 db/db_test.cc      | 4 +++-
 db/write_thread.cc | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/db/db_test.cc b/db/db_test.cc
index 7ee23780f..85cb37050 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -2351,7 +2351,9 @@ TEST_F(DBTest, GroupCommitTest) {
 
     rocksdb::SyncPoint::GetInstance()->LoadDependency(
         {{"WriteThread::JoinBatchGroup:BeganWaiting",
-          "DBImpl::WriteImpl:BeforeLeaderEnters"}});
+          "DBImpl::WriteImpl:BeforeLeaderEnters"},
+          {"WriteThread::AwaitState:BlockingWaiting",
+          "WriteThread::EnterAsBatchGroupLeader:End"}});
     rocksdb::SyncPoint::GetInstance()->EnableProcessing();
 
     // Start threads
diff --git a/db/write_thread.cc b/db/write_thread.cc
index 5ea7715c6..835992c8f 100644
--- a/db/write_thread.cc
+++ b/db/write_thread.cc
@@ -181,6 +181,7 @@ uint8_t WriteThread::AwaitState(Writer* w, uint8_t goal_mask,
   }
 
   if ((state & goal_mask) == 0) {
+    TEST_SYNC_POINT_CALLBACK("WriteThread::AwaitState:BlockingWaiting", w);
     state = BlockingAwaitState(w, goal_mask);
   }