Repository: mesos Updated Branches: refs/heads/master 4feeb9eea -> 331076901
Added process ID prefixes for ZooKeeper related libprocess Processes which are helpful for debugging. Review: https://reviews.apache.org/r/22161 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/33107690 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/33107690 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/33107690 Branch: refs/heads/master Commit: 331076901efbb3cf27b8b6f7b8dbfaaecff9190d Parents: 4feeb9e Author: Jiang Yan Xu <y...@jxu.me> Authored: Sun Jun 1 23:08:19 2014 -0700 Committer: Jiang Yan Xu <y...@jxu.me> Committed: Mon Jun 2 14:19:00 2014 -0700 ---------------------------------------------------------------------- src/master/contender.cpp | 7 +++++-- src/master/detector.cpp | 13 +++++++++---- src/zookeeper/contender.cpp | 6 +++++- src/zookeeper/detector.cpp | 5 ++++- src/zookeeper/group.cpp | 7 +++++-- src/zookeeper/zookeeper.cpp | 10 ++++------ 6 files changed, 32 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/master/contender.cpp ---------------------------------------------------------------------- diff --git a/src/master/contender.cpp b/src/master/contender.cpp index 2c51018..c1bf82b 100644 --- a/src/master/contender.cpp +++ b/src/master/contender.cpp @@ -17,6 +17,7 @@ */ #include <process/defer.hpp> +#include <process/id.hpp> #include <process/process.hpp> #include <stout/check.hpp> @@ -175,13 +176,15 @@ Future<Future<Nothing> > ZooKeeperMasterContender::contend() ZooKeeperMasterContenderProcess::ZooKeeperMasterContenderProcess( const URL& url) - : group(new Group(url, MASTER_CONTENDER_ZK_SESSION_TIMEOUT)), + : ProcessBase(ID::generate("zookeeper-master-contender")), + group(new Group(url, MASTER_CONTENDER_ZK_SESSION_TIMEOUT)), contender(NULL) {} ZooKeeperMasterContenderProcess::ZooKeeperMasterContenderProcess( Owned<Group> _group) - : group(_group), + : ProcessBase(ID::generate("zookeeper-master-contender")), + group(_group), contender(NULL) {} http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/master/detector.cpp ---------------------------------------------------------------------- diff --git a/src/master/detector.cpp b/src/master/detector.cpp index ea8011f..a34cc21 100644 --- a/src/master/detector.cpp +++ b/src/master/detector.cpp @@ -23,6 +23,7 @@ #include <process/defer.hpp> #include <process/dispatch.hpp> #include <process/future.hpp> +#include <process/id.hpp> #include <process/logging.hpp> #include <process/pid.hpp> #include <process/process.hpp> @@ -59,9 +60,11 @@ class StandaloneMasterDetectorProcess : public Process<StandaloneMasterDetectorProcess> { public: - StandaloneMasterDetectorProcess() {} + StandaloneMasterDetectorProcess() + : ProcessBase(ID::generate("standalone-master-detector")) {} explicit StandaloneMasterDetectorProcess(const MasterInfo& _leader) - : leader(_leader) {} + : ProcessBase(ID::generate("standalone-master-detector")), + leader(_leader) {} ~StandaloneMasterDetectorProcess(); void appoint(const Option<MasterInfo>& leader); @@ -235,7 +238,8 @@ Future<Option<MasterInfo> > StandaloneMasterDetector::detect( // TODO(xujyan): Use peer constructor after switching to C++ 11. ZooKeeperMasterDetectorProcess::ZooKeeperMasterDetectorProcess( const URL& url) - : group(new Group(url.servers, + : ProcessBase(ID::generate("zookeeper-master-detector")), + group(new Group(url.servers, MASTER_DETECTOR_ZK_SESSION_TIMEOUT, url.path, url.authentication)), @@ -245,7 +249,8 @@ ZooKeeperMasterDetectorProcess::ZooKeeperMasterDetectorProcess( ZooKeeperMasterDetectorProcess::ZooKeeperMasterDetectorProcess( Owned<Group> _group) - : group(_group), + : ProcessBase(ID::generate("zookeeper-master-detector")), + group(_group), detector(group.get()), leader(None()) {} http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/zookeeper/contender.cpp ---------------------------------------------------------------------- diff --git a/src/zookeeper/contender.cpp b/src/zookeeper/contender.cpp index c2c7993..55cb7a1 100644 --- a/src/zookeeper/contender.cpp +++ b/src/zookeeper/contender.cpp @@ -4,6 +4,7 @@ #include <process/defer.hpp> #include <process/dispatch.hpp> #include <process/future.hpp> +#include <process/id.hpp> #include <stout/check.hpp> #include <stout/lambda.hpp> @@ -78,7 +79,10 @@ LeaderContenderProcess::LeaderContenderProcess( Group* _group, const string& _data, const Option<string>& _label) - : group(_group), data(_data), label(_label) {} + : ProcessBase(ID::generate("leader-contender")), + group(_group), + data(_data), + label(_label) {} LeaderContenderProcess::~LeaderContenderProcess() http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/zookeeper/detector.cpp ---------------------------------------------------------------------- diff --git a/src/zookeeper/detector.cpp b/src/zookeeper/detector.cpp index 62128a0..5305161 100644 --- a/src/zookeeper/detector.cpp +++ b/src/zookeeper/detector.cpp @@ -4,6 +4,7 @@ #include <process/defer.hpp> #include <process/dispatch.hpp> #include <process/future.hpp> +#include <process/id.hpp> #include "process/logging.hpp" #include <process/process.hpp> @@ -48,7 +49,9 @@ private: LeaderDetectorProcess::LeaderDetectorProcess(Group* _group) - : group(_group), leader(None()) {} + : ProcessBase(ID::generate("leader-detector")), + group(_group), + leader(None()) {} LeaderDetectorProcess::~LeaderDetectorProcess() http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/zookeeper/group.cpp ---------------------------------------------------------------------- diff --git a/src/zookeeper/group.cpp b/src/zookeeper/group.cpp index 46f638d..58491c0 100644 --- a/src/zookeeper/group.cpp +++ b/src/zookeeper/group.cpp @@ -5,6 +5,7 @@ #include <process/delay.hpp> #include <process/dispatch.hpp> +#include <process/id.hpp> #include <process/process.hpp> #include <stout/check.hpp> @@ -73,7 +74,8 @@ GroupProcess::GroupProcess( const Duration& _timeout, const string& _znode, const Option<Authentication>& _auth) - : servers(_servers), + : ProcessBase(ID::generate("group")), + servers(_servers), timeout(_timeout), znode(strings::remove(_znode, "/", strings::SUFFIX)), auth(_auth), @@ -92,7 +94,8 @@ GroupProcess::GroupProcess( GroupProcess::GroupProcess( const URL& url, const Duration& _timeout) - : servers(url.servers), + : ProcessBase(ID::generate("group")), + servers(url.servers), timeout(_timeout), znode(strings::remove(url.path, "/", strings::SUFFIX)), auth(url.authentication), http://git-wip-us.apache.org/repos/asf/mesos/blob/33107690/src/zookeeper/zookeeper.cpp ---------------------------------------------------------------------- diff --git a/src/zookeeper/zookeeper.cpp b/src/zookeeper/zookeeper.cpp index 9c0c038..a35fd50 100644 --- a/src/zookeeper/zookeeper.cpp +++ b/src/zookeeper/zookeeper.cpp @@ -23,6 +23,7 @@ #include <process/defer.hpp> #include <process/dispatch.hpp> +#include <process/id.hpp> #include <process/process.hpp> #include <process/timeout.hpp> @@ -36,11 +37,7 @@ #include "zookeeper/zookeeper.hpp" -using process::Future; -using process::PID; -using process::Process; -using process::Promise; -using process::Timeout; +using namespace process; using std::map; using std::string; @@ -57,7 +54,8 @@ public: const string& servers, const Duration& timeout, Watcher* watcher) - : servers(servers), + : ProcessBase(ID::generate("zookeeper")), + servers(servers), timeout(timeout), zh(NULL) {