http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/main.cpp ---------------------------------------------------------------------- diff --git a/src/master/main.cpp b/src/master/main.cpp index e5e76ce..a295490 100644 --- a/src/master/main.cpp +++ b/src/master/main.cpp @@ -65,9 +65,10 @@ #include "zookeeper/detector.hpp" -using namespace mesos::internal; -using namespace mesos::internal::log; -using namespace mesos::internal::master; +using namespace mesos; +using namespace mesos::log; +using namespace mesos::master; +using namespace mesos::state; using namespace zookeeper; using mesos::MasterInfo; @@ -191,7 +192,7 @@ int main(int argc, char** argv) allocator::Allocator* allocator = new allocator::Allocator(allocatorProcess); - state::Storage* storage = NULL; + Storage* storage = NULL; Log* log = NULL; if (flags.registry == "in_memory") { @@ -199,7 +200,7 @@ int main(int argc, char** argv) EXIT(1) << "Cannot use '--registry_strict' when using in-memory storage" << " based registry"; } - storage = new state::InMemoryStorage(); + storage = new InMemoryStorage(); } else if (flags.registry == "replicated_log" || flags.registry == "log_storage") { // TODO(bmahler): "log_storage" is present for backwards @@ -255,7 +256,7 @@ int main(int argc, char** argv) set<UPID>(), flags.log_auto_initialize); } - storage = new state::LogStorage(log); + storage = new LogStorage(log); } else { EXIT(1) << "'" << flags.registry << "' is not a supported" << " option for registry persistence"; @@ -263,7 +264,8 @@ int main(int argc, char** argv) CHECK_NOTNULL(storage); - state::protobuf::State* state = new state::protobuf::State(storage); + mesos::state::protobuf::State* state = + new mesos::state::protobuf::State(storage); Registrar* registrar = new Registrar(flags, state); Repairer* repairer = new Repairer();
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 234bbec..22fece7 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -105,7 +105,6 @@ using process::metrics::Counter; using memory::shared_ptr; namespace mesos { -namespace internal { namespace master { using allocator::Allocator; @@ -5071,5 +5070,4 @@ double Master::_resources_percent(const std::string& name) } } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index dcfd38a..c3c77f8 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -65,7 +65,6 @@ class RateLimiter; // Forward declaration. } namespace mesos { -namespace internal { // Forward declarations. namespace registry { @@ -1268,7 +1267,6 @@ private: }; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MASTER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/metrics.cpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.cpp b/src/master/metrics.cpp index 5fe71e3..0b3b91e 100644 --- a/src/master/metrics.cpp +++ b/src/master/metrics.cpp @@ -23,7 +23,6 @@ namespace mesos { -namespace internal { namespace master { // Message counters are named with "messages_" prefix so they can @@ -347,5 +346,4 @@ Metrics::~Metrics() } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/metrics.hpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.hpp b/src/master/metrics.hpp index 5e18f88..ee8b5bc 100644 --- a/src/master/metrics.hpp +++ b/src/master/metrics.hpp @@ -29,7 +29,6 @@ #include <stout/hashmap.hpp> namespace mesos { -namespace internal { namespace master { class Master; @@ -167,7 +166,6 @@ struct Metrics }; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MASTER_METRICS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/registrar.cpp ---------------------------------------------------------------------- diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp index 0831963..d2c5c3d 100644 --- a/src/master/registrar.cpp +++ b/src/master/registrar.cpp @@ -46,8 +46,8 @@ #include "state/protobuf.hpp" -using mesos::internal::state::protobuf::State; -using mesos::internal::state::protobuf::Variable; +using mesos::state::protobuf::State; +using mesos::state::protobuf::Variable; using process::dispatch; using process::spawn; @@ -73,7 +73,6 @@ using std::deque; using std::string; namespace mesos { -namespace internal { namespace master { using process::http::Response; @@ -542,5 +541,4 @@ Future<bool> Registrar::apply(Owned<Operation> operation) } } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/registrar.hpp ---------------------------------------------------------------------- diff --git a/src/master/registrar.hpp b/src/master/registrar.hpp index 6bc78c4..701b107 100644 --- a/src/master/registrar.hpp +++ b/src/master/registrar.hpp @@ -32,7 +32,6 @@ #include "state/protobuf.hpp" namespace mesos { -namespace internal { namespace master { // Forward declaration. @@ -123,7 +122,6 @@ private: }; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MASTER_REGISTRAR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/repairer.cpp ---------------------------------------------------------------------- diff --git a/src/master/repairer.cpp b/src/master/repairer.cpp index 454e137..201ac25 100644 --- a/src/master/repairer.cpp +++ b/src/master/repairer.cpp @@ -21,7 +21,6 @@ #include "master/repairer.hpp" namespace mesos { -namespace internal { namespace master { using std::string; @@ -42,5 +41,4 @@ Repairer::~Repairer() } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/repairer.hpp ---------------------------------------------------------------------- diff --git a/src/master/repairer.hpp b/src/master/repairer.hpp index d5c6b84..236b8de 100644 --- a/src/master/repairer.hpp +++ b/src/master/repairer.hpp @@ -22,7 +22,6 @@ #include <mesos/mesos.hpp> namespace mesos { -namespace internal { namespace master { // An abstraction for recieve notification of unhealty nodes @@ -38,7 +37,6 @@ public: }; } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __MESOS_MASTER_REPAIRER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/sorter.hpp ---------------------------------------------------------------------- diff --git a/src/master/sorter.hpp b/src/master/sorter.hpp index 8915c61..1561201 100644 --- a/src/master/sorter.hpp +++ b/src/master/sorter.hpp @@ -25,7 +25,6 @@ #include <mesos/resources.hpp> namespace mesos { -namespace internal { namespace master { namespace allocator { @@ -101,7 +100,6 @@ public: } // namespace allocator { } // namespace master { -} // namespace internal { } // namespace mesos { #endif // __SORTER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/validation.cpp ---------------------------------------------------------------------- diff --git a/src/master/validation.cpp b/src/master/validation.cpp index 2c4b16d..79dfaa1 100644 --- a/src/master/validation.cpp +++ b/src/master/validation.cpp @@ -40,7 +40,6 @@ using std::vector; using google::protobuf::RepeatedPtrField; namespace mesos { -namespace internal { namespace master { namespace validation { @@ -582,5 +581,4 @@ Option<Error> validate( } // namespace validation { } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/master/validation.hpp ---------------------------------------------------------------------- diff --git a/src/master/validation.hpp b/src/master/validation.hpp index 2d7416c..c312cdc 100644 --- a/src/master/validation.hpp +++ b/src/master/validation.hpp @@ -25,7 +25,6 @@ #include <stout/option.hpp> namespace mesos { -namespace internal { namespace master { class Master; @@ -98,5 +97,4 @@ Option<Error> validate( } // namespace validation { } // namespace master { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/messages/messages.hpp ---------------------------------------------------------------------- diff --git a/src/messages/messages.hpp b/src/messages/messages.hpp index 77840bc..ac222ca 100644 --- a/src/messages/messages.hpp +++ b/src/messages/messages.hpp @@ -30,6 +30,10 @@ #include "messages/messages.pb.h" +// TODO(karya): We should remove this once the internal protobufs are +// moved from mesos::internal to mesos namespace. +using namespace mesos::internal; + namespace messages { template <typename T> http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/authenticatee.hpp ---------------------------------------------------------------------- diff --git a/src/module/authenticatee.hpp b/src/module/authenticatee.hpp index bae37ce..a53016a 100644 --- a/src/module/authenticatee.hpp +++ b/src/module/authenticatee.hpp @@ -27,14 +27,14 @@ namespace mesos { namespace modules { template<> -inline const char* kind<mesos::internal::Authenticatee>() +inline const char* kind<mesos::Authenticatee>() { return "Authenticatee"; } template <> -struct Module<mesos::internal::Authenticatee> : ModuleBase +struct Module<mesos::Authenticatee> : ModuleBase { Module( const char* _moduleApiVersion, @@ -43,11 +43,11 @@ struct Module<mesos::internal::Authenticatee> : ModuleBase const char* _authorEmail, const char* _description, bool (*_compatible)(), - mesos::internal::Authenticatee* (*_create)(const Parameters& parameters)) + mesos::Authenticatee* (*_create)(const Parameters& parameters)) : ModuleBase( _moduleApiVersion, _mesosVersion, - mesos::modules::kind<mesos::internal::Authenticatee>(), + mesos::modules::kind<mesos::Authenticatee>(), _authorName, _authorEmail, _description, @@ -55,7 +55,7 @@ struct Module<mesos::internal::Authenticatee> : ModuleBase create(_create) { } - mesos::internal::Authenticatee* (*create)(const Parameters& parameters); + mesos::Authenticatee* (*create)(const Parameters& parameters); }; } // namespace modules { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/authenticator.hpp ---------------------------------------------------------------------- diff --git a/src/module/authenticator.hpp b/src/module/authenticator.hpp index 9562338..156617b 100644 --- a/src/module/authenticator.hpp +++ b/src/module/authenticator.hpp @@ -27,14 +27,14 @@ namespace mesos { namespace modules { template<> -inline const char* kind<mesos::internal::Authenticator>() +inline const char* kind<mesos::Authenticator>() { return "Authenticator"; } template <> -struct Module<mesos::internal::Authenticator> : ModuleBase +struct Module<mesos::Authenticator> : ModuleBase { Module( const char* _moduleApiVersion, @@ -43,11 +43,11 @@ struct Module<mesos::internal::Authenticator> : ModuleBase const char* _authorEmail, const char* _description, bool (*_compatible)(), - mesos::internal::Authenticator* (*_create)(const Parameters& parameters)) + mesos::Authenticator* (*_create)(const Parameters& parameters)) : ModuleBase( _moduleApiVersion, _mesosVersion, - mesos::modules::kind<mesos::internal::Authenticator>(), + mesos::modules::kind<mesos::Authenticator>(), _authorName, _authorEmail, _description, @@ -55,7 +55,7 @@ struct Module<mesos::internal::Authenticator> : ModuleBase create(_create) { } - mesos::internal::Authenticator* (*create)(const Parameters& parameters); + mesos::Authenticator* (*create)(const Parameters& parameters); }; } // namespace modules { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/hook.hpp ---------------------------------------------------------------------- diff --git a/src/module/hook.hpp b/src/module/hook.hpp index a7c51f2..c7edfba 100644 --- a/src/module/hook.hpp +++ b/src/module/hook.hpp @@ -28,14 +28,14 @@ namespace mesos { namespace modules { template<> -inline const char* kind<mesos::internal::Hook>() +inline const char* kind<mesos::Hook>() { return "Hook"; } template <> -struct Module<mesos::internal::Hook> : ModuleBase +struct Module<mesos::Hook> : ModuleBase { Module( const char* _moduleApiVersion, @@ -44,11 +44,11 @@ struct Module<mesos::internal::Hook> : ModuleBase const char* _authorEmail, const char* _description, bool (*_compatible)(), - mesos::internal::Hook* (*_create)(const Parameters& parameters)) + mesos::Hook* (*_create)(const Parameters& parameters)) : ModuleBase( _moduleApiVersion, _mesosVersion, - mesos::modules::kind<mesos::internal::Hook>(), + mesos::modules::kind<mesos::Hook>(), _authorName, _authorEmail, _description, @@ -56,7 +56,7 @@ struct Module<mesos::internal::Hook> : ModuleBase create(_create) { } - mesos::internal::Hook* (*create)(const Parameters& parameters); + mesos::Hook* (*create)(const Parameters& parameters); }; } // namespace modules { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/isolator.hpp ---------------------------------------------------------------------- diff --git a/src/module/isolator.hpp b/src/module/isolator.hpp index 0f71e70..b5c86e3 100644 --- a/src/module/isolator.hpp +++ b/src/module/isolator.hpp @@ -28,14 +28,14 @@ namespace mesos { namespace modules { template<> -inline const char* kind<mesos::internal::slave::Isolator>() +inline const char* kind<mesos::slave::Isolator>() { return "Isolator"; } template <> -struct Module<mesos::internal::slave::Isolator> : ModuleBase +struct Module<mesos::slave::Isolator> : ModuleBase { Module( const char* _moduleApiVersion, @@ -44,12 +44,12 @@ struct Module<mesos::internal::slave::Isolator> : ModuleBase const char* _authorEmail, const char* _description, bool (*_compatible)(), - mesos::internal::slave::Isolator* + mesos::slave::Isolator* (*_create)(const Parameters& parameters)) : ModuleBase( _moduleApiVersion, _mesosVersion, - mesos::modules::kind<mesos::internal::slave::Isolator>(), + mesos::modules::kind<mesos::slave::Isolator>(), _authorName, _authorEmail, _description, @@ -57,7 +57,7 @@ struct Module<mesos::internal::slave::Isolator> : ModuleBase create(_create) { } - mesos::internal::slave::Isolator* (*create)(const Parameters& parameters); + mesos::slave::Isolator* (*create)(const Parameters& parameters); }; } // namespace modules { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/manager.cpp ---------------------------------------------------------------------- diff --git a/src/module/manager.cpp b/src/module/manager.cpp index 5abea26..573df82 100644 --- a/src/module/manager.cpp +++ b/src/module/manager.cpp @@ -38,7 +38,6 @@ using std::vector; using process::Owned; using namespace mesos; -using namespace mesos::internal; using namespace mesos::modules; pthread_mutex_t ModuleManager::mutex = PTHREAD_MUTEX_INITIALIZER; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/module/manager.hpp ---------------------------------------------------------------------- diff --git a/src/module/manager.hpp b/src/module/manager.hpp index 04c0b18..7a9d93b 100644 --- a/src/module/manager.hpp +++ b/src/module/manager.hpp @@ -63,13 +63,13 @@ public: // // NOTE: If loading fails at a particular library we don't unload // all of the already loaded libraries. - static Try<Nothing> load(const mesos::internal::Modules& modules); + static Try<Nothing> load(const Modules& modules); // create() should be called only after load(). template <typename T> static Try<T*> create(const std::string& moduleName) { - mesos::internal::Lock lock(&mutex); + mesos::Lock lock(&mutex); if (!moduleBases.contains(moduleName)) { return Error( "Module '" + moduleName + "' unknown"); @@ -100,7 +100,7 @@ public: template <typename T> static bool contains(const std::string& moduleName) { - mesos::internal::Lock lock(&mutex); + mesos::Lock lock(&mutex); return (moduleBases.contains(moduleName) && moduleBases[moduleName]->kind == stringify(kind<T>())); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/sched/constants.cpp ---------------------------------------------------------------------- diff --git a/src/sched/constants.cpp b/src/sched/constants.cpp index 517ca5c..bc85d69 100644 --- a/src/sched/constants.cpp +++ b/src/sched/constants.cpp @@ -19,7 +19,6 @@ #include "sched/constants.hpp" namespace mesos { -namespace internal { namespace scheduler { // NOTE: The default backoff factor for the scheduler (2s) is @@ -34,5 +33,4 @@ const Duration REGISTRATION_RETRY_INTERVAL_MAX = Minutes(1); const std::string DEFAULT_AUTHENTICATEE = "crammd5"; } // namespace scheduler { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/sched/constants.hpp ---------------------------------------------------------------------- diff --git a/src/sched/constants.hpp b/src/sched/constants.hpp index ac497b2..d36d087 100644 --- a/src/sched/constants.hpp +++ b/src/sched/constants.hpp @@ -22,7 +22,6 @@ #include <stout/duration.hpp> namespace mesos { -namespace internal { namespace scheduler { // Default backoff interval used by the scheduler driver to wait @@ -37,7 +36,6 @@ extern const Duration REGISTRATION_RETRY_INTERVAL_MAX; extern const std::string DEFAULT_AUTHENTICATEE; } // namespace scheduler { -} // namespace internal { } // namespace mesos { #endif // __SCHED_CONSTANTS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/sched/flags.hpp ---------------------------------------------------------------------- diff --git a/src/sched/flags.hpp b/src/sched/flags.hpp index 4e0d56f..bfe01a3 100644 --- a/src/sched/flags.hpp +++ b/src/sched/flags.hpp @@ -30,7 +30,6 @@ #include "sched/constants.hpp" namespace mesos { -namespace internal { namespace scheduler { class Flags : public logging::Flags @@ -109,7 +108,6 @@ public: }; } // namespace scheduler { -} // namespace internal { } // namespace mesos { #endif // __SCHED_FLAGS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/sched/sched.cpp ---------------------------------------------------------------------- diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp index a822c00..ce6ff6d 100644 --- a/src/sched/sched.cpp +++ b/src/sched/sched.cpp @@ -85,8 +85,7 @@ #include "sched/flags.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::master; +using namespace mesos::master; using namespace mesos::scheduler; using namespace process; @@ -100,7 +99,6 @@ using process::wait; // Necessary on some OS's to disambiguate. using utils::copy; namespace mesos { -namespace internal { // The scheduler process (below) is responsible for interacting with // the master and responding to Mesos API calls from scheduler @@ -117,7 +115,7 @@ public: const Option<Credential>& _credential, const string& schedulerId, MasterDetector* _detector, - const internal::scheduler::Flags& _flags, + const scheduler::Flags& _flags, pthread_mutex_t* _mutex, pthread_cond_t* _cond) // We use a UUID here to ensure that the master can reliably @@ -1199,7 +1197,7 @@ private: MasterDetector* detector; - const internal::scheduler::Flags flags; + const scheduler::Flags flags; hashmap<OfferID, hashmap<SlaveID, UPID> > savedOffers; hashmap<SlaveID, UPID> savedSlavePids; @@ -1218,7 +1216,6 @@ private: bool reauthenticate; }; -} // namespace internal { } // namespace mesos { @@ -1411,7 +1408,7 @@ Status MesosSchedulerDriver::start() } // Load scheduler flags. - internal::scheduler::Flags flags; + scheduler::Flags flags; Try<Nothing> load = flags.load("MESOS_"); if (load.isError()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/scheduler/scheduler.cpp ---------------------------------------------------------------------- diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp index 44713ca..f5ee1b0 100644 --- a/src/scheduler/scheduler.cpp +++ b/src/scheduler/scheduler.cpp @@ -68,8 +68,7 @@ #include "messages/messages.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::master; +using namespace mesos::master; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/constants.cpp ---------------------------------------------------------------------- diff --git a/src/slave/constants.cpp b/src/slave/constants.cpp index 83d9fc1..cdf5c46 100644 --- a/src/slave/constants.cpp +++ b/src/slave/constants.cpp @@ -23,7 +23,6 @@ #include "slave/constants.hpp" namespace mesos { -namespace internal { namespace slave { const Duration EXECUTOR_REGISTRATION_TIMEOUT = Minutes(1); @@ -58,5 +57,4 @@ Duration MASTER_PING_TIMEOUT() } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/constants.hpp ---------------------------------------------------------------------- diff --git a/src/slave/constants.hpp b/src/slave/constants.hpp index 761cfaf..7717abd 100644 --- a/src/slave/constants.hpp +++ b/src/slave/constants.hpp @@ -25,7 +25,6 @@ #include <stout/duration.hpp> namespace mesos { -namespace internal { namespace slave { // TODO(bmahler): It appears there may be a bug with gcc-4.1.2 in which these @@ -119,7 +118,6 @@ extern const std::string DEFAULT_AUTHENTICATEE; Duration MASTER_PING_TIMEOUT(); } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_CONSTANTS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/composing.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp index a6ae817..6e3007e 100644 --- a/src/slave/containerizer/composing.cpp +++ b/src/slave/containerizer/composing.cpp @@ -39,7 +39,6 @@ using std::vector; using namespace process; namespace mesos { -namespace internal { namespace slave { @@ -550,5 +549,4 @@ Future<hashset<ContainerID> > ComposingContainerizerProcess::containers() } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/composing.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/composing.hpp b/src/slave/containerizer/composing.hpp index f1e60b0..6518f2a 100644 --- a/src/slave/containerizer/composing.hpp +++ b/src/slave/containerizer/composing.hpp @@ -36,7 +36,6 @@ namespace mesos { -namespace internal { namespace slave { // Forward declaration. @@ -94,7 +93,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __COMPOSING_CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp index 421bb86..cf2ece8 100644 --- a/src/slave/containerizer/containerizer.cpp +++ b/src/slave/containerizer/containerizer.cpp @@ -51,7 +51,6 @@ using std::vector; using namespace process; namespace mesos { -namespace internal { namespace slave { // TODO(idownes): Move this to the Containerizer interface to complete @@ -308,5 +307,4 @@ map<string, string> executorEnvironment( } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/containerizer.hpp b/src/slave/containerizer/containerizer.hpp index 129e60f..fd08b29 100644 --- a/src/slave/containerizer/containerizer.hpp +++ b/src/slave/containerizer/containerizer.hpp @@ -38,7 +38,6 @@ #include "slave/containerizer/fetcher.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declaration. @@ -139,7 +138,6 @@ std::map<std::string, std::string> executorEnvironment( const Duration& recoveryTimeout); } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 5f4b4ce..813ddf8 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -62,7 +62,6 @@ using std::vector; using namespace process; namespace mesos { -namespace internal { namespace slave { using state::SlaveState; @@ -1086,7 +1085,7 @@ Future<ResourceStatistics> DockerContainerizerProcess::__usage( // Note that here getting the root pid is enough because // the root process acts as an 'init' process in the docker // container, so no other child processes will escape it. - Try<ResourceStatistics> statistics = mesos::internal::usage(pid, true, true); + Try<ResourceStatistics> statistics = mesos::usage(pid, true, true); if (statistics.isError()) { return Failure(statistics.error()); } @@ -1344,5 +1343,4 @@ void DockerContainerizerProcess::remove(const string& container) } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/docker.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp index b7bf54a..70114dc 100644 --- a/src/slave/containerizer/docker.hpp +++ b/src/slave/containerizer/docker.hpp @@ -28,7 +28,6 @@ #include "slave/containerizer/containerizer.hpp" namespace mesos { -namespace internal { namespace slave { // Prefix used to name Docker containers in order to distinguish those @@ -439,7 +438,6 @@ private: } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __DOCKER_CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/external_containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/external_containerizer.cpp b/src/slave/containerizer/external_containerizer.cpp index 8d5a904..a31d66d 100644 --- a/src/slave/containerizer/external_containerizer.cpp +++ b/src/slave/containerizer/external_containerizer.cpp @@ -64,7 +64,6 @@ using tuples::tuple; using namespace process; namespace mesos { -namespace internal { namespace slave { using state::ExecutorState; @@ -1209,5 +1208,4 @@ Try<Subprocess> ExternalContainerizerProcess::invoke( } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/external_containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/external_containerizer.hpp b/src/slave/containerizer/external_containerizer.hpp index 8363cec..1296878 100644 --- a/src/slave/containerizer/external_containerizer.hpp +++ b/src/slave/containerizer/external_containerizer.hpp @@ -36,7 +36,6 @@ #include "slave/containerizer/launcher.hpp" namespace mesos { -namespace internal { namespace slave { // The scheme an external containerizer programs have to adhere to is; @@ -294,7 +293,6 @@ private: } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __EXTERNAL_CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/fetcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/fetcher.cpp b/src/slave/containerizer/fetcher.cpp index d290f95..6e6bce0 100644 --- a/src/slave/containerizer/fetcher.cpp +++ b/src/slave/containerizer/fetcher.cpp @@ -34,7 +34,6 @@ using process::Future; using mesos::fetcher::FetcherInfo; namespace mesos { -namespace internal { namespace slave { @@ -328,5 +327,4 @@ void FetcherProcess::kill(const ContainerID& containerId) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/fetcher.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/fetcher.hpp b/src/slave/containerizer/fetcher.hpp index 1db0eaf..bfd98db 100644 --- a/src/slave/containerizer/fetcher.hpp +++ b/src/slave/containerizer/fetcher.hpp @@ -33,7 +33,6 @@ #include "slave/flags.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declaration. @@ -152,7 +151,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_FETCHER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolator.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolator.cpp b/src/slave/containerizer/isolator.cpp index 90a47c4..bb4da46 100644 --- a/src/slave/containerizer/isolator.cpp +++ b/src/slave/containerizer/isolator.cpp @@ -26,7 +26,6 @@ using std::string; using std::list; namespace mesos { -namespace internal { namespace slave { @@ -104,5 +103,4 @@ Future<Nothing> Isolator::cleanup(const ContainerID& containerId) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolator.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp index a27c3e9..2226fa2 100644 --- a/src/slave/containerizer/isolator.hpp +++ b/src/slave/containerizer/isolator.hpp @@ -35,7 +35,6 @@ #include "slave/state.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declaration. @@ -147,7 +146,6 @@ public: } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/constants.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/constants.hpp b/src/slave/containerizer/isolators/cgroups/constants.hpp index e6df4a2..472edb2 100644 --- a/src/slave/containerizer/isolators/cgroups/constants.hpp +++ b/src/slave/containerizer/isolators/cgroups/constants.hpp @@ -23,7 +23,6 @@ #include <stout/duration.hpp> namespace mesos { -namespace internal { namespace slave { // CPU subsystem constants. @@ -37,7 +36,6 @@ const Duration MIN_CPU_CFS_QUOTA = Milliseconds(1); const Bytes MIN_MEMORY = Megabytes(32); } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __CGROUPS_ISOLATOR_CONSTANTS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/cpushare.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.cpp b/src/slave/containerizer/isolators/cgroups/cpushare.cpp index 90aabb8..6554ca3 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.cpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.cpp @@ -53,7 +53,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { @@ -535,5 +534,4 @@ Future<list<Nothing> > CgroupsCpushareIsolatorProcess::_cleanup( } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/cpushare.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/isolators/cgroups/cpushare.hpp index 4ded0c4..bcfa76d 100644 --- a/src/slave/containerizer/isolators/cgroups/cpushare.hpp +++ b/src/slave/containerizer/isolators/cgroups/cpushare.hpp @@ -28,7 +28,6 @@ #include "slave/containerizer/isolators/cgroups/constants.hpp" namespace mesos { -namespace internal { namespace slave { // Use the Linux cpu cgroup controller for cpu isolation which uses the @@ -106,7 +105,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __CPUSHARE_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/mem.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp index 711d66d..0bb4039 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.cpp +++ b/src/slave/containerizer/isolators/cgroups/mem.cpp @@ -53,7 +53,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { @@ -585,5 +584,4 @@ void CgroupsMemIsolatorProcess::oom(const ContainerID& containerId) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/mem.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/mem.hpp b/src/slave/containerizer/isolators/cgroups/mem.hpp index 2fa7555..735cefc 100644 --- a/src/slave/containerizer/isolators/cgroups/mem.hpp +++ b/src/slave/containerizer/isolators/cgroups/mem.hpp @@ -26,7 +26,6 @@ #include "slave/containerizer/isolators/cgroups/constants.hpp" namespace mesos { -namespace internal { namespace slave { class CgroupsMemIsolatorProcess : public IsolatorProcess @@ -112,7 +111,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __MEM_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/perf_event.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.cpp b/src/slave/containerizer/isolators/cgroups/perf_event.cpp index 6f67164..f94eeae 100644 --- a/src/slave/containerizer/isolators/cgroups/perf_event.cpp +++ b/src/slave/containerizer/isolators/cgroups/perf_event.cpp @@ -58,7 +58,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { Try<Isolator*> CgroupsPerfEventIsolatorProcess::create(const Flags& flags) @@ -446,5 +445,4 @@ void CgroupsPerfEventIsolatorProcess::_sample( } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/cgroups/perf_event.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.hpp b/src/slave/containerizer/isolators/cgroups/perf_event.hpp index e511c3e..12d1b89 100644 --- a/src/slave/containerizer/isolators/cgroups/perf_event.hpp +++ b/src/slave/containerizer/isolators/cgroups/perf_event.hpp @@ -30,7 +30,6 @@ #include "slave/containerizer/isolator.hpp" namespace mesos { -namespace internal { namespace slave { class CgroupsPerfEventIsolatorProcess : public IsolatorProcess @@ -113,7 +112,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __PERF_EVENT_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/filesystem/shared.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/filesystem/shared.cpp b/src/slave/containerizer/isolators/filesystem/shared.cpp index 5c347af..85a5ade 100644 --- a/src/slave/containerizer/isolators/filesystem/shared.cpp +++ b/src/slave/containerizer/isolators/filesystem/shared.cpp @@ -27,7 +27,6 @@ using std::set; using std::string; namespace mesos { -namespace internal { namespace slave { SharedFilesystemIsolatorProcess::SharedFilesystemIsolatorProcess( @@ -260,5 +259,4 @@ Future<Nothing> SharedFilesystemIsolatorProcess::cleanup( } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/filesystem/shared.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/filesystem/shared.hpp b/src/slave/containerizer/isolators/filesystem/shared.hpp index 727f63e..eeb722d 100644 --- a/src/slave/containerizer/isolators/filesystem/shared.hpp +++ b/src/slave/containerizer/isolators/filesystem/shared.hpp @@ -22,7 +22,6 @@ #include "slave/containerizer/isolator.hpp" namespace mesos { -namespace internal { namespace slave { // This isolator is to be used when all containers share the host's @@ -70,7 +69,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SHARED_FILESYSTEM_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/namespaces/pid.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/namespaces/pid.cpp b/src/slave/containerizer/isolators/namespaces/pid.cpp index fdd430e..0ad102d 100644 --- a/src/slave/containerizer/isolators/namespaces/pid.cpp +++ b/src/slave/containerizer/isolators/namespaces/pid.cpp @@ -39,7 +39,6 @@ using std::set; using std::string; namespace mesos { -namespace internal { namespace slave { // The root directory where we bind mount all the namespace handles. @@ -260,5 +259,4 @@ Future<Nothing> NamespacesPidIsolatorProcess::cleanup( } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/namespaces/pid.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/namespaces/pid.hpp b/src/slave/containerizer/isolators/namespaces/pid.hpp index 8da6ccc..fae909f 100644 --- a/src/slave/containerizer/isolators/namespaces/pid.hpp +++ b/src/slave/containerizer/isolators/namespaces/pid.hpp @@ -28,7 +28,6 @@ #include <stout/result.hpp> namespace mesos { -namespace internal { namespace slave { // This isolator itself does not specify the necessary clone() flags @@ -82,7 +81,6 @@ public: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __NAMESPACES_PID_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/network/helper.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/helper.cpp b/src/slave/containerizer/isolators/network/helper.cpp index e5fb99e..291cbdd 100644 --- a/src/slave/containerizer/isolators/network/helper.cpp +++ b/src/slave/containerizer/isolators/network/helper.cpp @@ -21,7 +21,7 @@ #include "slave/containerizer/isolators/network/port_mapping.hpp" -using namespace mesos::internal::slave; +using namespace mesos::slave; int main(int argc, char** argv) http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp index b484bbf..361e33b 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -72,7 +72,7 @@ #include "slave/containerizer/isolators/network/port_mapping.hpp" -using namespace mesos::internal; +using namespace mesos; using namespace process; @@ -95,7 +95,6 @@ using std::vector; using filter::ip::PortRange; namespace mesos { -namespace internal { namespace slave { const std::string VETH_PREFIX = "mesos"; @@ -2970,5 +2969,4 @@ vector<PortRange> getPortRanges(const IntervalSet<uint16_t>& ports) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/network/port_mapping.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.hpp b/src/slave/containerizer/isolators/network/port_mapping.hpp index 90d19a9..1e4ed3d 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.hpp +++ b/src/slave/containerizer/isolators/network/port_mapping.hpp @@ -48,7 +48,6 @@ #include "slave/containerizer/isolator.hpp" namespace mesos { -namespace internal { namespace slave { // The prefix this isolator uses for the virtual ethernet devices. @@ -361,7 +360,6 @@ protected: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __PORT_MAPPING_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/posix.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/posix.hpp b/src/slave/containerizer/isolators/posix.hpp index 7a667e3..1c0e963 100644 --- a/src/slave/containerizer/isolators/posix.hpp +++ b/src/slave/containerizer/isolators/posix.hpp @@ -30,7 +30,6 @@ #include "usage/usage.hpp" namespace mesos { -namespace internal { namespace slave { // A basic IsolatorProcess that keeps track of the pid but doesn't do any @@ -163,7 +162,7 @@ public: // Use 'mesos-usage' but only request 'cpus_' values. Try<ResourceStatistics> usage = - mesos::internal::usage(pids.get(containerId).get(), false, true); + mesos::usage(pids.get(containerId).get(), false, true); if (usage.isError()) { return process::Failure(usage.error()); } @@ -196,7 +195,7 @@ public: // Use 'mesos-usage' but only request 'mem_' values. Try<ResourceStatistics> usage = - mesos::internal::usage(pids.get(containerId).get(), true, false); + mesos::usage(pids.get(containerId).get(), true, false); if (usage.isError()) { return process::Failure(usage.error()); } @@ -209,7 +208,6 @@ private: } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __POSIX_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/posix/disk.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/posix/disk.cpp b/src/slave/containerizer/isolators/posix/disk.cpp index 7d37afd..b2be552 100644 --- a/src/slave/containerizer/isolators/posix/disk.cpp +++ b/src/slave/containerizer/isolators/posix/disk.cpp @@ -51,7 +51,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { Try<Isolator*> PosixDiskIsolatorProcess::create(const Flags& flags) @@ -500,5 +499,4 @@ Future<Bytes> DiskUsageCollector::usage(const string& path) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/isolators/posix/disk.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/posix/disk.hpp b/src/slave/containerizer/isolators/posix/disk.hpp index cf4e143..5995329 100644 --- a/src/slave/containerizer/isolators/posix/disk.hpp +++ b/src/slave/containerizer/isolators/posix/disk.hpp @@ -30,7 +30,6 @@ #include "slave/containerizer/isolator.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declarations. @@ -140,7 +139,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __POSIX_DISK_ISOLATOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/launcher.cpp b/src/slave/containerizer/launcher.cpp index 92c0657..f2267ad 100644 --- a/src/slave/containerizer/launcher.cpp +++ b/src/slave/containerizer/launcher.cpp @@ -35,7 +35,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { using state::RunState; @@ -181,5 +180,4 @@ Future<Nothing> _destroy(const Future<Option<int> >& future) } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/launcher.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/launcher.hpp b/src/slave/containerizer/launcher.hpp index 18b3546..b6fab38 100644 --- a/src/slave/containerizer/launcher.hpp +++ b/src/slave/containerizer/launcher.hpp @@ -35,7 +35,6 @@ #include "slave/state.hpp" namespace mesos { -namespace internal { namespace slave { class Launcher @@ -106,7 +105,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __LAUNCHER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/linux_launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp index 10c1203..8417160 100644 --- a/src/slave/containerizer/linux_launcher.cpp +++ b/src/slave/containerizer/linux_launcher.cpp @@ -48,7 +48,6 @@ using std::string; using std::vector; namespace mesos { -namespace internal { namespace slave { using state::RunState; @@ -410,5 +409,4 @@ string LinuxLauncher::cgroup(const ContainerID& containerId) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/linux_launcher.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/linux_launcher.hpp b/src/slave/containerizer/linux_launcher.hpp index 3d9794d..0d630fa 100644 --- a/src/slave/containerizer/linux_launcher.hpp +++ b/src/slave/containerizer/linux_launcher.hpp @@ -22,7 +22,6 @@ #include "slave/containerizer/launcher.hpp" namespace mesos { -namespace internal { namespace slave { // Launcher for Linux systems with cgroups. Uses a freezer cgroup to @@ -70,7 +69,6 @@ private: } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __LINUX_LAUNCHER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index d712278..fa40d47 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -62,7 +62,6 @@ using std::vector; using namespace process; namespace mesos { -namespace internal { namespace slave { using mesos::modules::ModuleManager; @@ -1123,5 +1122,4 @@ Future<hashset<ContainerID>> MesosContainerizerProcess::containers() } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/mesos/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp index 569119f..b3aafe4 100644 --- a/src/slave/containerizer/mesos/containerizer.hpp +++ b/src/slave/containerizer/mesos/containerizer.hpp @@ -30,7 +30,6 @@ #include "slave/containerizer/launcher.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declaration. @@ -267,7 +266,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __MESOS_CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/mesos/launch.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp index 2f2d60e..a0ff1b7 100644 --- a/src/slave/containerizer/mesos/launch.cpp +++ b/src/slave/containerizer/mesos/launch.cpp @@ -39,7 +39,6 @@ using std::map; using std::string; namespace mesos { -namespace internal { namespace slave { const string MesosContainerizerLaunch::NAME = "launch"; @@ -248,5 +247,4 @@ int MesosContainerizerLaunch::execute() } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/mesos/launch.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/launch.hpp b/src/slave/containerizer/mesos/launch.hpp index 7c8b535..0176556 100644 --- a/src/slave/containerizer/mesos/launch.hpp +++ b/src/slave/containerizer/mesos/launch.hpp @@ -24,7 +24,6 @@ #include <stout/subcommand.hpp> namespace mesos { -namespace internal { namespace slave { class MesosContainerizerLaunch : public Subcommand @@ -54,7 +53,6 @@ protected: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __MESOS_CONTAINERIZER_LAUNCH_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/containerizer/mesos/main.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/main.cpp b/src/slave/containerizer/mesos/main.cpp index 0e17931..136390d 100644 --- a/src/slave/containerizer/mesos/main.cpp +++ b/src/slave/containerizer/mesos/main.cpp @@ -21,7 +21,7 @@ #include "slave/containerizer/mesos/launch.hpp" -using namespace mesos::internal::slave; +using namespace mesos::slave; int main(int argc, char** argv) http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index 53a6934..f603335 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -35,7 +35,6 @@ #include "slave/constants.hpp" namespace mesos { -namespace internal { namespace slave { class Flags : public logging::Flags @@ -513,7 +512,6 @@ public: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_FLAGS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/gc.cpp ---------------------------------------------------------------------- diff --git a/src/slave/gc.cpp b/src/slave/gc.cpp index 6042277..6060c18 100644 --- a/src/slave/gc.cpp +++ b/src/slave/gc.cpp @@ -37,7 +37,6 @@ using std::map; using std::string; namespace mesos { -namespace internal { namespace slave { @@ -207,5 +206,4 @@ void GarbageCollector::prune(const Duration& d) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/gc.hpp ---------------------------------------------------------------------- diff --git a/src/slave/gc.hpp b/src/slave/gc.hpp index 780f9c9..d9f9d7b 100644 --- a/src/slave/gc.hpp +++ b/src/slave/gc.hpp @@ -35,7 +35,6 @@ #include <stout/try.hpp> namespace mesos { -namespace internal { namespace slave { // Forward declarations. @@ -131,7 +130,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_GC_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/graceful_shutdown.cpp ---------------------------------------------------------------------- diff --git a/src/slave/graceful_shutdown.cpp b/src/slave/graceful_shutdown.cpp index 04d8f09..2ab58f7 100644 --- a/src/slave/graceful_shutdown.cpp +++ b/src/slave/graceful_shutdown.cpp @@ -24,7 +24,6 @@ #include "slave/graceful_shutdown.hpp" namespace mesos { -namespace internal { namespace slave { // Calculates the shutdown grace period (aka shutdown timeout) so it @@ -72,5 +71,4 @@ Duration getExecutorGracePeriod(const Duration& baseShutdownTimeout) } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/graceful_shutdown.hpp ---------------------------------------------------------------------- diff --git a/src/slave/graceful_shutdown.hpp b/src/slave/graceful_shutdown.hpp index 59f5cfb..950329d 100644 --- a/src/slave/graceful_shutdown.hpp +++ b/src/slave/graceful_shutdown.hpp @@ -20,7 +20,6 @@ #define __SLAVE_GRACEFUL_SHUTDOWN_HPP__ namespace mesos { -namespace internal { namespace slave { // Slave Exec Executor @@ -62,7 +61,6 @@ Duration getExecGracePeriod(const Duration& baseShutdownTimeout); Duration getExecutorGracePeriod(const Duration& baseShutdownTimeout); } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_GRACEFUL_SHUTDOWN_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/http.cpp ---------------------------------------------------------------------- diff --git a/src/slave/http.cpp b/src/slave/http.cpp index 0395d00..c9b5731 100644 --- a/src/slave/http.cpp +++ b/src/slave/http.cpp @@ -64,12 +64,11 @@ using std::vector; namespace mesos { -namespace internal { namespace slave { // Pull in defnitions from common. -using mesos::internal::model; +using mesos::model; // Pull in the process definitions. using process::http::Response; @@ -400,5 +399,4 @@ Future<Response> Slave::Http::state(const Request& request) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/main.cpp ---------------------------------------------------------------------- diff --git a/src/slave/main.cpp b/src/slave/main.cpp index 42e46c5..173a1a3 100644 --- a/src/slave/main.cpp +++ b/src/slave/main.cpp @@ -43,8 +43,8 @@ #include "slave/slave.hpp" #include "slave/status_update_manager.hpp" -using namespace mesos::internal; -using namespace mesos::internal::slave; +using namespace mesos; +using namespace mesos::slave; using mesos::modules::ModuleManager; using mesos::SlaveInfo; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/metrics.cpp ---------------------------------------------------------------------- diff --git a/src/slave/metrics.cpp b/src/slave/metrics.cpp index c32b4d8..ee610b8 100644 --- a/src/slave/metrics.cpp +++ b/src/slave/metrics.cpp @@ -27,7 +27,6 @@ namespace mesos { -namespace internal { namespace slave { Metrics::Metrics(const Slave& slave) @@ -179,5 +178,4 @@ Metrics::~Metrics() } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/metrics.hpp ---------------------------------------------------------------------- diff --git a/src/slave/metrics.hpp b/src/slave/metrics.hpp index 0390461..e2ce845 100644 --- a/src/slave/metrics.hpp +++ b/src/slave/metrics.hpp @@ -26,7 +26,6 @@ namespace mesos { -namespace internal { namespace slave { class Slave; @@ -70,7 +69,6 @@ struct Metrics }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_METRICS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/monitor.cpp ---------------------------------------------------------------------- diff --git a/src/slave/monitor.cpp b/src/slave/monitor.cpp index 398af01..c2c286c 100644 --- a/src/slave/monitor.cpp +++ b/src/slave/monitor.cpp @@ -47,7 +47,6 @@ using std::map; using std::string; namespace mesos { -namespace internal { namespace slave { using process::wait; // Necessary on some OS's to disambiguate. @@ -308,5 +307,4 @@ Future<Nothing> ResourceMonitor::stop( } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/monitor.hpp ---------------------------------------------------------------------- diff --git a/src/slave/monitor.hpp b/src/slave/monitor.hpp index f4ebafc..2cc42dc 100644 --- a/src/slave/monitor.hpp +++ b/src/slave/monitor.hpp @@ -41,7 +41,6 @@ #include "common/type_utils.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declarations. @@ -182,7 +181,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_MONITOR_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/paths.cpp ---------------------------------------------------------------------- diff --git a/src/slave/paths.cpp b/src/slave/paths.cpp index 5fcfa2c..5102db5 100644 --- a/src/slave/paths.cpp +++ b/src/slave/paths.cpp @@ -38,7 +38,6 @@ using std::list; using std::string; namespace mesos { -namespace internal { namespace slave { namespace paths { @@ -429,5 +428,4 @@ string createSlaveDirectory( } // namespace paths { } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/paths.hpp ---------------------------------------------------------------------- diff --git a/src/slave/paths.hpp b/src/slave/paths.hpp index 1618439..eba398c 100644 --- a/src/slave/paths.hpp +++ b/src/slave/paths.hpp @@ -25,7 +25,6 @@ #include <mesos/mesos.hpp> namespace mesos { -namespace internal { namespace slave { namespace paths { @@ -263,7 +262,6 @@ std::string createSlaveDirectory( } // namespace paths { } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_PATHS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index a8b2621..336e877 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -99,7 +99,6 @@ using process::Time; using process::UPID; namespace mesos { -namespace internal { namespace slave { using namespace state; @@ -4424,5 +4423,4 @@ std::ostream& operator << (std::ostream& stream, Executor::State state) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/slave.hpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp index 70bd8c1..9adee17 100644 --- a/src/slave/slave.hpp +++ b/src/slave/slave.hpp @@ -64,7 +64,6 @@ #include "messages/messages.hpp" namespace mesos { -namespace internal { class MasterDetector; // Forward declaration. @@ -606,7 +605,6 @@ std::ostream& operator << (std::ostream& stream, Framework::State state); std::ostream& operator << (std::ostream& stream, Executor::State state); } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/state.cpp ---------------------------------------------------------------------- diff --git a/src/slave/state.cpp b/src/slave/state.cpp index 72191ee..d0d7eba 100644 --- a/src/slave/state.cpp +++ b/src/slave/state.cpp @@ -19,7 +19,6 @@ #include "slave/state.hpp" namespace mesos { -namespace internal { namespace slave { namespace state { @@ -738,5 +737,4 @@ Try<ResourcesState> ResourcesState::recover( } // namespace state { } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/state.hpp ---------------------------------------------------------------------- diff --git a/src/slave/state.hpp b/src/slave/state.hpp index f92808a..04084fc 100644 --- a/src/slave/state.hpp +++ b/src/slave/state.hpp @@ -43,7 +43,6 @@ #include "process/pid.hpp" namespace mesos { -namespace internal { namespace slave { namespace state { @@ -104,7 +103,7 @@ inline Try<Nothing> checkpoint( return checkpoint(path, messages); } -} // namespace internal { +} // namespace internal { // Thin wrapper to checkpoint data to disk and perform the necessary @@ -298,7 +297,6 @@ struct TaskState } // namespace state { } // namespace slave { -} // namespace internal { } // namespace mesos { #endif // __SLAVE_STATE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/status_update_manager.cpp ---------------------------------------------------------------------- diff --git a/src/slave/status_update_manager.cpp b/src/slave/status_update_manager.cpp index fab8c22..5b0192b 100644 --- a/src/slave/status_update_manager.cpp +++ b/src/slave/status_update_manager.cpp @@ -50,7 +50,6 @@ using process::Timeout; using process::UPID; namespace mesos { -namespace internal { namespace slave { using state::SlaveState; @@ -634,5 +633,4 @@ void StatusUpdateManager::cleanup(const FrameworkID& frameworkId) } } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/slave/status_update_manager.hpp ---------------------------------------------------------------------- diff --git a/src/slave/status_update_manager.hpp b/src/slave/status_update_manager.hpp index daab8e3..cc53a2a 100644 --- a/src/slave/status_update_manager.hpp +++ b/src/slave/status_update_manager.hpp @@ -50,7 +50,6 @@ #include "slave/flags.hpp" namespace mesos { -namespace internal { namespace slave { // Forward declarations. @@ -409,7 +408,6 @@ private: }; } // namespace slave { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/in_memory.cpp ---------------------------------------------------------------------- diff --git a/src/state/in_memory.cpp b/src/state/in_memory.cpp index ce04e47..6f33616 100644 --- a/src/state/in_memory.cpp +++ b/src/state/in_memory.cpp @@ -21,7 +21,6 @@ using namespace process; using std::string; namespace mesos { -namespace internal { namespace state { @@ -112,5 +111,4 @@ Future<std::set<string> > InMemoryStorage::names() } } // namespace state { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/in_memory.hpp ---------------------------------------------------------------------- diff --git a/src/state/in_memory.hpp b/src/state/in_memory.hpp index 2040618..fea2e10 100644 --- a/src/state/in_memory.hpp +++ b/src/state/in_memory.hpp @@ -14,7 +14,6 @@ #include "state/storage.hpp" namespace mesos { -namespace internal { namespace state { // Forward declaration. @@ -38,7 +37,6 @@ private: }; } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_IN_MEMORY_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/leveldb.cpp ---------------------------------------------------------------------- diff --git a/src/state/leveldb.cpp b/src/state/leveldb.cpp index 4303df3..263a6b9 100644 --- a/src/state/leveldb.cpp +++ b/src/state/leveldb.cpp @@ -32,7 +32,6 @@ using namespace process; using std::string; namespace mesos { -namespace internal { namespace state { @@ -294,5 +293,4 @@ Future<std::set<string> > LevelDBStorage::names() } } // namespace state { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/leveldb.hpp ---------------------------------------------------------------------- diff --git a/src/state/leveldb.hpp b/src/state/leveldb.hpp index 53447c6..379316c 100644 --- a/src/state/leveldb.hpp +++ b/src/state/leveldb.hpp @@ -15,7 +15,6 @@ #include "state/storage.hpp" namespace mesos { -namespace internal { namespace state { // More forward declarations. @@ -39,7 +38,6 @@ private: }; } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_LEVELDB_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/log.cpp ---------------------------------------------------------------------- diff --git a/src/state/log.cpp b/src/state/log.cpp index 326f3a7..6069d12 100644 --- a/src/state/log.cpp +++ b/src/state/log.cpp @@ -29,7 +29,7 @@ #include "state/log.hpp" -using namespace mesos::internal::log; +using namespace mesos::log; using namespace process; // Note that we don't add 'using std::set' here because we need @@ -38,7 +38,6 @@ using std::list; using std::string; namespace mesos { -namespace internal { namespace state { // A storage implementation for State that uses the replicated @@ -672,5 +671,4 @@ Future<std::set<string> > LogStorage::names() } } // namespace state { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/log.hpp ---------------------------------------------------------------------- diff --git a/src/state/log.hpp b/src/state/log.hpp index a0ca4f8..1558dad 100644 --- a/src/state/log.hpp +++ b/src/state/log.hpp @@ -16,7 +16,6 @@ #include "state/storage.hpp" namespace mesos { -namespace internal { namespace state { // Forward declarations. @@ -41,7 +40,6 @@ private: }; } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_LOG_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/protobuf.hpp ---------------------------------------------------------------------- diff --git a/src/state/protobuf.hpp b/src/state/protobuf.hpp index 12f9bfb..6f67c6a 100644 --- a/src/state/protobuf.hpp +++ b/src/state/protobuf.hpp @@ -36,7 +36,6 @@ #include "state/storage.hpp" namespace mesos { -namespace internal { namespace state { namespace protobuf { @@ -164,7 +163,6 @@ process::Future<bool> State::expunge(const Variable<T>& variable) } // namespace protobuf { } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_PROTOBUF_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/state.hpp ---------------------------------------------------------------------- diff --git a/src/state/state.hpp b/src/state/state.hpp index 2c0bb20..878265d 100644 --- a/src/state/state.hpp +++ b/src/state/state.hpp @@ -37,7 +37,6 @@ #include "state/storage.hpp" namespace mesos { -namespace internal { namespace state { // An abstraction of "state" (possibly between multiple distributed @@ -195,7 +194,6 @@ inline process::Future<std::set<std::string> > State::names() } } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_STATE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/storage.hpp ---------------------------------------------------------------------- diff --git a/src/state/storage.hpp b/src/state/storage.hpp index a36a93e..190c7a3 100644 --- a/src/state/storage.hpp +++ b/src/state/storage.hpp @@ -30,9 +30,10 @@ #include "messages/state.hpp" namespace mesos { -namespace internal { namespace state { +using namespace mesos::internal::state; + class Storage { public: @@ -54,7 +55,6 @@ public: }; } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_STORAGE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/zookeeper.cpp ---------------------------------------------------------------------- diff --git a/src/state/zookeeper.cpp b/src/state/zookeeper.cpp index d355bd7..e570a9b 100644 --- a/src/state/zookeeper.cpp +++ b/src/state/zookeeper.cpp @@ -43,7 +43,6 @@ using std::vector; using zookeeper::Authentication; namespace mesos { -namespace internal { namespace state { @@ -650,5 +649,4 @@ Future<std::set<string> > ZooKeeperStorage::names() } } // namespace state { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/state/zookeeper.hpp ---------------------------------------------------------------------- diff --git a/src/state/zookeeper.hpp b/src/state/zookeeper.hpp index 1a8483d..9352a21 100644 --- a/src/state/zookeeper.hpp +++ b/src/state/zookeeper.hpp @@ -17,7 +17,6 @@ #include "zookeeper/authentication.hpp" namespace mesos { -namespace internal { namespace state { // Forward declarations. @@ -47,7 +46,6 @@ private: } // namespace state { -} // namespace internal { } // namespace mesos { #endif // __STATE_ZOOKEEPER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/attributes_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/attributes_tests.cpp b/src/tests/attributes_tests.cpp index 240a8ca..138d543 100644 --- a/src/tests/attributes_tests.cpp +++ b/src/tests/attributes_tests.cpp @@ -24,7 +24,6 @@ #include "common/attributes.hpp" using namespace mesos; -using namespace mesos::internal; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/authentication_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/authentication_tests.cpp b/src/tests/authentication_tests.cpp index 5cf2da4..c594f3f 100644 --- a/src/tests/authentication_tests.cpp +++ b/src/tests/authentication_tests.cpp @@ -32,13 +32,12 @@ #include "tests/utils.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; -using namespace mesos::internal::tests; +using namespace mesos::slave; +using namespace mesos::tests; using namespace process; -using mesos::internal::master::Master; +using mesos::master::Master; using testing::_; using testing::Eq; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/authorization_tests.cpp b/src/tests/authorization_tests.cpp index a8fa4cc..edae66d 100644 --- a/src/tests/authorization_tests.cpp +++ b/src/tests/authorization_tests.cpp @@ -25,8 +25,7 @@ #include "tests/mesos.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos::tests; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/cgroups_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cgroups_isolator_tests.cpp b/src/tests/cgroups_isolator_tests.cpp index 2d9738f..9fbde33 100644 --- a/src/tests/cgroups_isolator_tests.cpp +++ b/src/tests/cgroups_isolator_tests.cpp @@ -30,8 +30,7 @@ #include "tests/script.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; +using namespace mesos::slave; using std::map; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/cgroups_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cgroups_tests.cpp b/src/tests/cgroups_tests.cpp index 1eea57f..9d50a47 100644 --- a/src/tests/cgroups_tests.cpp +++ b/src/tests/cgroups_tests.cpp @@ -53,7 +53,7 @@ #include "tests/mesos.hpp" // For TEST_CGROUPS_(HIERARCHY|ROOT). -using namespace mesos::internal::tests; +using namespace mesos::tests; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/cluster.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp index 90fda52..2ea4047 100644 --- a/src/tests/cluster.hpp +++ b/src/tests/cluster.hpp @@ -77,7 +77,6 @@ #include "zookeeper/url.hpp" namespace mesos { -namespace internal { namespace tests { class Cluster @@ -585,7 +584,6 @@ inline Try<Nothing> Cluster::Slaves::stop( } } // namespace tests { -} // namespace internal { } // namespace mesos { #endif // __TESTS_CLUSTER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/common/http_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/common/http_tests.cpp b/src/tests/common/http_tests.cpp index f087b23..b030a78 100644 --- a/src/tests/common/http_tests.cpp +++ b/src/tests/common/http_tests.cpp @@ -34,7 +34,6 @@ using std::vector; using namespace mesos; -using namespace mesos::internal; // TODO(bmahler): Add tests for other JSON models. http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/composing_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/composing_containerizer_tests.cpp b/src/tests/composing_containerizer_tests.cpp index 5ab5a36..6bb49ea 100644 --- a/src/tests/composing_containerizer_tests.cpp +++ b/src/tests/composing_containerizer_tests.cpp @@ -34,9 +34,8 @@ #include "tests/mesos.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; -using namespace mesos::internal::tests; +using namespace mesos::slave; +using namespace mesos::tests; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer.cpp b/src/tests/containerizer.cpp index 26b87ac..8341c20 100644 --- a/src/tests/containerizer.cpp +++ b/src/tests/containerizer.cpp @@ -29,7 +29,6 @@ using testing::Return; using namespace process; namespace mesos { -namespace internal { namespace tests { @@ -245,5 +244,4 @@ void TestContainerizer::setup() } } // namespace tests { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer.hpp b/src/tests/containerizer.hpp index 24b014f..f6fdb52 100644 --- a/src/tests/containerizer.hpp +++ b/src/tests/containerizer.hpp @@ -45,7 +45,6 @@ #include "slave/state.hpp" namespace mesos { -namespace internal { namespace tests { // Forward declaration. @@ -134,7 +133,6 @@ private: }; } // namespace tests { -} // namespace internal { } // namespace mesos { #endif // __TEST_CONTAINERIZER_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer_tests.cpp b/src/tests/containerizer_tests.cpp index cfe31a6..7300333 100644 --- a/src/tests/containerizer_tests.cpp +++ b/src/tests/containerizer_tests.cpp @@ -43,8 +43,7 @@ #include "tests/utils.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; +using namespace mesos::slave; using std::map; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/cram_md5_authentication_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cram_md5_authentication_tests.cpp b/src/tests/cram_md5_authentication_tests.cpp index a356aa1..8b50413 100644 --- a/src/tests/cram_md5_authentication_tests.cpp +++ b/src/tests/cram_md5_authentication_tests.cpp @@ -37,7 +37,7 @@ #include "tests/mesos.hpp" #include "tests/module.hpp" -using namespace mesos::internal::tests; +using namespace mesos::tests; using namespace process; @@ -47,7 +47,6 @@ using testing::_; using testing::Eq; namespace mesos { -namespace internal { namespace cram_md5 { template <typename T> @@ -273,5 +272,4 @@ TYPED_TEST(CRAMMD5Authentication, AuthenticatorDestructionRace) } } // namespace cram_md5 { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/credentials_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/credentials_tests.cpp b/src/tests/credentials_tests.cpp index 091b545..e39db9e 100644 --- a/src/tests/credentials_tests.cpp +++ b/src/tests/credentials_tests.cpp @@ -33,12 +33,11 @@ using std::string; using std::vector; using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; -using namespace mesos::internal::tests; +using namespace mesos::slave; +using namespace mesos::tests; -using mesos::internal::master::Master; -using mesos::internal::slave::Slave; +using mesos::master::Master; +using mesos::slave::Slave; using process::PID; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/disk_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/disk_quota_tests.cpp b/src/tests/disk_quota_tests.cpp index 3239ed2..1d3aa0c 100644 --- a/src/tests/disk_quota_tests.cpp +++ b/src/tests/disk_quota_tests.cpp @@ -49,8 +49,7 @@ using namespace process; using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos::tests; using std::string; using std::vector; @@ -58,12 +57,12 @@ using std::vector; using testing::_; using testing::Return; -using mesos::internal::master::Master; +using mesos::master::Master; -using mesos::internal::slave::DiskUsageCollector; -using mesos::internal::slave::Fetcher; -using mesos::internal::slave::MesosContainerizer; -using mesos::internal::slave::Slave; +using mesos::slave::DiskUsageCollector; +using mesos::slave::Fetcher; +using mesos::slave::MesosContainerizer; +using mesos::slave::Slave; class DiskUsageCollectorTest : public TemporaryDirectoryTest {}; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 2105ae2..8b212d4 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -42,19 +42,18 @@ using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave::paths; -using namespace mesos::internal::slave::state; -using namespace mesos::internal::tests; +using namespace mesos::slave::paths; +using namespace mesos::slave::state; +using namespace mesos::tests; using namespace process; -using mesos::internal::master::Master; +using mesos::master::Master; -using mesos::internal::slave::DockerContainerizer; -using mesos::internal::slave::DockerContainerizerProcess; -using mesos::internal::slave::Fetcher; -using mesos::internal::slave::Slave; +using mesos::slave::DockerContainerizer; +using mesos::slave::DockerContainerizerProcess; +using mesos::slave::Fetcher; +using mesos::slave::Slave; using process::Future; using process::Message; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/docker_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_tests.cpp b/src/tests/docker_tests.cpp index ef05828..ae01a4e 100644 --- a/src/tests/docker_tests.cpp +++ b/src/tests/docker_tests.cpp @@ -35,8 +35,7 @@ #include "tests/flags.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos::tests; using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/environment.cpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp index e002363..0c2157b 100644 --- a/src/tests/environment.cpp +++ b/src/tests/environment.cpp @@ -64,7 +64,6 @@ using std::vector; using process::Owned; namespace mesos { -namespace internal { namespace tests { // Storage for the global environment instance. @@ -441,5 +440,4 @@ Try<string> Environment::mkdtemp() } } // namespace tests { -} // namespace internal { } // namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/environment.hpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.hpp b/src/tests/environment.hpp index 9cf14bc..5779528 100644 --- a/src/tests/environment.hpp +++ b/src/tests/environment.hpp @@ -29,7 +29,6 @@ #include "tests/flags.hpp" namespace mesos { -namespace internal { namespace tests { // Used to set up and manage the test environment. @@ -60,7 +59,6 @@ private: extern Environment* environment; } // namespace tests { -} // namespace internal { } // namespace mesos { #endif // __TESTS_ENVIRONMENT_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/exception_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/exception_tests.cpp b/src/tests/exception_tests.cpp index 13e6d2d..7a41770 100644 --- a/src/tests/exception_tests.cpp +++ b/src/tests/exception_tests.cpp @@ -35,12 +35,11 @@ #include "tests/mesos.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos::tests; -using mesos::internal::master::Master; +using mesos::master::Master; -using mesos::internal::slave::Slave; +using mesos::slave::Slave; using process::Future; using process::PID; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/external_containerizer_test.cpp ---------------------------------------------------------------------- diff --git a/src/tests/external_containerizer_test.cpp b/src/tests/external_containerizer_test.cpp index 45cdeb5..d6c4437 100644 --- a/src/tests/external_containerizer_test.cpp +++ b/src/tests/external_containerizer_test.cpp @@ -43,14 +43,13 @@ #include "tests/flags.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos::tests; using namespace process; -using mesos::internal::master::Master; -using mesos::internal::slave::Containerizer; -using mesos::internal::slave::Slave; +using mesos::master::Master; +using mesos::slave::Containerizer; +using mesos::slave::Slave; using std::string; using std::vector; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index f927d4a..c811873 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -49,13 +49,12 @@ #include "tests/mesos.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::protobuf; -using namespace mesos::internal::tests; +using namespace mesos::protobuf; +using namespace mesos::tests; -using mesos::internal::master::Master; +using mesos::master::Master; -using mesos::internal::slave::Slave; +using mesos::slave::Slave; using process::Clock; using process::Future; @@ -805,7 +804,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverRetriedReregistration) AWAIT_READY(reregistrationMessage); // Trigger the re-registration retry. - Clock::advance(internal::scheduler::REGISTRATION_BACKOFF_FACTOR); + Clock::advance(scheduler::REGISTRATION_BACKOFF_FACTOR); AWAIT_READY(sched2Registered); @@ -859,7 +858,7 @@ TEST_F(FaultToleranceTest, FrameworkReliableRegistration) AWAIT_READY(frameworkRegisteredMessage); Clock::pause(); - Clock::advance(internal::scheduler::REGISTRATION_BACKOFF_FACTOR); + Clock::advance(scheduler::REGISTRATION_BACKOFF_FACTOR); AWAIT_READY(registered); // Ensures registered message is received. http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/fetcher_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp index 8c0b075..d7266f5 100644 --- a/src/tests/fetcher_tests.cpp +++ b/src/tests/fetcher_tests.cpp @@ -47,9 +47,8 @@ #include "tests/utils.hpp" using namespace mesos; -using namespace mesos::internal; -using namespace mesos::internal::slave; -using namespace mesos::internal::tests; +using namespace mesos::slave; +using namespace mesos::tests; using namespace process; using process::Subprocess; @@ -339,7 +338,7 @@ TEST_F(FetcherTest, FileURI) Try<Subprocess> fetcherSubprocess = process::subprocess( - path::join(mesos::internal::tests::flags.build_dir, "src/mesos-fetcher"), + path::join(mesos::tests::flags.build_dir, "src/mesos-fetcher"), environment); ASSERT_SOME(fetcherSubprocess); @@ -375,7 +374,7 @@ TEST_F(FetcherTest, FilePath) Try<Subprocess> fetcherSubprocess = process::subprocess( - path::join(mesos::internal::tests::flags.build_dir, "src/mesos-fetcher"), + path::join(mesos::tests::flags.build_dir, "src/mesos-fetcher"), environment); ASSERT_SOME(fetcherSubprocess); @@ -428,7 +427,7 @@ TEST_F(FetcherTest, OSNetUriTest) Try<Subprocess> fetcherSubprocess = process::subprocess( - path::join(mesos::internal::tests::flags.build_dir, "src/mesos-fetcher"), + path::join(mesos::tests::flags.build_dir, "src/mesos-fetcher"), environment); ASSERT_SOME(fetcherSubprocess); @@ -464,7 +463,7 @@ TEST_F(FetcherTest, FileLocalhostURI) Try<Subprocess> fetcherSubprocess = process::subprocess( - path::join(mesos::internal::tests::flags.build_dir, "src/mesos-fetcher"), + path::join(mesos::tests::flags.build_dir, "src/mesos-fetcher"), environment); ASSERT_SOME(fetcherSubprocess); http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/files_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp index 9ad6db5..2e16665 100644 --- a/src/tests/files_tests.cpp +++ b/src/tests/files_tests.cpp @@ -35,8 +35,8 @@ #include "tests/utils.hpp" -using namespace mesos::internal; -using namespace mesos::internal::tests; +using namespace mesos; +using namespace mesos::tests; using process::Future; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c418577/src/tests/flags.cpp ---------------------------------------------------------------------- diff --git a/src/tests/flags.cpp b/src/tests/flags.cpp index 98b780f..693c2bd 100644 --- a/src/tests/flags.cpp +++ b/src/tests/flags.cpp @@ -19,12 +19,10 @@ #include "tests/flags.hpp" namespace mesos { -namespace internal { namespace tests { // Storage for the flags. Flags flags; } // namespace tests { -} // namespace internal { } // namespace mesos {
