From 87df6295dd3b2e50eb6dd7becc6dd61be45d9b1d Mon Sep 17 00:00:00 2001
From: Venkatesh Radhakrishnan <rven@fb.com>
Date: Mon, 3 Aug 2015 15:52:52 -0700
Subject: [PATCH] Make SuggestCompactRangeNoTwoLevel0Compactions deterministic

Summary:
Made SuggestCompactRangeNoTwoLevel0Compactions by forcing
a flush after generating a file and waiting for compaction at the end.

Test Plan: Run SuggestCompactRangeNoTwoLevel0Compactions

Reviewers: yhchiang, igor, sdong

Reviewed By: sdong

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D43449
---
 db/db_compaction_test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc
index b67a5c1e9..4b91d29fa 100644
--- a/db/db_compaction_test.cc
+++ b/db/db_compaction_test.cc
@@ -1543,6 +1543,7 @@ TEST_F(DBCompactionTest, SuggestCompactRangeNoTwoLevel0Compactions) {
   for (int num = 0; num < options.level0_file_num_compaction_trigger + 1;
        num++) {
     GenerateNewRandomFile(&rnd, /* nowait */ true);
+    ASSERT_OK(Flush());
   }
 
   TEST_SYNC_POINT(
@@ -1554,10 +1555,12 @@ TEST_F(DBCompactionTest, SuggestCompactRangeNoTwoLevel0Compactions) {
   for (int num = 0; num < options.level0_file_num_compaction_trigger + 1;
        num++) {
     GenerateNewRandomFile(&rnd, /* nowait */ true);
+    ASSERT_OK(Flush());
   }
 
   TEST_SYNC_POINT(
       "DBCompactionTest::SuggestCompactRangeNoTwoLevel0Compactions:2");
+  dbfull()->TEST_WaitForCompact();
 }
 
 #endif  // !(defined NDEBUG) || !defined(OS_WIN)