Removed use of "--registry_strict" master flag. The flag will remain for a few more months per the deprecation policy, but we no longer need to set it in the unit tests. Providing an extensive usage summary in "--help" output also doesn't seem useful.
Review: https://reviews.apache.org/r/51958/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/29236068 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/29236068 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/29236068 Branch: refs/heads/master Commit: 29236068f23b6cfbd19d7a4b5b96be852818a356 Parents: 6280299 Author: Neil Conway <neil.con...@gmail.com> Authored: Mon Sep 19 15:49:38 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Mon Sep 19 15:49:38 2016 -0700 ---------------------------------------------------------------------- src/master/flags.cpp | 5 +---- src/tests/cluster.cpp | 6 ++---- src/tests/mesos.cpp | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/29236068/src/master/flags.cpp ---------------------------------------------------------------------- diff --git a/src/master/flags.cpp b/src/master/flags.cpp index aea8bd4..9bfb40e 100644 --- a/src/master/flags.cpp +++ b/src/master/flags.cpp @@ -89,10 +89,7 @@ mesos::internal::master::Flags::Flags() add(&Flags::registry_strict, "registry_strict", "Whether the master will take actions based on the persistent\n" - "information stored in the Registry. Setting this to false means\n" - "that the Registrar will never reject the admission, readmission,\n" - "or removal of an agent. Consequently, `false` can be used to\n" - "bootstrap the persistent state on a running cluster.\n" + "information stored in the Registry.\n" "NOTE: This flag is *disabled* and will be removed in a future\n" "version of Mesos.", false, http://git-wip-us.apache.org/repos/asf/mesos/blob/29236068/src/tests/cluster.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cluster.cpp b/src/tests/cluster.cpp index 7152ac3..f201b49 100644 --- a/src/tests/cluster.cpp +++ b/src/tests/cluster.cpp @@ -192,10 +192,8 @@ Try<process::Owned<Master>> Master::start( } // Check for some invalid flag combinations. - if (flags.registry == "in_memory" && flags.registry_strict) { - return Error( - "Cannot use '--registry_strict' when using in-memory storage based" - " registry"); + if (flags.registry_strict) { + return Error("Support for '--registry_strict' has been removed"); } if (flags.registry == "replicated_log" && flags.work_dir.isNone()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/29236068/src/tests/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp index 07a64f0..2aae160 100644 --- a/src/tests/mesos.cpp +++ b/src/tests/mesos.cpp @@ -145,7 +145,6 @@ master::Flags MesosTest::CreateMasterFlags() // Use the replicated log (without ZooKeeper) by default. flags.registry = "replicated_log"; - flags.registry_strict = true; // On many test VMs, this default is too small. flags.registry_store_timeout = flags.registry_store_timeout * 5;
