You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/03/15 00:17:11 UTC
[4/5] git commit: Switched from LevelDBStorage to InMemoryStorage for
registry flag.
Switched from LevelDBStorage to InMemoryStorage for registry flag.
Review: https://reviews.apache.org/r/19134
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/75f76942
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/75f76942
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/75f76942
Branch: refs/heads/master
Commit: 75f76942e27f16f2d7ce31ae203acad0754f7fbb
Parents: e536c16
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Wed Mar 12 11:12:39 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Fri Mar 14 15:33:28 2014 -0700
----------------------------------------------------------------------
src/local/local.cpp | 9 +++------
src/master/flags.hpp | 6 +++---
src/master/main.cpp | 9 +++------
src/tests/cluster.hpp | 10 +++-------
4 files changed, 12 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/75f76942/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index 497863b..2cfdf49 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -44,6 +44,7 @@
#include "slave/containerizer/containerizer.hpp"
#include "slave/slave.hpp"
+#include "state/in_memory.hpp"
#include "state/leveldb.hpp"
#include "state/protobuf.hpp"
#include "state/storage.hpp"
@@ -119,12 +120,8 @@ PID<Master> launch(const Flags& flags, Allocator* _allocator)
EXIT(1) << "Cannot run with --registry_strict; currently not supported";
}
- if (strings::startsWith(flags.registry, "zk://")) {
- // TODO(benh):
- EXIT(1) << "ZooKeeper based registry unimplemented";
- } else if (flags.registry == "local") {
- storage = new state::LevelDBStorage(
- path::join(flags.work_dir, "registry"));
+ if (flags.registry == "in_memory") {
+ storage = new state::InMemoryStorage();
} else {
EXIT(1) << "'" << flags.registry << "' is not a supported"
<< " option for registry persistence";
http://git-wip-us.apache.org/repos/asf/mesos/blob/75f76942/src/master/flags.hpp
----------------------------------------------------------------------
diff --git a/src/master/flags.hpp b/src/master/flags.hpp
index 4267678..024f86d 100644
--- a/src/master/flags.hpp
+++ b/src/master/flags.hpp
@@ -55,12 +55,12 @@ public:
"Where to store master specific files\n",
"/tmp/mesos");
+ // TODO(bmahler): Add replicated log backed registry.
add(&Flags::registry,
"registry",
"Persistence strategy for the registry;\n"
- "available options are 'local' or a ZooKeeper\n"
- "URL (i.e., 'zk://host1:port1,host2:port2,.../path')",
- "local");
+ "available options are 'in_memory'.",
+ "in_memory");
// TODO(bmahler): Set the default to true in 0.20.0.
add(&Flags::registry_strict,
http://git-wip-us.apache.org/repos/asf/mesos/blob/75f76942/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index bcb6451..f12f20a 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -45,7 +45,7 @@
#include "master/registrar.hpp"
#include "master/repairer.hpp"
-#include "state/leveldb.hpp"
+#include "state/in_memory.hpp"
#include "state/protobuf.hpp"
#include "state/storage.hpp"
@@ -162,11 +162,8 @@ int main(int argc, char** argv)
state::Storage* storage = NULL;
- if (strings::startsWith(flags.registry, "zk://")) {
- // TODO(benh):
- EXIT(1) << "ZooKeeper based registry unimplemented";
- } else if (flags.registry == "local") {
- storage = new state::LevelDBStorage(path::join(flags.work_dir, "registry"));
+ if (flags.registry == "in_memory") {
+ storage = new state::InMemoryStorage();
} else {
EXIT(1) << "'" << flags.registry << "' is not a supported"
<< " option for registry persistence";
http://git-wip-us.apache.org/repos/asf/mesos/blob/75f76942/src/tests/cluster.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp
index 91f35c4..40d9f8c 100644
--- a/src/tests/cluster.hpp
+++ b/src/tests/cluster.hpp
@@ -48,7 +48,7 @@
#include "slave/containerizer/containerizer.hpp"
#include "slave/slave.hpp"
-#include "state/leveldb.hpp"
+#include "state/in_memory.hpp"
#include "state/protobuf.hpp"
#include "state/storage.hpp"
@@ -272,12 +272,8 @@ inline Try<process::PID<master::Master> > Cluster::Masters::start(
EXIT(1) << "Cannot run with --registry_strict; currently not supported";
}
- if (strings::startsWith(flags.registry, "zk://")) {
- // TODO(benh):
- return Error("ZooKeeper based registry unimplemented");
- } else if (flags.registry == "local") {
- masterInfo.storage = new state::LevelDBStorage(
- path::join(flags.work_dir, "registry"));
+ if (flags.registry == "in_memory") {
+ masterInfo.storage = new state::InMemoryStorage();
} else {
return Error("'" + flags.registry + "' is not a supported"
" option for registry persistence");