You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:36:01 UTC
[20/48] mesos git commit: Renamed a parameter for the sake of clarity.
Renamed a parameter for the sake of clarity.
We use several different "timeouts" in this code and the
"Zk session timeout" has a very specific meaning in this context.
Review: https://reviews.apache.org/r/42987/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/67e6bcce
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/67e6bcce
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/67e6bcce
Branch: refs/heads/0.27.x
Commit: 67e6bcce2c8f8d858e48bd455e9d4c4b8493a5c4
Parents: 4ecca83
Author: Neil Conway <ne...@gmail.com>
Authored: Sat Jan 30 20:01:59 2016 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Feb 15 16:15:23 2016 -0500
----------------------------------------------------------------------
src/zookeeper/group.cpp | 20 ++++++++++----------
src/zookeeper/group.hpp | 12 ++++++------
src/zookeeper/zookeeper.cpp | 12 ++++++------
src/zookeeper/zookeeper.hpp | 6 ++++--
4 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/67e6bcce/src/zookeeper/group.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/group.cpp b/src/zookeeper/group.cpp
index 2ae3193..add01a3 100644
--- a/src/zookeeper/group.cpp
+++ b/src/zookeeper/group.cpp
@@ -87,12 +87,12 @@ void discard(queue<T*>* queue)
GroupProcess::GroupProcess(
const string& _servers,
- const Duration& _timeout,
+ const Duration& _sessionTimeout,
const string& _znode,
const Option<Authentication>& _auth)
: ProcessBase(ID::generate("group")),
servers(_servers),
- timeout(_timeout),
+ sessionTimeout(_sessionTimeout),
znode(strings::remove(_znode, "/", strings::SUFFIX)),
auth(_auth),
acl(_auth.isSome()
@@ -109,10 +109,10 @@ GroupProcess::GroupProcess(
// C++ 11.
GroupProcess::GroupProcess(
const URL& url,
- const Duration& _timeout)
+ const Duration& _sessionTimeout)
: ProcessBase(ID::generate("group")),
servers(url.servers),
- timeout(_timeout),
+ sessionTimeout(_sessionTimeout),
znode(strings::remove(url.path, "/", strings::SUFFIX)),
auth(url.authentication),
acl(url.authentication.isSome()
@@ -142,7 +142,7 @@ void GroupProcess::initialize()
// Doing initialization here allows to avoid the race between
// instantiating the ZooKeeper instance and being spawned ourself.
watcher = new ProcessWatcher<GroupProcess>(self());
- zk = new ZooKeeper(servers, timeout, watcher);
+ zk = new ZooKeeper(servers, sessionTimeout, watcher);
state = CONNECTING;
}
@@ -530,7 +530,7 @@ void GroupProcess::expired(int64_t sessionId)
delete CHECK_NOTNULL(zk);
delete CHECK_NOTNULL(watcher);
watcher = new ProcessWatcher<GroupProcess>(self());
- zk = new ZooKeeper(servers, timeout, watcher);
+ zk = new ZooKeeper(servers, sessionTimeout, watcher);
state = CONNECTING;
}
@@ -969,19 +969,19 @@ string GroupProcess::zkBasename(const Group::Membership& membership)
Group::Group(const string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
const string& znode,
const Option<Authentication>& auth)
{
- process = new GroupProcess(servers, timeout, znode, auth);
+ process = new GroupProcess(servers, sessionTimeout, znode, auth);
spawn(process);
}
Group::Group(const URL& url,
- const Duration& timeout)
+ const Duration& sessionTimeout)
{
- process = new GroupProcess(url, timeout);
+ process = new GroupProcess(url, sessionTimeout);
spawn(process);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/67e6bcce/src/zookeeper/group.hpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/group.hpp b/src/zookeeper/group.hpp
index cf82fec..ed5d0a0 100644
--- a/src/zookeeper/group.hpp
+++ b/src/zookeeper/group.hpp
@@ -121,13 +121,13 @@ public:
};
// Constructs this group using the specified ZooKeeper servers (list
- // of host:port) with the given timeout at the specified znode.
+ // of host:port) with the given session timeout at the specified znode.
Group(const std::string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
const std::string& znode,
const Option<Authentication>& auth = None());
Group(const URL& url,
- const Duration& timeout);
+ const Duration& sessionTimeout);
~Group();
@@ -170,12 +170,12 @@ class GroupProcess : public process::Process<GroupProcess>
{
public:
GroupProcess(const std::string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
const std::string& znode,
const Option<Authentication>& auth);
GroupProcess(const URL& url,
- const Duration& timeout);
+ const Duration& sessionTimeout);
virtual ~GroupProcess();
@@ -256,7 +256,7 @@ private:
const std::string servers;
// The session timeout requested by the client.
- const Duration timeout;
+ const Duration sessionTimeout;
const std::string znode;
http://git-wip-us.apache.org/repos/asf/mesos/blob/67e6bcce/src/zookeeper/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/zookeeper.cpp b/src/zookeeper/zookeeper.cpp
index 3c4fdad..790bd15 100644
--- a/src/zookeeper/zookeeper.cpp
+++ b/src/zookeeper/zookeeper.cpp
@@ -50,11 +50,11 @@ public:
ZooKeeperProcess(
ZooKeeper* zk,
const string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
Watcher* watcher)
: ProcessBase(ID::generate("zookeeper")),
servers(servers),
- timeout(timeout),
+ sessionTimeout(sessionTimeout),
zh(NULL)
{
// We bind the Watcher::process callback so we can pass it to the
@@ -84,7 +84,7 @@ public:
zh = zookeeper_init(
servers.c_str(),
event,
- static_cast<int>(timeout.ms()),
+ static_cast<int>(sessionTimeout.ms()),
NULL,
&callback,
0);
@@ -511,7 +511,7 @@ private:
friend class ZooKeeper;
const string servers; // ZooKeeper host:port pairs.
- const Duration timeout; // ZooKeeper session timeout;
+ const Duration sessionTimeout; // ZooKeeper session timeout.
zhandle_t* zh; // ZooKeeper connection handle.
@@ -523,10 +523,10 @@ private:
ZooKeeper::ZooKeeper(
const string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
Watcher* watcher)
{
- process = new ZooKeeperProcess(this, servers, timeout, watcher);
+ process = new ZooKeeperProcess(this, servers, sessionTimeout, watcher);
spawn(process);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/67e6bcce/src/zookeeper/zookeeper.hpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/zookeeper.hpp b/src/zookeeper/zookeeper.hpp
index 573ff5b..a29a004 100644
--- a/src/zookeeper/zookeeper.hpp
+++ b/src/zookeeper/zookeeper.hpp
@@ -122,7 +122,7 @@ public:
* method will be invoked.
*/
ZooKeeper(const std::string& servers,
- const Duration& timeout,
+ const Duration& sessionTimeout,
Watcher* watcher);
~ZooKeeper();
@@ -145,7 +145,9 @@ public:
* \brief get the current session timeout.
*
* The session timeout requested by the client or the negotiated
- * session timeout after the session is established with ZooKeeper.
+ * session timeout after the session is established with
+ * ZooKeeper. Note that this might differ from the initial
+ * `sessionTimeout` specified when this instance was constructed.
*/
Duration getSessionTimeout() const;