You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/03/24 00:08:00 UTC
[1/3] git commit: Gossiper logs DOWN for symmetry with UP patch by
rcoli; reviewed by jbellis for CASSANDRA-5187
Updated Branches:
refs/heads/cassandra-1.2 54cc50396 -> 0d51a5464
refs/heads/trunk ae8094802 -> 17b516913
Gossiper logs DOWN for symmetry with UP
patch by rcoli; reviewed by jbellis for CASSANDRA-5187
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d51a546
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d51a546
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d51a546
Branch: refs/heads/cassandra-1.2
Commit: 0d51a5464c8e57a6ecf7b8593035786fcf53b52d
Parents: 54cc503
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Mar 23 18:07:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Mar 23 18:07:49 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 4 ++--
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f34f7bb..c9bc5d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.4
+ * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
* Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
* Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
* Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 60ca850..e8a5699 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -761,11 +761,11 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private void markDead(InetAddress addr, EndpointState localState)
{
if (logger.isTraceEnabled())
- logger.trace("marking as dead {}", addr);
+ logger.trace("marking as down {}", addr);
localState.markDead();
liveEndpoints.remove(addr);
unreachableEndpoints.put(addr, System.currentTimeMillis());
- logger.info("InetAddress {} is now dead.", addr);
+ logger.info("InetAddress {} is now DOWN", addr);
for (IEndpointStateChangeSubscriber subscriber : subscribers)
subscriber.onDead(addr, localState);
if (logger.isTraceEnabled())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index f40f2c2..a67e1a3 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -63,7 +63,7 @@ commands:
Pause hints delivery process
- name: disablegossip
help: |
- Disable gossip (effectively marking the node dead)
+ Disable gossip (effectively marking the node down)
- name: enablegossip
help: |
Reenable gossip
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17b51691
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b51691
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b51691
Branch: refs/heads/trunk
Commit: 17b51691371b95ed4113bd98280e3dc80c9cd53f
Parents: ae80948 0d51a54
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Mar 23 18:07:55 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Mar 23 18:07:55 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 4 ++--
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 12d4a04,c9bc5d7..e940f7b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
+2.0
+ * Improve LeveledScanner work estimation (CASSANDRA-5250)
+ * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
+ * Change Message IDs to ints (CASSANDRA-5307)
+ * Move sstable level information into the Stats component, removing the
+ need for a separate Manifest file (CASSANDRA-4872)
+ * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
+ * make index_interval configurable per columnfamily (CASSANDRA-3961)
+ * add default_time_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+ * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
+ * upgrade thrift to 0.9.0 (CASSANDRA-3719)
+ * drop unnecessary keyspace parameter from user-defined compaction API
+ (CASSANDRA-5139)
+ * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
+ * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
+ * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
+ * Allow custom configuration loader (CASSANDRA-5045)
+ * Remove memory emergency pressure valve logic (CASSANDRA-3534)
+ * Reduce request latency with eager retry (CASSANDRA-4705)
+ * cqlsh: Remove ASSUME command (CASSANDRA-5331)
+
+
1.2.4
+ * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
* Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
* Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
* Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
[2/3] git commit: Gossiper logs DOWN for symmetry with UP patch by
rcoli; reviewed by jbellis for CASSANDRA-5187
Posted by jb...@apache.org.
Gossiper logs DOWN for symmetry with UP
patch by rcoli; reviewed by jbellis for CASSANDRA-5187
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d51a546
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d51a546
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d51a546
Branch: refs/heads/trunk
Commit: 0d51a5464c8e57a6ecf7b8593035786fcf53b52d
Parents: 54cc503
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Mar 23 18:07:49 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Mar 23 18:07:49 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 4 ++--
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f34f7bb..c9bc5d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.4
+ * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
* Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
* Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
* Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 60ca850..e8a5699 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -761,11 +761,11 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private void markDead(InetAddress addr, EndpointState localState)
{
if (logger.isTraceEnabled())
- logger.trace("marking as dead {}", addr);
+ logger.trace("marking as down {}", addr);
localState.markDead();
liveEndpoints.remove(addr);
unreachableEndpoints.put(addr, System.currentTimeMillis());
- logger.info("InetAddress {} is now dead.", addr);
+ logger.info("InetAddress {} is now DOWN", addr);
for (IEndpointStateChangeSubscriber subscriber : subscribers)
subscriber.onDead(addr, localState);
if (logger.isTraceEnabled())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d51a546/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index f40f2c2..a67e1a3 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -63,7 +63,7 @@ commands:
Pause hints delivery process
- name: disablegossip
help: |
- Disable gossip (effectively marking the node dead)
+ Disable gossip (effectively marking the node down)
- name: enablegossip
help: |
Reenable gossip