You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/12 21:54:22 UTC
[01/10] git commit: Display generation/heartbeat in gossipinfo
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 29a89d818 -> d509fe1a5
refs/heads/cassandra-2.0 daf6f68ec -> 3d81ac5ec
refs/heads/cassandra-2.1 6c8271f60 -> b4b3d8012
refs/heads/trunk 8fb393ec3 -> 7349ec2aa
Display generation/heartbeat in gossipinfo
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d509fe1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d509fe1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d509fe1a
Branch: refs/heads/cassandra-1.2
Commit: d509fe1a5f8798f23f248fd0421fe15d04a53e32
Parents: 29a89d8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d509fe1a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index f5c500c..ac54414 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -141,6 +141,8 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private void appendEndpointState(StringBuilder sb, EndpointState endpointState)
{
+ sb.append(" generation:").append(endpointState.getHeartBeatState().getGeneration()).append("\n");
+ sb.append(" heartbeat:").append(endpointState.getHeartBeatState().getHeartBeatVersion()).append("\n");
for (Map.Entry<ApplicationState, VersionedValue> state : endpointState.applicationState.entrySet())
{
if (state.getKey() == ApplicationState.TOKENS)
[04/10] git commit: Display generation/heartbeat in gossipinfo
Posted by br...@apache.org.
Display generation/heartbeat in gossipinfo
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d509fe1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d509fe1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d509fe1a
Branch: refs/heads/trunk
Commit: d509fe1a5f8798f23f248fd0421fe15d04a53e32
Parents: 29a89d8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d509fe1a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index f5c500c..ac54414 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -141,6 +141,8 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private void appendEndpointState(StringBuilder sb, EndpointState endpointState)
{
+ sb.append(" generation:").append(endpointState.getHeartBeatState().getGeneration()).append("\n");
+ sb.append(" heartbeat:").append(endpointState.getHeartBeatState().getHeartBeatVersion()).append("\n");
for (Map.Entry<ApplicationState, VersionedValue> state : endpointState.applicationState.entrySet())
{
if (state.getKey() == ApplicationState.TOKENS)
[03/10] git commit: Display generation/heartbeat in gossipinfo
Posted by br...@apache.org.
Display generation/heartbeat in gossipinfo
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d509fe1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d509fe1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d509fe1a
Branch: refs/heads/cassandra-2.1
Commit: d509fe1a5f8798f23f248fd0421fe15d04a53e32
Parents: 29a89d8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d509fe1a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index f5c500c..ac54414 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -141,6 +141,8 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private void appendEndpointState(StringBuilder sb, EndpointState endpointState)
{
+ sb.append(" generation:").append(endpointState.getHeartBeatState().getGeneration()).append("\n");
+ sb.append(" heartbeat:").append(endpointState.getHeartBeatState().getHeartBeatVersion()).append("\n");
for (Map.Entry<ApplicationState, VersionedValue> state : endpointState.applicationState.entrySet())
{
if (state.getKey() == ApplicationState.TOKENS)
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7349ec2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7349ec2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7349ec2a
Branch: refs/heads/trunk
Commit: 7349ec2aa327bb0fabb7702003308dae5fd4d6c1
Parents: 8fb393e b4b3d80
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:54:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:54:05 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7349ec2a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b3d801
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b3d801
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b3d801
Branch: refs/heads/cassandra-2.1
Commit: b4b3d801233f9e9abc84b882c7ae5ed9589b418e
Parents: 6c8271f 3d81ac5
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:57 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b3d801/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[02/10] git commit: Display generation/heartbeat in gossipinfo
Posted by br...@apache.org.
Display generation/heartbeat in gossipinfo
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d509fe1a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d509fe1a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d509fe1a
Branch: refs/heads/cassandra-2.0
Commit: d509fe1a5f8798f23f248fd0421fe15d04a53e32
Parents: 29a89d8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:11 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:11 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d509fe1a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index f5c500c..ac54414 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -141,6 +141,8 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private void appendEndpointState(StringBuilder sb, EndpointState endpointState)
{
+ sb.append(" generation:").append(endpointState.getHeartBeatState().getGeneration()).append("\n");
+ sb.append(" heartbeat:").append(endpointState.getHeartBeatState().getHeartBeatVersion()).append("\n");
for (Map.Entry<ApplicationState, VersionedValue> state : endpointState.applicationState.entrySet())
{
if (state.getKey() == ApplicationState.TOKENS)
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d81ac5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d81ac5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d81ac5e
Branch: refs/heads/cassandra-2.1
Commit: 3d81ac5ecd019704b687a829e6ed90c3d05326e6
Parents: daf6f68 d509fe1
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:47 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d81ac5e/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d81ac5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d81ac5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d81ac5e
Branch: refs/heads/cassandra-2.0
Commit: 3d81ac5ecd019704b687a829e6ed90c3d05326e6
Parents: daf6f68 d509fe1
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:47 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d81ac5e/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d81ac5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d81ac5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d81ac5e
Branch: refs/heads/trunk
Commit: 3d81ac5ecd019704b687a829e6ed90c3d05326e6
Parents: daf6f68 d509fe1
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:47 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d81ac5e/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b3d801
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b3d801
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b3d801
Branch: refs/heads/trunk
Commit: b4b3d801233f9e9abc84b882c7ae5ed9589b418e
Parents: 6c8271f 3d81ac5
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 14:53:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 14:53:57 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b3d801/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------