You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/02/08 16:51:43 UTC
[16/20] mesos git commit: Disambiguated use of 'URL' in Mesos.
Disambiguated use of 'URL' in Mesos.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1993ff24
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1993ff24
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1993ff24
Branch: refs/heads/master
Commit: 1993ff24bb3cd6498da0391048e17f203f49ebaf
Parents: 3c285f1
Author: Benjamin Hindman <be...@gmail.com>
Authored: Fri Jan 30 15:49:50 2015 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sat Feb 7 14:42:46 2015 -0800
----------------------------------------------------------------------
src/master/contender.cpp | 6 +++---
src/master/detector.cpp | 8 ++++----
src/master/main.cpp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1993ff24/src/master/contender.cpp
----------------------------------------------------------------------
diff --git a/src/master/contender.cpp b/src/master/contender.cpp
index 2270400..0a8c099 100644
--- a/src/master/contender.cpp
+++ b/src/master/contender.cpp
@@ -75,7 +75,7 @@ Try<MasterContender*> MasterContender::create(const string& zk)
if (zk == "") {
return new StandaloneMasterContender();
} else if (strings::startsWith(zk, "zk://")) {
- Try<zookeeper::URL> url = URL::parse(zk);
+ Try<zookeeper::URL> url = zookeeper::URL::parse(zk);
if (url.isError()) {
return Error(url.error());
}
@@ -139,7 +139,7 @@ Future<Future<Nothing> > StandaloneMasterContender::contend()
}
-ZooKeeperMasterContender::ZooKeeperMasterContender(const URL& url)
+ZooKeeperMasterContender::ZooKeeperMasterContender(const zookeeper::URL& url)
{
process = new ZooKeeperMasterContenderProcess(url);
spawn(process);
@@ -174,7 +174,7 @@ Future<Future<Nothing> > ZooKeeperMasterContender::contend()
ZooKeeperMasterContenderProcess::ZooKeeperMasterContenderProcess(
- const URL& url)
+ const zookeeper::URL& url)
: ProcessBase(ID::generate("zookeeper-master-contender")),
group(new Group(url, MASTER_CONTENDER_ZK_SESSION_TIMEOUT)),
contender(NULL) {}
http://git-wip-us.apache.org/repos/asf/mesos/blob/1993ff24/src/master/detector.cpp
----------------------------------------------------------------------
diff --git a/src/master/detector.cpp b/src/master/detector.cpp
index ebeca61..367d1e1 100644
--- a/src/master/detector.cpp
+++ b/src/master/detector.cpp
@@ -165,7 +165,7 @@ class ZooKeeperMasterDetectorProcess
: public Process<ZooKeeperMasterDetectorProcess>
{
public:
- explicit ZooKeeperMasterDetectorProcess(const URL& url);
+ explicit ZooKeeperMasterDetectorProcess(const zookeeper::URL& url);
explicit ZooKeeperMasterDetectorProcess(Owned<Group> group);
~ZooKeeperMasterDetectorProcess();
@@ -200,7 +200,7 @@ Try<MasterDetector*> MasterDetector::create(const string& master)
if (master == "") {
return new StandaloneMasterDetector();
} else if (master.find("zk://") == 0) {
- Try<URL> url = URL::parse(master);
+ Try<zookeeper::URL> url = zookeeper::URL::parse(master);
if (url.isError()) {
return Error(url.error());
}
@@ -290,7 +290,7 @@ Future<Option<MasterInfo> > StandaloneMasterDetector::detect(
// TODO(benh): Get ZooKeeper timeout from configuration.
// TODO(xujyan): Use peer constructor after switching to C++ 11.
ZooKeeperMasterDetectorProcess::ZooKeeperMasterDetectorProcess(
- const URL& url)
+ const zookeeper::URL& url)
: ProcessBase(ID::generate("zookeeper-master-detector")),
group(new Group(url.servers,
MASTER_DETECTOR_ZK_SESSION_TIMEOUT,
@@ -436,7 +436,7 @@ void ZooKeeperMasterDetectorProcess::fetched(
}
-ZooKeeperMasterDetector::ZooKeeperMasterDetector(const URL& url)
+ZooKeeperMasterDetector::ZooKeeperMasterDetector(const zookeeper::URL& url)
{
process = new ZooKeeperMasterDetectorProcess(url);
spawn(process);
http://git-wip-us.apache.org/repos/asf/mesos/blob/1993ff24/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index a295490..d4adae5 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -235,7 +235,7 @@ int main(int argc, char** argv)
zk_ = zk.get();
}
- Try<URL> url = URL::parse(zk_);
+ Try<zookeeper::URL> url = zookeeper::URL::parse(zk_);
if (url.isError()) {
EXIT(1) << "Error parsing ZooKeeper URL: " << url.error();
}