Repository: kudu
Updated Branches:
refs/heads/master 37f3a95d8 -> c1c15ad5f
KUDU-2472: address master-stress-test flakiness
Restores a hack that prevented master-stress-test flakiness, and adds a
TODO to remove the hack once KUDU-1358 is addressed. The hack was broken
in 1a707b991 when an error message was tweaked.
Change-Id: I639eedaf2efc50d1be0dc719f2fcb7cc8fdd1fb9
Reviewed-on: http://gerrit.cloudera.org:8080/10700
Reviewed-by: Adar Dembo
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/c1c15ad5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/c1c15ad5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/c1c15ad5
Branch: refs/heads/master
Commit: c1c15ad5fd6dd1d96dae4695880680f91130d7a0
Parents: 37f3a95
Author: Dan Burkert
Authored: Tue Jun 12 10:55:42 2018 -0700
Committer: Dan Burkert
Committed: Tue Jun 12 18:53:01 2018 +
--
src/kudu/integration-tests/master-stress-test.cc | 10 +++---
src/kudu/master/catalog_manager.cc | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/kudu/blob/c1c15ad5/src/kudu/integration-tests/master-stress-test.cc
--
diff --git a/src/kudu/integration-tests/master-stress-test.cc
b/src/kudu/integration-tests/master-stress-test.cc
index 30bed01..9dfd600 100644
--- a/src/kudu/integration-tests/master-stress-test.cc
+++ b/src/kudu/integration-tests/master-stress-test.cc
@@ -211,9 +211,13 @@ class MasterStressTest : public KuduTest {
continue;
}
if (s.IsInvalidArgument() &&
- MatchPattern(s.ToString(), "*Not enough live tablet servers*")) {
-// The test placed enough load on the cluster that some tservers
-// haven't heartbeat in a little while.
+ MatchPattern(s.ToString(), "*not enough live tablet servers*")) {
+// The test placed enough load on the cluster that some tservers
haven't
+// heartbeat in a while, or the leader master has not been alive for
+// long enough to receive heartbeats from all tservers.
+//
+// TODO(KUDU-1358): remove this special case once table creation
+// following leader restart is robust.
continue;
}
CHECK_OK(s);
http://git-wip-us.apache.org/repos/asf/kudu/blob/c1c15ad5/src/kudu/master/catalog_manager.cc
--
diff --git a/src/kudu/master/catalog_manager.cc
b/src/kudu/master/catalog_manager.cc
index 6438901..55cf535 100644
--- a/src/kudu/master/catalog_manager.cc
+++ b/src/kudu/master/catalog_manager.cc
@@ -1438,6 +1438,7 @@ Status CatalogManager::CreateTable(const
CreateTableRequestPB* orig_req,
// Verify that the number of replicas isn't larger than the number of live
tablet
// servers.
if (FLAGS_catalog_manager_check_ts_count_for_create_table && num_replicas >
num_live_tservers) {
+// Note: this error message is matched against in master-stress-test.
return SetupError(Status::InvalidArgument(Substitute(
"not enough live tablet servers to create a table with the
requested replication "
"factor $0; $1 tablet servers are alive", req.num_replicas(),
num_live_tservers)),
