You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/04/19 15:09:21 UTC
[1/6] git commit: updated for 1.1.11 release
Updated Branches:
refs/heads/trunk a1c7c1321 -> 56e59fefc
updated for 1.1.11 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d939a0c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d939a0c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d939a0c9
Branch: refs/heads/trunk
Commit: d939a0c958d36a3debfc63364a3fa569aa632c6e
Parents: 6db8ac3
Author: Eric Evans <ee...@apache.org>
Authored: Tue Apr 16 19:08:40 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Tue Apr 16 19:08:40 2013 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d939a0c9/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6fa5172..c81af1f 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.1.10"/>
+ <property name="base.version" value="1.1.11"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d939a0c9/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 46d1781..739e38a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.11) unstable; urgency=low
+
+ * New release
+
+ -- Eric Evans <ee...@apache.org>, 16 Apr 2013 18:56:03 -0500
+
cassandra (1.1.10) unstable; urgency=low
* New release
[4/6] git commit: add 5393 to CHANGES.txt
Posted by ja...@apache.org.
add 5393 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f8a5d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36f8a5d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36f8a5d8
Branch: refs/heads/trunk
Commit: 36f8a5d81a90430ae29ad2750982ec166b887175
Parents: 2762f48
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Apr 18 11:39:18 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Apr 18 11:39:18 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36f8a5d8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b225cdf..203a00d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.1.12
+ * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
+
1.1.11
* Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
* Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
[2/6] git commit: fix corrupt changelog
Posted by ja...@apache.org.
fix corrupt changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b4b143b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b4b143b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b4b143b
Branch: refs/heads/trunk
Commit: 3b4b143b650daa634094fd7ab4fe147b547201fc
Parents: d939a0c
Author: Eric Evans <ee...@apache.org>
Authored: Wed Apr 17 09:42:30 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Wed Apr 17 09:42:30 2013 -0500
----------------------------------------------------------------------
debian/changelog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b4b143b/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 739e38a..76bac83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ cassandra (1.1.11) unstable; urgency=low
* New release
- -- Eric Evans <ee...@apache.org>, 16 Apr 2013 18:56:03 -0500
+ -- Eric Evans <ee...@apache.org> Tue, 16 Apr 2013 18:56:03 -0500
cassandra (1.1.10) unstable; urgency=low
[6/6] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by ja...@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/56e59fef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e59fef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e59fef
Branch: refs/heads/trunk
Commit: 56e59fefcffaf3a49a716da68494c745ea4eb5e6
Parents: a1c7c13 83ff1da
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Apr 19 06:08:07 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Apr 19 06:08:07 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e59fef/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e59fef/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[3/6] git commit: Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Posted by ja...@apache.org.
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2762f484
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2762f484
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2762f484
Branch: refs/heads/trunk
Commit: 2762f484c90152eb23c641732ecf6f650e937bfc
Parents: 3b4b143
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Apr 18 11:32:27 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Apr 18 11:32:27 2013 -0700
----------------------------------------------------------------------
.../cassandra/net/OutboundTcpConnection.java | 61 ++++++++++++---
1 files changed, 51 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2762f484/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 73d0c15..ae9f028 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -25,6 +25,7 @@ import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.Socket;
+import java.net.SocketException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicLong;
@@ -72,7 +73,7 @@ public class OutboundTcpConnection extends Thread
expireMessages();
try
{
- backlog.put(new Entry(message, id, System.currentTimeMillis()));
+ backlog.put(new Entry(message, id));
}
catch (InterruptedException e)
{
@@ -127,7 +128,7 @@ public class OutboundTcpConnection extends Thread
if (entry.timestamp < System.currentTimeMillis() - DatabaseDescriptor.getRpcTimeout())
dropped.incrementAndGet();
else if (socket != null || connect())
- writeConnected(m, id);
+ writeConnected(entry, id);
else
// clear out the queue, else gossip messages back up.
active.clear();
@@ -149,8 +150,9 @@ public class OutboundTcpConnection extends Thread
return dropped.get();
}
- private void writeConnected(Message message, String id)
+ private void writeConnected(Entry entry, String id)
{
+ Message message = entry.message;
try
{
write(message, id, out);
@@ -162,12 +164,32 @@ public class OutboundTcpConnection extends Thread
}
catch (Exception e)
{
- // Non IO exceptions is likely a programming error so let's not silence it
- if (!(e instanceof IOException))
- logger.error("error writing to " + poolReference.endPoint(), e);
- else if (logger.isDebugEnabled())
- logger.debug("error writing to " + poolReference.endPoint(), e);
disconnect();
+
+ if (e instanceof IOException)
+ {
+ if (logger.isDebugEnabled())
+ logger.debug("error writing to " + poolReference.endPoint(), e);
+
+ // if the message was important, such as a repair acknowledgement, put it back on the queue
+ // to retry after re-connecting. See CASSANDRA-5393
+ if (e instanceof SocketException && entry.shouldRetry())
+ {
+ try
+ {
+ backlog.put(new RetriedEntry(entry));
+ }
+ catch (InterruptedException e1)
+ {
+ throw new AssertionError(e1);
+ }
+ }
+ }
+ else
+ {
+ // Non IO exceptions are likely a programming error so let's not silence them
+ logger.error("error writing to " + poolReference.endPoint(), e);
+ }
}
}
@@ -283,17 +305,36 @@ public class OutboundTcpConnection extends Thread
}
}
+ /** messages that have not been retried yet */
private static class Entry
{
final Message message;
final String id;
final long timestamp;
- Entry(Message message, String id, long timestamp)
+ Entry(Message message, String id)
{
this.message = message;
this.id = id;
- this.timestamp = timestamp;
+ this.timestamp = System.currentTimeMillis();
+ }
+
+ boolean shouldRetry()
+ {
+ return !MessagingService.DROPPABLE_VERBS.contains(message.getVerb());
+ }
+ }
+
+ private static class RetriedEntry extends Entry
+ {
+ RetriedEntry(Entry e)
+ {
+ super(e.message, e.id);
+ }
+
+ boolean shouldRetry()
+ {
+ return false;
}
}
}
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by ja...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
build.xml
debian/changelog
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ff1da8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ff1da8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ff1da8
Branch: refs/heads/trunk
Commit: 83ff1da821272e8a498775d6cbef28622882f82d
Parents: a89b219 36f8a5d
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Apr 19 06:07:32 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Apr 19 06:07:32 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
.../cassandra/net/OutboundTcpConnection.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ff1da8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9929edf,203a00d..80c9b44
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,82 -1,8 +1,83 @@@
-1.1.12
+1.2.5
+ * Include fatal errors in trace events (CASSANDRA-5447)
+ * Ensure that PerRowSecondaryIndex is notified of row-level deletes
+ (CASSANDRA-5445)
+ * Allow empty blob literals in CQL3 (CASSANDRA-5452)
+ * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
+ * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
+ * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
- Merged from 1.1:
++Merged from 1.1
+ * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
-
-1.1.11
* Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
+
+
+1.2.4
+ * Ensure that PerRowSecondaryIndex updates see the most recent values
+ (CASSANDRA-5397)
+ * avoid duplicate index entries ind PrecompactedRow and
+ ParallelCompactionIterable (CASSANDRA-5395)
+ * remove the index entry on oldColumn when new column is a tombstone
+ (CASSANDRA-5395)
+ * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
+ * 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)
+ * Improve asynchronous hint delivery (CASSANDRA-5179)
+ * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
+ * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
+ * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366)
+ * Optimize min/max timestamp collection (CASSANDRA-5373)
+ * Invalid streamId in cql binary protocol when using invalid CL
+ (CASSANDRA-5164)
+ * Fix validation for IN where clauses with collections (CASSANDRA-5376)
+ * Copy resultSet on count query to avoid ConcurrentModificationException
+ (CASSANDRA-5382)
+ * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
+ * Fix streaming compressed files when using encryption (CASSANDRA-5391)
+ * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
+ * Fix writetime/ttl functions on null values (CASSANDRA-5341)
+ * Fix NPE during cql3 select with token() (CASSANDRA-5404)
+ * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
+ * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
+ * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
+ * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
+ * Fix potential incremental backups race (CASSANDRA-5410)
+ * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
+ * Allow overriding superuser setup delay (CASSANDRA-5430)
+ * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
+Merged from 1.1:
+ * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
+ * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
+ * Fix cf name extraction from manifest in Directories.migrateFile()
+ (CASSANDRA-5242)
+ * Support pluggable internode authentication (CASSANDRA-5401)
+
+
+1.2.3
+ * add check for sstable overlap within a level on startup (CASSANDRA-5327)
+ * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
+ * Avoid allocating SSTableBoundedScanner during repair when the range does
+ not intersect the sstable (CASSANDRA-5249)
+ * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
+ * Fix composite comparator with super columns (CASSANDRA-5287)
+ * Fix insufficient validation of UPDATE queries against counter cfs
+ (CASSANDRA-5300)
+ * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
+ * Handle null values when executing prepared statement (CASSANDRA-5081)
+ * Add netty to pom dependencies (CASSANDRA-5181)
+ * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
+ * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
+ * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
+ * Re-enable unknown option in replication/compaction strategies option for
+ backward compatibility (CASSANDRA-4795)
+ * Add binary protocol support to stress (CASSANDRA-4993)
+ * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
+ * Fix repair -pr for vnodes (CASSANDRA-5329)
+ * Relax CL for auth queries for non-default users (CASSANDRA-5310)
+ * Fix AssertionError during repair (CASSANDRA-5245)
+ * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
+Merged from 1.1:
* Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
* add tmp flag to Descriptor hashcode (CASSANDRA-4021)
* fix logging of "Found table data in data directories" when only system tables
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ff1da8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index b1a1fe9,ae9f028..32ce224
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -401,7 -321,7 +401,7 @@@ public class OutboundTcpConnection exte
boolean shouldRetry()
{
- return MessagingService.DROPPABLE_VERBS.contains(message.verb);
- return !MessagingService.DROPPABLE_VERBS.contains(message.getVerb());
++ return !MessagingService.DROPPABLE_VERBS.contains(message.verb);
}
}