I really should have updated the commit message on this one, sorry about that!
On Fri, Mar 14, 2014 at 4:17 PM, <[email protected]> wrote: > Repository: mesos > Updated Branches: > refs/heads/master 0d65a3c29 -> b269b4ea4 > > > Added a --registry_strict_operations flag that must be false for now. > > Review: https://reviews.apache.org/r/19135 > > > Project: http://git-wip-us.apache.org/repos/asf/mesos/repo > Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1b6e07d > Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1b6e07d > Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1b6e07d > > Branch: refs/heads/master > Commit: b1b6e07d0875b559fd077f1bedd34969b7d453fd > Parents: 90a7c50 > Author: Benjamin Mahler <[email protected]> > Authored: Wed Mar 12 11:26:04 2014 -0700 > Committer: Benjamin Mahler <[email protected]> > Committed: Fri Mar 14 15:32:15 2014 -0700 > > ---------------------------------------------------------------------- > src/local/local.cpp | 4 ++++ > src/master/flags.hpp | 13 ++++++++++++- > src/master/main.cpp | 4 ++++ > src/tests/cluster.hpp | 4 ++++ > 4 files changed, 24 insertions(+), 1 deletion(-) > ---------------------------------------------------------------------- > > > > http://git-wip-us.apache.org/repos/asf/mesos/blob/b1b6e07d/src/local/local.cpp > ---------------------------------------------------------------------- > diff --git a/src/local/local.cpp b/src/local/local.cpp > index e31c19c..ea4a339 100644 > --- a/src/local/local.cpp > +++ b/src/local/local.cpp > @@ -115,6 +115,10 @@ PID<Master> launch(const Flags& flags, Allocator* > _allocator) > << "master flags from the environment: " << load.error(); > } > > + if (flags.registry_strict) { > + EXIT(1) << "Cannot run with --registry_strict; currently not > supported"; > + } > + > if (strings::startsWith(flags.registry, "zk://")) { > // TODO(benh): > EXIT(1) << "ZooKeeper based registry unimplemented"; > > > http://git-wip-us.apache.org/repos/asf/mesos/blob/b1b6e07d/src/master/flags.hpp > ---------------------------------------------------------------------- > diff --git a/src/master/flags.hpp b/src/master/flags.hpp > index 012eb5a..4267678 100644 > --- a/src/master/flags.hpp > +++ b/src/master/flags.hpp > @@ -62,6 +62,16 @@ public: > "URL (i.e., 'zk://host1:port1,host2:port2,.../path')", > "local"); > > + // TODO(bmahler): Set the default to true in 0.20.0. > + 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 a slave. Consequently, 'false' can be used to\n" > + "bootstrap the persistent state on a running cluster.", > + false); > + > add(&Flags::webui_dir, > "webui_dir", > "Location of the webui files/assets", > @@ -80,7 +90,7 @@ public: > "between users. May be one of:\n" > " dominant_resource_fairness (drf)", > "drf"); > - > + > add(&Flags::framework_sorter, > "framework_sorter", > "Policy to use for allocating resources\n" > @@ -130,6 +140,7 @@ public: > bool root_submissions; > std::string work_dir; > std::string registry; > + bool registry_strict; > std::string webui_dir; > std::string whitelist; > std::string user_sorter; > > > http://git-wip-us.apache.org/repos/asf/mesos/blob/b1b6e07d/src/master/main.cpp > ---------------------------------------------------------------------- > diff --git a/src/master/main.cpp b/src/master/main.cpp > index a99fb64..aceb4d9 100644 > --- a/src/master/main.cpp > +++ b/src/master/main.cpp > @@ -156,6 +156,10 @@ int main(int argc, char** argv) > allocator::Allocator* allocator = > new allocator::Allocator(allocatorProcess); > > + if (flags.registry_strict) { > + EXIT(1) << "Cannot run with --registry_strict; currently not > supported"; > + } > + > state::Storage* storage = NULL; > > if (strings::startsWith(flags.registry, "zk://")) { > > > http://git-wip-us.apache.org/repos/asf/mesos/blob/b1b6e07d/src/tests/cluster.hpp > ---------------------------------------------------------------------- > diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp > index 24bb750..e282560 100644 > --- a/src/tests/cluster.hpp > +++ b/src/tests/cluster.hpp > @@ -268,6 +268,10 @@ inline Try<process::PID<master::Master> > > Cluster::Masters::start( > new master::allocator::Allocator(allocatorProcess.get()); > } > > + if (flags.registry_strict) { > + EXIT(1) << "Cannot run with --registry_strict; currently not > supported"; > + } > + > if (strings::startsWith(flags.registry, "zk://")) { > // TODO(benh): > return Error("ZooKeeper based registry unimplemented"); > >
