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/04/21 00:02:49 UTC
git commit: Fixed an incorrect CHECK in Group.
Repository: mesos
Updated Branches:
refs/heads/master d369084f1 -> 0174fbd47
Fixed an incorrect CHECK in Group.
Review: https://reviews.apache.org/r/20470
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0174fbd4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0174fbd4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0174fbd4
Branch: refs/heads/master
Commit: 0174fbd4728a8d77a8649cc065675770df8b36c8
Parents: d369084
Author: Jiang Yan Xu <ya...@jxu.me>
Authored: Wed Apr 16 17:55:16 2014 -0700
Committer: Jiang Yan Xu <ya...@jxu.me>
Committed: Sun Apr 20 15:02:29 2014 -0700
----------------------------------------------------------------------
src/zookeeper/group.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0174fbd4/src/zookeeper/group.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/group.cpp b/src/zookeeper/group.cpp
index cff5997..bdebc48 100644
--- a/src/zookeeper/group.cpp
+++ b/src/zookeeper/group.cpp
@@ -878,7 +878,9 @@ void GroupProcess::retry(const Duration& duration)
// session expires so 'retrying' should be false in the condition
// check above.
CHECK(error.isNone());
- CHECK(state == CONNECTED || state == CONNECTING || state == READY)
+
+ // In order to be retrying, we should be at least CONNECTED.
+ CHECK(state == CONNECTED || state == AUTHENTICATED || state == READY)
<< state;
// Will reset it to true if another retry is necessary.