You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2014/09/11 07:34:20 UTC
[1/2] git commit: Pulled the log line in
ZooKeeperTestServer::shutdownNetwork() to above the shutdown call. - When
debugging zookeeper related tests it's often more useful to know when the
tests is shutting down the ZK server to reason about the order of
Repository: mesos
Updated Branches:
refs/heads/master 60dd10cfb -> 9a25f5ef8
Pulled the log line in ZooKeeperTestServer::shutdownNetwork() to above the shutdown call.
- When debugging zookeeper related tests it's often more useful to know when the tests is shutting down the ZK server to reason about the order of events. Otherwise client disconnections are often logged before this "shutdown" line and can be confusing.
Review: https://reviews.apache.org/r/25511
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9a25f5ef
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9a25f5ef
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9a25f5ef
Branch: refs/heads/master
Commit: 9a25f5ef8f23b7fa089a9e1178f2ce2a8103b771
Parents: fcb8dcb
Author: Jiang Yan Xu <ya...@jxu.me>
Authored: Wed Sep 10 10:59:39 2014 -0700
Committer: Jiang Yan Xu <ya...@jxu.me>
Committed: Wed Sep 10 22:34:00 2014 -0700
----------------------------------------------------------------------
src/tests/zookeeper_test_server.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a25f5ef/src/tests/zookeeper_test_server.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper_test_server.cpp b/src/tests/zookeeper_test_server.cpp
index a8c9b1c..d92ab8a 100644
--- a/src/tests/zookeeper_test_server.cpp
+++ b/src/tests/zookeeper_test_server.cpp
@@ -115,11 +115,11 @@ std::string ZooKeeperTestServer::connectString() const
void ZooKeeperTestServer::shutdownNetwork()
{
if (connectionFactory != NULL && started) {
+ LOG(INFO) << "Shutting down ZooKeeperTestServer on port " << port;
connectionFactory->shutdown();
delete connectionFactory;
connectionFactory = NULL;
started = false;
- LOG(INFO) << "Shutdown ZooKeeperTestServer on port " << port;
}
}
[2/2] git commit: Increased session timeouts for ZooKeeper related
tests.
Posted by ya...@apache.org.
Increased session timeouts for ZooKeeper related tests.
- On slower machines sometimes the zookeeper c client times out where we aren't expecting because either the test server or the client is too slow to respond. Increasing this value helps mitigate the problem.
Review: https://reviews.apache.org/r/25487
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fcb8dcb9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fcb8dcb9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fcb8dcb9
Branch: refs/heads/master
Commit: fcb8dcb90b60528a41fb03ab769ca026e7da5d94
Parents: 60dd10c
Author: Jiang Yan Xu <ya...@jxu.me>
Authored: Tue Sep 9 17:37:43 2014 -0700
Committer: Jiang Yan Xu <ya...@jxu.me>
Committed: Wed Sep 10 22:34:00 2014 -0700
----------------------------------------------------------------------
src/tests/master_contender_detector_tests.cpp | 2 +-
src/tests/zookeeper.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fcb8dcb9/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index 9ac59aa..8f7fb18 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -490,7 +490,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderDetectorShutdownNetwork)
TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorTimedoutSession)
{
// Use an arbitrary timeout value.
- Duration sessionTimeout(Seconds(5));
+ Duration sessionTimeout(Seconds(10));
Try<zookeeper::URL> url = zookeeper::URL::parse(
"zk://" + server->connectString() + "/mesos");
http://git-wip-us.apache.org/repos/asf/mesos/blob/fcb8dcb9/src/tests/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper.cpp b/src/tests/zookeeper.cpp
index e45f956..08cab86 100644
--- a/src/tests/zookeeper.cpp
+++ b/src/tests/zookeeper.cpp
@@ -50,7 +50,7 @@ namespace mesos {
namespace internal {
namespace tests {
-const Duration ZooKeeperTest::NO_TIMEOUT = Milliseconds(5000);
+const Duration ZooKeeperTest::NO_TIMEOUT = Seconds(10);
void ZooKeeperTest::SetUpTestCase()