kudu git commit: Disable rowset compaction in TestUndoDeltaBlockGc

[aw...@apache.org]

Repository: kudu
Updated Branches:
  refs/heads/master d63fbc9b2 -> 038c6bc05


Disable rowset compaction in TestUndoDeltaBlockGc

In a follow-up to this patch, rowset compaction is enhanced to merge
small rowsets. This will cause TestUndoDeltaBlockGc to be flaky, since
it creates small rowsets with undo deltas and tries to wait until they
are GC'd by the UndoDeltaBlockGc maintenance op; however, if rowset
compaction merges the rowsets after the undos have passed the AHM but
before UndoDeltaBlockGc runs, no undos will be deleted by the
UndoDeltaBlockGc task and the test will fail.

This fixes the test by simply disabling rowset compactions.

I ran the test 100 times with the change and the KUDU-1400 change on
top and saw zero failures.

Change-Id: If23f4568d10d83b7f463663cfc0d4052f2602224
Reviewed-on: http://gerrit.cloudera.org:8080/11884
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <as...@cloudera.com>


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

Branch: refs/heads/master
Commit: 038c6bc05794653ccba4e8290d7858c20c07e5c3
Parents: d63fbc9
Author: Will Berkeley <wd...@gmail.org>
Authored: Mon Nov 5 08:44:47 2018 -0800
Committer: Will Berkeley <wd...@gmail.com>
Committed: Tue Nov 6 16:30:57 2018 +0000

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


http://git-wip-us.apache.org/repos/asf/kudu/blob/038c6bc0/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 40b8ad5..269d0ec 100644
--- a/src/kudu/integration-tests/tablet_history_gc-itest.cc
+++ b/src/kudu/integration-tests/tablet_history_gc-itest.cc
@@ -86,6 +86,7 @@ using std::vector;
 using strings::Substitute;
 
 DECLARE_bool(enable_maintenance_manager);
+DECLARE_bool(enable_rowset_compaction);
 DECLARE_string(time_source);
 DECLARE_double(missed_heartbeats_before_rejecting_snapshot_scans);
 DECLARE_int32(flush_threshold_secs);
@@ -137,11 +138,13 @@ TEST_F(TabletHistoryGcITest, TestSnapshotScanBeforeAHM) {
 
 // Check that the maintenance manager op to delete undo deltas actually deletes them.
 TEST_F(TabletHistoryGcITest, TestUndoDeltaBlockGc) {
-  FLAGS_time_source = "mock"; // Allow moving the clock.
-  FLAGS_tablet_history_max_age_sec = 1000;
+  // Disable rowset compaction since it also does undo block GC.
+  FLAGS_enable_rowset_compaction = false;
   FLAGS_flush_threshold_secs = 0; // Flush as aggressively as possible.
-  FLAGS_maintenance_manager_polling_interval_ms = 1; // Spin on MM for a quick test.
   FLAGS_maintenance_manager_num_threads = 4; // Encourage concurrency.
+  FLAGS_maintenance_manager_polling_interval_ms = 1; // Spin on MM for a quick test.
+  FLAGS_tablet_history_max_age_sec = 1000;
+  FLAGS_time_source = "mock"; // Allow moving the clock.
 
   NO_FATALS(StartCluster(1)); // Single-node cluster.