Change TabletHistoryGCITest back to manual flushes

Mike found a potential problem with client flushes when there are
concurrent manual and automatic flushes going on (KUDU-1761). Until
we address that this changes this test back to MANUAL_FLUSH with
a single flush at the end of each batch.

This change makes the test non-flaky (ran dist-test on a follow
up patch).

Change-Id: Ibf89a8b113f347a274aa59e59e0d8b7ebcb6f2f0
Reviewed-on: http://gerrit.cloudera.org:8080/5224
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/4c4c215a
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/4c4c215a
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/4c4c215a

Branch: refs/heads/master
Commit: 4c4c215ab1094f12156b0c05c220df920a832238
Parents: 0cb0455
Author: David Alves <[email protected]>
Authored: Thu Nov 24 13:26:15 2016 -0800
Committer: David Ribeiro Alves <[email protected]>
Committed: Mon Nov 28 19:31:52 2016 +0000

----------------------------------------------------------------------
 src/kudu/integration-tests/tablet_history_gc-itest.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/4c4c215a/src/kudu/integration-tests/tablet_history_gc-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/tablet_history_gc-itest.cc 
b/src/kudu/integration-tests/tablet_history_gc-itest.cc
index ec1e78a..e9503c6 100644
--- a/src/kudu/integration-tests/tablet_history_gc-itest.cc
+++ b/src/kudu/integration-tests/tablet_history_gc-itest.cc
@@ -392,8 +392,7 @@ TEST_F(RandomizedTabletHistoryGcITest, 
TestRandomHistoryGCWorkload) {
 
         client::sp::shared_ptr<client::KuduSession> session = 
client_->NewSession();
         session->SetTimeoutMillis(20000);
-        ASSERT_OK_FAST(session->SetFlushMode(
-                         client::KuduSession::AUTO_FLUSH_BACKGROUND));
+        
ASSERT_OK_FAST(session->SetFlushMode(client::KuduSession::MANUAL_FLUSH));
 
         for (int32_t i = 0; i < num_rows_to_insert; i++) {
           int32_t row_key = rows_inserted_;
@@ -459,8 +458,7 @@ TEST_F(RandomizedTabletHistoryGcITest, 
TestRandomHistoryGCWorkload) {
         } else {
           client::sp::shared_ptr<client::KuduSession> session = 
client_->NewSession();
           session->SetTimeoutMillis(20000);
-          ASSERT_OK_FAST(session->SetFlushMode(
-                           client::KuduSession::AUTO_FLUSH_BACKGROUND));
+          
ASSERT_OK_FAST(session->SetFlushMode(client::KuduSession::MANUAL_FLUSH));
 
           for (const MaterializedTestRow& test_row : updates) {
             unique_ptr<client::KuduUpdate> update(table->NewUpdate());
@@ -519,8 +517,7 @@ TEST_F(RandomizedTabletHistoryGcITest, 
TestRandomHistoryGCWorkload) {
         } else {
           client::sp::shared_ptr<client::KuduSession> session = 
client_->NewSession();
           session->SetTimeoutMillis(20000);
-          ASSERT_OK_FAST(session->SetFlushMode(
-                           client::KuduSession::AUTO_FLUSH_BACKGROUND));
+          
ASSERT_OK_FAST(session->SetFlushMode(client::KuduSession::MANUAL_FLUSH));
 
           for (int32_t row_key : deletes) {
             unique_ptr<client::KuduDelete> del(table->NewDelete());

Reply via email to