Author: jbellis
Date: Wed Dec 29 18:24:07 2010
New Revision: 1053695
URL: http://svn.apache.org/viewvc?rev=1053695&view=rev
Log:
merge r1053219, r1053220 from 0.7
Modified:
cassandra/branches/cassandra-0.7.0/ (props changed)
cassandra/branches/cassandra-0.7.0/CHANGES.txt
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Propchange: cassandra/branches/cassandra-0.7.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6:922689-1053218
+/cassandra/branches/cassandra-0.7:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3:774578-796573
/incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
Modified: cassandra/branches/cassandra-0.7.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/CHANGES.txt?rev=1053695&r1=1053694&r2=1053695&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7.0/CHANGES.txt Wed Dec 29 18:24:07 2010
@@ -3,6 +3,7 @@ dev
* count timeouts in storageproxy latencies, and include latency
histograms in StorageProxyMBean (CASSANDRA-1893)
* fix CLI get recognition of supercolumns (CASSANDRA-1899)
+ * enable keepalive on intra-cluster sockets (CASSANDRA-1766)
0.7.0-rc3
Propchange:
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1053218
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
Propchange:
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1053218
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
Propchange:
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1053218
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
Propchange:
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1053218
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
Propchange:
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:24:07 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1051640,1051662,1052357
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1052002,1052021,1052027,1052355,1052358,1052545
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1053218
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1052002,1052021,1052027,1052355,1052358,1052545,1053219-1053220
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java?rev=1053695&r1=1053694&r2=1053695&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
Wed Dec 29 18:24:07 2010
@@ -39,17 +39,17 @@ import org.apache.cassandra.utils.FBUtil
*/
public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements
ILatencySubscriber, DynamicEndpointSnitchMBean
{
- private static int UPDATES_PER_INTERVAL = 10000;
- private static int UPDATE_INTERVAL_IN_MS =
DatabaseDescriptor.getDynamicUpdateInterval();
- private static int RESET_INTERVAL_IN_MS =
DatabaseDescriptor.getDynamicResetInterval();
- private static double BADNESS_THRESHOLD =
DatabaseDescriptor.getDynamicBadnessThreshold();
- private static int WINDOW_SIZE = 100;
+ private static final int UPDATES_PER_INTERVAL = 10000;
+ private static final int UPDATE_INTERVAL_IN_MS =
DatabaseDescriptor.getDynamicUpdateInterval();
+ private static final int RESET_INTERVAL_IN_MS =
DatabaseDescriptor.getDynamicResetInterval();
+ private static final double BADNESS_THRESHOLD =
DatabaseDescriptor.getDynamicBadnessThreshold();
+ private static final int WINDOW_SIZE = 100;
private boolean registered = false;
- private ConcurrentHashMap<InetAddress, Double> scores = new
ConcurrentHashMap();
- private ConcurrentHashMap<InetAddress, AdaptiveLatencyTracker> windows =
new ConcurrentHashMap();
- private AtomicInteger intervalupdates = new AtomicInteger(0);
- public IEndpointSnitch subsnitch;
+ private final ConcurrentHashMap<InetAddress, Double> scores = new
ConcurrentHashMap<InetAddress, Double>();
+ private final ConcurrentHashMap<InetAddress, AdaptiveLatencyTracker>
windows = new ConcurrentHashMap<InetAddress, AdaptiveLatencyTracker>();
+ private final AtomicInteger intervalupdates = new AtomicInteger(0);
+ public final IEndpointSnitch subsnitch;
public DynamicEndpointSnitch(IEndpointSnitch snitch)
{
@@ -213,8 +213,8 @@ public class DynamicEndpointSnitch exten
/** a threadsafe version of BoundedStatsDeque+ArrivalWindow with modification
for arbitrary times **/
class AdaptiveLatencyTracker extends AbstractStatsDeque
{
- private LinkedBlockingDeque<Double> latencies;
- private static double SENTINEL_COMPARE = 0.0001; // arbitrary; as long as
it is the same across hosts it doesn't matter
+ private final LinkedBlockingDeque<Double> latencies;
+ private static final double SENTINEL_COMPARE = 0.0001; // arbitrary; as
long as it is the same across hosts it doesn't matter
AdaptiveLatencyTracker(int size)
{
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java?rev=1053695&r1=1053694&r2=1053695&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/MessagingService.java
Wed Dec 29 18:24:07 2010
@@ -391,29 +391,29 @@ public class MessagingService implements
stage.execute(runnable);
}
- public static IAsyncCallback getRegisteredCallback(String key)
+ public static IAsyncCallback getRegisteredCallback(String messageId)
{
- return callbackMap_.get(key);
+ return callbackMap_.get(messageId);
}
- public static void removeRegisteredCallback(String key)
+ public static void removeRegisteredCallback(String messageId)
{
- callbackMap_.remove(key);
+ callbackMap_.remove(messageId);
}
- public static IAsyncResult getAsyncResult(String key)
+ public static IAsyncResult getAsyncResult(String messageId)
{
- return taskCompletionMap_.remove(key);
+ return taskCompletionMap_.remove(messageId);
}
- public static long getRegisteredCallbackAge(String key)
+ public static long getRegisteredCallbackAge(String messageId)
{
- return callbackMap_.getAge(key);
+ return callbackMap_.getAge(messageId);
}
- public static long getAsyncResultAge(String key)
+ public static long getAsyncResultAge(String messageId)
{
- return taskCompletionMap_.getAge(key);
+ return taskCompletionMap_.getAge(messageId);
}
public static void validateMagic(int magic) throws IOException
Modified:
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=1053695&r1=1053694&r2=1053695&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
(original)
+++
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Wed Dec 29 18:24:07 2010
@@ -162,6 +162,7 @@ public class OutboundTcpConnection exten
{
// zero means 'bind on any available port.'
socket = new Socket(endpoint,
DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
+ socket.setKeepAlive(true);
socket.setTcpNoDelay(true);
output = new DataOutputStream(socket.getOutputStream());
return true;
