You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by mp...@apache.org on 2016/07/20 02:48:20 UTC

incubator-kudu git commit: More disk_reservation-itest flaky test workarounds

Repository: incubator-kudu
Updated Branches:
  refs/heads/master 53c3b2c66 -> 3ee54af7b


More disk_reservation-itest flaky test workarounds

Change-Id: Iad76fc32a2e49b32089230e6ee5b997b53af7b66
Reviewed-on: http://gerrit.cloudera.org:8080/3683
Reviewed-by: Mike Percy <mp...@apache.org>
Tested-by: Mike Percy <mp...@apache.org>


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

Branch: refs/heads/master
Commit: 3ee54af7b5809d4489e6e8d5a28cef59ae39e4b9
Parents: 53c3b2c
Author: Mike Percy <mp...@apache.org>
Authored: Tue Jul 19 19:39:50 2016 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Wed Jul 20 02:47:59 2016 +0000

----------------------------------------------------------------------
 .../integration-tests/disk_reservation-itest.cc    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/3ee54af7/src/kudu/integration-tests/disk_reservation-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/disk_reservation-itest.cc b/src/kudu/integration-tests/disk_reservation-itest.cc
index 21ed0c0..77574bd 100644
--- a/src/kudu/integration-tests/disk_reservation-itest.cc
+++ b/src/kudu/integration-tests/disk_reservation-itest.cc
@@ -57,10 +57,12 @@ TEST_F(DiskReservationITest, TestFillMultipleDisks) {
     return;
   }
 
-  // Set up the tablet so that flushes are constantly occurring.
   vector<string> ts_flags;
+  // Don't preallocate very many bytes so we run the "full disk" check often.
+  ts_flags.push_back("--log_container_preallocate_bytes=100000");
+  // Set up the tablet so that flushes are constantly occurring.
   ts_flags.push_back("--flush_threshold_mb=0");
-  ts_flags.push_back("--maintenance_manager_polling_interval_ms=100");
+  ts_flags.push_back("--maintenance_manager_polling_interval_ms=50");
   ts_flags.push_back("--disable_core_dumps");
   ts_flags.push_back(Substitute("--fs_data_dirs=$0/a,$0/b",
                                 GetTestDataDirectory()));
@@ -73,6 +75,9 @@ TEST_F(DiskReservationITest, TestFillMultipleDisks) {
 
   TestWorkload workload(cluster_.get());
   workload.set_num_replicas(1);
+  workload.set_num_write_threads(4);
+  workload.set_write_batch_size(10);
+  workload.set_payload_bytes(1024);
   workload.set_timeout_allowed(true);
   workload.set_write_timeout_millis(500);
   workload.Setup();
@@ -114,7 +119,13 @@ TEST_F(DiskReservationITest, TestFillMultipleDisks) {
                               "disk_reserved_override_prefix_2_bytes_free_for_testing", "0"));
 
   // Wait for crash due to inability to flush or compact.
-  ASSERT_OK(cluster_->tablet_server(0)->WaitForCrash(MonoDelta::FromSeconds(10)));
+  Status s;
+  for (int i = 0; i < 10; i++) {
+    s = cluster_->tablet_server(0)->WaitForCrash(MonoDelta::FromSeconds(1));
+    if (s.ok()) break;
+    LOG(INFO) << "Rows inserted: " << workload.rows_inserted();
+  }
+  ASSERT_OK(s);
   workload.StopAndJoin();
 }