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/10/03 19:12:51 UTC
[01/11] git commit: cleanup
Updated Branches:
refs/heads/cassandra-1.2 20a805023 -> 92b3622dc
refs/heads/cassandra-2.0 723abe2fc -> 7d8a56df3
refs/heads/trunk f54764207 -> 9b06e48bb
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55a55000
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55a55000
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55a55000
Branch: refs/heads/trunk
Commit: 55a55000526bc24313bbc7afc08f758d35dda03a
Parents: 31a9a2f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:53:00 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 09:53:00 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/55a55000/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 00375ab..657d7f2 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -880,17 +880,17 @@ public class NodeCmd
outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead count: " + cfstore.getReadCount());
- outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tLocal read count: " + cfstore.getReadCount());
+ outs.printf("\t\tLocal read latency: %01.3f ms%n", cfstore.getRecentReadLatencyMicros() / 1000);
+ outs.println("\t\tLocal write count: " + cfstore.getWriteCount());
+ outs.printf("\t\tLocal write latency: %01.3f ms%n", cfstore.getRecentWriteLatencyMicros() / 1000);
outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
+ outs.println("\t\tCompacted partition minimum bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
[07/11] git commit: cleanup
Posted by jb...@apache.org.
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71c89128
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71c89128
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71c89128
Branch: refs/heads/trunk
Commit: 71c89128279af4ef9f1a990b022f77e05f5aafb8
Parents: 723abe2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:53:00 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:03:24 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c89128/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 00375ab..657d7f2 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -880,17 +880,17 @@ public class NodeCmd
outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead count: " + cfstore.getReadCount());
- outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tLocal read count: " + cfstore.getReadCount());
+ outs.printf("\t\tLocal read latency: %01.3f ms%n", cfstore.getRecentReadLatencyMicros() / 1000);
+ outs.println("\t\tLocal write count: " + cfstore.getWriteCount());
+ outs.printf("\t\tLocal write latency: %01.3f ms%n", cfstore.getRecentWriteLatencyMicros() / 1000);
outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
+ outs.println("\t\tCompacted partition minimum bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
[11/11] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b06e48b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b06e48b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b06e48b
Branch: refs/heads/trunk
Commit: 9b06e48bb7fc4ce0cb95778e2aa961cccaea5d1c
Parents: c8d0f11 7d8a56d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:12:43 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:12:43 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b06e48b/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[03/11] git commit: fix assertionerror from #6132
Posted by jb...@apache.org.
fix assertionerror from #6132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b3622d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b3622d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b3622d
Branch: refs/heads/cassandra-1.2
Commit: 92b3622dc219798b3bacce6f37eb1d5885bafeb4
Parents: 20a8050
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:03:02 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:03:02 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
src/java/org/apache/cassandra/dht/BootStrapper.java | 8 ++++----
src/java/org/apache/cassandra/net/MessagingService.java | 8 +++++---
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 633ea9a..218f719 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DefsTable;
import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.dht.BootStrapper;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSWriteError;
@@ -839,6 +840,8 @@ public class DatabaseDescriptor
case READ_REPAIR:
case MUTATION:
return getWriteRpcTimeout();
+ case BOOTSTRAP_TOKEN:
+ return BootStrapper.BOOTSTRAP_TIMEOUT;
default:
return getRpcTimeout();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java
index ff76534..2e79562 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -48,6 +48,8 @@ import org.apache.cassandra.net.*;
public class BootStrapper
{
+ public static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
+
private static final Logger logger = LoggerFactory.getLogger(BootStrapper.class);
/* endpoint that needs to be bootstrapped */
@@ -55,7 +57,6 @@ public class BootStrapper
/* token of the node being bootstrapped. */
protected final Collection<Token> tokens;
protected final TokenMetadata tokenMetadata;
- private static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
public BootStrapper(InetAddress address, Collection<Token> tokens, TokenMetadata tmd)
{
@@ -187,13 +188,12 @@ public class BootStrapper
{
MessageOut message = new MessageOut(MessagingService.Verb.BOOTSTRAP_TOKEN);
int retries = 5;
- long timeout = Math.max(DatabaseDescriptor.getRpcTimeout(), BOOTSTRAP_TIMEOUT);
while (retries > 0)
{
BootstrapTokenCallback btc = new BootstrapTokenCallback();
- MessagingService.instance().sendRR(message, maxEndpoint, btc, timeout);
- Token token = btc.getToken(timeout);
+ MessagingService.instance().sendRR(message, maxEndpoint, btc);
+ Token token = btc.getToken(BOOTSTRAP_TIMEOUT);
if (token != null)
return token;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index dd02ca6..c9b0047 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -550,7 +550,7 @@ public final class MessagingService implements MessagingServiceMBean
*/
public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb)
{
- return sendRR(message, to, cb, message.getTimeout());
+ return sendRR(message, to, cb, message.getTimeout(), null);
}
/**
@@ -567,9 +567,11 @@ public final class MessagingService implements MessagingServiceMBean
* @param timeout the timeout used for expiration
* @return an reference to message id used to match with the result
*/
- public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout)
+ public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout, ConsistencyLevel consistencyLevel)
{
- String id = addCallback(cb, message, to, timeout);
+ String id = consistencyLevel == null
+ ? addCallback(cb, message, to, timeout)
+ : addCallback(cb, message, to, timeout, consistencyLevel);
if (cb instanceof AbstractWriteResponseHandler)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index a81e5b4..9b559e5 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -642,7 +642,7 @@ public class StorageProxy implements StorageProxyMBean
{
// yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
// creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
while (iter.hasNext())
{
target = iter.next();
[08/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d8a56df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d8a56df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d8a56df
Branch: refs/heads/trunk
Commit: 7d8a56df3df26be7537f2a5158469629c34b911c
Parents: 71c8912 92b3622
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:12:11 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:12:11 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8a56df/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 6c8e636,9b559e5..d16bef9
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -963,29 -637,35 +963,29 @@@ public class StorageProxy implements St
Iterator<InetAddress> iter = targets.iterator();
InetAddress target = iter.next();
- // direct writes to local DC or old Cassandra versions
- if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_11)
+ // Add the other destinations of the same message as a FORWARD_HEADER entry
+ DataOutputBuffer out = new DataOutputBuffer();
+ try
{
- // yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
- // creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(targets.size() - 1);
while (iter.hasNext())
{
- target = iter.next();
- MessagingService.instance().sendRR(message, target, handler);
+ InetAddress destination = iter.next();
+ CompactEndpointSerializationHelper.serialize(destination, out);
- int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
++ int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(id);
+ logger.trace("Adding FWD message to {}@{}", id, destination);
}
- return;
+ message = message.withParameter(RowMutation.FORWARD_TO, out.getData());
+ // send the combined message + forward headers
+ int id = MessagingService.instance().sendRR(message, target, handler);
+ logger.trace("Sending message to {}@{}", id, target);
}
-
- // Add all the other destinations of the same message as a FORWARD_HEADER entry
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- dos.writeInt(targets.size() - 1);
- while (iter.hasNext())
+ catch (IOException e)
{
- InetAddress destination = iter.next();
- CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
- dos.writeUTF(id);
+ // DataOutputBuffer is in-memory, doesn't throw IOException
+ throw new AssertionError(e);
}
- message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
- // send the combined message + forward headers
- Tracing.trace("Enqueuing message to {}", target);
- MessagingService.instance().sendRR(message, target, handler);
}
private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)
[02/11] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecfb403d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecfb403d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecfb403d
Branch: refs/heads/trunk
Commit: ecfb403da94efe161348ad85de45166b766673fb
Parents: db82949 55a5500
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:53:14 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 09:53:14 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[06/11] git commit: cleanup
Posted by jb...@apache.org.
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71c89128
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71c89128
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71c89128
Branch: refs/heads/cassandra-2.0
Commit: 71c89128279af4ef9f1a990b022f77e05f5aafb8
Parents: 723abe2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:53:00 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:03:24 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c89128/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 00375ab..657d7f2 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -880,17 +880,17 @@ public class NodeCmd
outs.println("\t\tMemtable cell count: " + cfstore.getMemtableColumnsCount());
outs.println("\t\tMemtable data size, bytes: " + cfstore.getMemtableDataSize());
outs.println("\t\tMemtable switch count: " + cfstore.getMemtableSwitchCount());
- outs.println("\t\tRead count: " + cfstore.getReadCount());
- outs.println("\t\tRead latency, micros: " + String.format("%01.3f", cfstore.getRecentReadLatencyMicros() / 1000) + " ms.");
- outs.println("\t\tWrite count: " + cfstore.getWriteCount());
- outs.println("\t\tWrite latency, micros: " + String.format("%01.3f", cfstore.getRecentWriteLatencyMicros() / 1000) + " ms.");
+ outs.println("\t\tLocal read count: " + cfstore.getReadCount());
+ outs.printf("\t\tLocal read latency: %01.3f ms%n", cfstore.getRecentReadLatencyMicros() / 1000);
+ outs.println("\t\tLocal write count: " + cfstore.getWriteCount());
+ outs.printf("\t\tLocal write latency: %01.3f ms%n", cfstore.getRecentWriteLatencyMicros() / 1000);
outs.println("\t\tPending tasks: " + cfstore.getPendingTasks());
outs.println("\t\tBloom filter false positives: " + cfstore.getBloomFilterFalsePositives());
outs.println("\t\tBloom filter false ratio: " + String.format("%01.5f", cfstore.getRecentBloomFilterFalseRatio()));
outs.println("\t\tBloom filter space used, bytes: " + cfstore.getBloomFilterDiskSpaceUsed());
- outs.println("\t\tCompacted partition minimum size, bytes: " + cfstore.getMinRowSize());
- outs.println("\t\tCompacted partition maximum size, bytes: " + cfstore.getMaxRowSize());
- outs.println("\t\tCompacted partition mean size, bytes: " + cfstore.getMeanRowSize());
+ outs.println("\t\tCompacted partition minimum bytes: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted partition maximum bytes: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted partition mean bytes: " + cfstore.getMeanRowSize());
outs.println("");
}
[10/11] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Posted by jb...@apache.org.
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8d0f11c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d0f11c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d0f11c
Branch: refs/heads/trunk
Commit: c8d0f11c0b1acad2c5fc1d9948510efb5f9597d3
Parents: ecfb403 f547642
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:12:38 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:12:38 2013 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 ++
debian/init | 23 ++++-------------------
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[04/11] git commit: fix assertionerror from #6132
Posted by jb...@apache.org.
fix assertionerror from #6132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b3622d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b3622d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b3622d
Branch: refs/heads/cassandra-2.0
Commit: 92b3622dc219798b3bacce6f37eb1d5885bafeb4
Parents: 20a8050
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:03:02 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:03:02 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
src/java/org/apache/cassandra/dht/BootStrapper.java | 8 ++++----
src/java/org/apache/cassandra/net/MessagingService.java | 8 +++++---
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 633ea9a..218f719 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DefsTable;
import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.dht.BootStrapper;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSWriteError;
@@ -839,6 +840,8 @@ public class DatabaseDescriptor
case READ_REPAIR:
case MUTATION:
return getWriteRpcTimeout();
+ case BOOTSTRAP_TOKEN:
+ return BootStrapper.BOOTSTRAP_TIMEOUT;
default:
return getRpcTimeout();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java
index ff76534..2e79562 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -48,6 +48,8 @@ import org.apache.cassandra.net.*;
public class BootStrapper
{
+ public static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
+
private static final Logger logger = LoggerFactory.getLogger(BootStrapper.class);
/* endpoint that needs to be bootstrapped */
@@ -55,7 +57,6 @@ public class BootStrapper
/* token of the node being bootstrapped. */
protected final Collection<Token> tokens;
protected final TokenMetadata tokenMetadata;
- private static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
public BootStrapper(InetAddress address, Collection<Token> tokens, TokenMetadata tmd)
{
@@ -187,13 +188,12 @@ public class BootStrapper
{
MessageOut message = new MessageOut(MessagingService.Verb.BOOTSTRAP_TOKEN);
int retries = 5;
- long timeout = Math.max(DatabaseDescriptor.getRpcTimeout(), BOOTSTRAP_TIMEOUT);
while (retries > 0)
{
BootstrapTokenCallback btc = new BootstrapTokenCallback();
- MessagingService.instance().sendRR(message, maxEndpoint, btc, timeout);
- Token token = btc.getToken(timeout);
+ MessagingService.instance().sendRR(message, maxEndpoint, btc);
+ Token token = btc.getToken(BOOTSTRAP_TIMEOUT);
if (token != null)
return token;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index dd02ca6..c9b0047 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -550,7 +550,7 @@ public final class MessagingService implements MessagingServiceMBean
*/
public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb)
{
- return sendRR(message, to, cb, message.getTimeout());
+ return sendRR(message, to, cb, message.getTimeout(), null);
}
/**
@@ -567,9 +567,11 @@ public final class MessagingService implements MessagingServiceMBean
* @param timeout the timeout used for expiration
* @return an reference to message id used to match with the result
*/
- public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout)
+ public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout, ConsistencyLevel consistencyLevel)
{
- String id = addCallback(cb, message, to, timeout);
+ String id = consistencyLevel == null
+ ? addCallback(cb, message, to, timeout)
+ : addCallback(cb, message, to, timeout, consistencyLevel);
if (cb instanceof AbstractWriteResponseHandler)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index a81e5b4..9b559e5 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -642,7 +642,7 @@ public class StorageProxy implements StorageProxyMBean
{
// yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
// creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
while (iter.hasNext())
{
target = iter.next();
[09/11] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d8a56df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d8a56df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d8a56df
Branch: refs/heads/cassandra-2.0
Commit: 7d8a56df3df26be7537f2a5158469629c34b911c
Parents: 71c8912 92b3622
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:12:11 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:12:11 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8a56df/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 6c8e636,9b559e5..d16bef9
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -963,29 -637,35 +963,29 @@@ public class StorageProxy implements St
Iterator<InetAddress> iter = targets.iterator();
InetAddress target = iter.next();
- // direct writes to local DC or old Cassandra versions
- if (localDC || MessagingService.instance().getVersion(target) < MessagingService.VERSION_11)
+ // Add the other destinations of the same message as a FORWARD_HEADER entry
+ DataOutputBuffer out = new DataOutputBuffer();
+ try
{
- // yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
- // creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(targets.size() - 1);
while (iter.hasNext())
{
- target = iter.next();
- MessagingService.instance().sendRR(message, target, handler);
+ InetAddress destination = iter.next();
+ CompactEndpointSerializationHelper.serialize(destination, out);
- int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
++ int id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
+ out.writeInt(id);
+ logger.trace("Adding FWD message to {}@{}", id, destination);
}
- return;
+ message = message.withParameter(RowMutation.FORWARD_TO, out.getData());
+ // send the combined message + forward headers
+ int id = MessagingService.instance().sendRR(message, target, handler);
+ logger.trace("Sending message to {}@{}", id, target);
}
-
- // Add all the other destinations of the same message as a FORWARD_HEADER entry
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(bos);
- dos.writeInt(targets.size() - 1);
- while (iter.hasNext())
+ catch (IOException e)
{
- InetAddress destination = iter.next();
- CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
- dos.writeUTF(id);
+ // DataOutputBuffer is in-memory, doesn't throw IOException
+ throw new AssertionError(e);
}
- message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
- // send the combined message + forward headers
- Tracing.trace("Enqueuing message to {}", target);
- MessagingService.instance().sendRR(message, target, handler);
}
private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)
[05/11] git commit: fix assertionerror from #6132
Posted by jb...@apache.org.
fix assertionerror from #6132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b3622d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b3622d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b3622d
Branch: refs/heads/trunk
Commit: 92b3622dc219798b3bacce6f37eb1d5885bafeb4
Parents: 20a8050
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 12:03:02 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 12:03:02 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
src/java/org/apache/cassandra/dht/BootStrapper.java | 8 ++++----
src/java/org/apache/cassandra/net/MessagingService.java | 8 +++++---
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 633ea9a..218f719 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DefsTable;
import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.dht.BootStrapper;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSWriteError;
@@ -839,6 +840,8 @@ public class DatabaseDescriptor
case READ_REPAIR:
case MUTATION:
return getWriteRpcTimeout();
+ case BOOTSTRAP_TOKEN:
+ return BootStrapper.BOOTSTRAP_TIMEOUT;
default:
return getRpcTimeout();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java
index ff76534..2e79562 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -48,6 +48,8 @@ import org.apache.cassandra.net.*;
public class BootStrapper
{
+ public static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
+
private static final Logger logger = LoggerFactory.getLogger(BootStrapper.class);
/* endpoint that needs to be bootstrapped */
@@ -55,7 +57,6 @@ public class BootStrapper
/* token of the node being bootstrapped. */
protected final Collection<Token> tokens;
protected final TokenMetadata tokenMetadata;
- private static final long BOOTSTRAP_TIMEOUT = 30000; // default bootstrap timeout of 30s
public BootStrapper(InetAddress address, Collection<Token> tokens, TokenMetadata tmd)
{
@@ -187,13 +188,12 @@ public class BootStrapper
{
MessageOut message = new MessageOut(MessagingService.Verb.BOOTSTRAP_TOKEN);
int retries = 5;
- long timeout = Math.max(DatabaseDescriptor.getRpcTimeout(), BOOTSTRAP_TIMEOUT);
while (retries > 0)
{
BootstrapTokenCallback btc = new BootstrapTokenCallback();
- MessagingService.instance().sendRR(message, maxEndpoint, btc, timeout);
- Token token = btc.getToken(timeout);
+ MessagingService.instance().sendRR(message, maxEndpoint, btc);
+ Token token = btc.getToken(BOOTSTRAP_TIMEOUT);
if (token != null)
return token;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index dd02ca6..c9b0047 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -550,7 +550,7 @@ public final class MessagingService implements MessagingServiceMBean
*/
public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb)
{
- return sendRR(message, to, cb, message.getTimeout());
+ return sendRR(message, to, cb, message.getTimeout(), null);
}
/**
@@ -567,9 +567,11 @@ public final class MessagingService implements MessagingServiceMBean
* @param timeout the timeout used for expiration
* @return an reference to message id used to match with the result
*/
- public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout)
+ public String sendRR(MessageOut message, InetAddress to, IMessageCallback cb, long timeout, ConsistencyLevel consistencyLevel)
{
- String id = addCallback(cb, message, to, timeout);
+ String id = consistencyLevel == null
+ ? addCallback(cb, message, to, timeout)
+ : addCallback(cb, message, to, timeout, consistencyLevel);
if (cb instanceof AbstractWriteResponseHandler)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b3622d/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index a81e5b4..9b559e5 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -642,7 +642,7 @@ public class StorageProxy implements StorageProxyMBean
{
// yes, the loop and non-loop code here are the same; this is clunky but we want to avoid
// creating a second iterator since we already have a perfectly good one
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
while (iter.hasNext())
{
target = iter.next();