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/11/03 21:43:03 UTC
[1/3] git commit: Set socket timeout when reading remote version
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ad84e4d7e -> 399a4ecf9
refs/heads/trunk 49768fea0 -> 57b5fb64c
Set socket timeout when reading remote version
Patch by wy96f, reviewed by Brandon Williams for CASSANDRA-8188
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/399a4ecf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/399a4ecf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/399a4ecf
Branch: refs/heads/cassandra-2.1
Commit: 399a4ecf9e0974488bc5a60fcff90c7f84e5b044
Parents: ad84e4d
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 14:42:03 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 14:42:03 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/MessagingService.java | 2 ++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b9b92fb..50a540f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.2
+ * Set socket timeout when reading remote version (CASSANDRA-8188)
* Refactor how we track live size (CASSANDRA-7852)
* Make sure unfinished compaction files are removed (CASSANDRA-8124)
* Fix shutdown when run as Windows service (CASSANDRA-8136)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/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 c6b0098..05b449c 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -918,6 +918,7 @@ public final class MessagingService implements MessagingServiceMBean
}
socket.setKeepAlive(true);
+ socket.setSoTimeout(2 * OutboundTcpConnection.WAIT_FOR_VERSION_MAX_TIME);
// determine the connection type to decide whether to buffer
DataInputStream in = new DataInputStream(socket.getInputStream());
MessagingService.validateMagic(in.readInt());
@@ -925,6 +926,7 @@ public final class MessagingService implements MessagingServiceMBean
boolean isStream = MessagingService.getBits(header, 3, 1) == 1;
int version = MessagingService.getBits(header, 15, 8);
logger.debug("Connection version {} from {}", version, socket.getInetAddress());
+ socket.setSoTimeout(0);
Thread thread = isStream
? new IncomingStreamingConnection(version, socket)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/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 996e606..a0ad011 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -65,7 +65,7 @@ public class OutboundTcpConnection extends Thread
private volatile boolean isStopped = false;
private static final int OPEN_RETRY_DELAY = 100; // ms between retries
- private static final int WAIT_FOR_VERSION_MAX_TIME = 5000;
+ public static final int WAIT_FOR_VERSION_MAX_TIME = 5000;
private static final int NO_VERSION = Integer.MIN_VALUE;
static final int LZ4_HASH_SEED = 0x9747b28c;
[3/3] 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/57b5fb64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57b5fb64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57b5fb64
Branch: refs/heads/trunk
Commit: 57b5fb64cb624d23a8026dda13e275ff59e50699
Parents: 49768fe 399a4ec
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 14:42:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 14:42:56 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/MessagingService.java | 2 ++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57b5fb64/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c87fa8d,50a540f..6f42f8c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
+3.0
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.2
+ * Set socket timeout when reading remote version (CASSANDRA-8188)
* Refactor how we track live size (CASSANDRA-7852)
* Make sure unfinished compaction files are removed (CASSANDRA-8124)
* Fix shutdown when run as Windows service (CASSANDRA-8136)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57b5fb64/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
[2/3] git commit: Set socket timeout when reading remote version
Posted by br...@apache.org.
Set socket timeout when reading remote version
Patch by wy96f, reviewed by Brandon Williams for CASSANDRA-8188
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/399a4ecf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/399a4ecf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/399a4ecf
Branch: refs/heads/trunk
Commit: 399a4ecf9e0974488bc5a60fcff90c7f84e5b044
Parents: ad84e4d
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 14:42:03 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 14:42:03 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/MessagingService.java | 2 ++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b9b92fb..50a540f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.2
+ * Set socket timeout when reading remote version (CASSANDRA-8188)
* Refactor how we track live size (CASSANDRA-7852)
* Make sure unfinished compaction files are removed (CASSANDRA-8124)
* Fix shutdown when run as Windows service (CASSANDRA-8136)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/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 c6b0098..05b449c 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -918,6 +918,7 @@ public final class MessagingService implements MessagingServiceMBean
}
socket.setKeepAlive(true);
+ socket.setSoTimeout(2 * OutboundTcpConnection.WAIT_FOR_VERSION_MAX_TIME);
// determine the connection type to decide whether to buffer
DataInputStream in = new DataInputStream(socket.getInputStream());
MessagingService.validateMagic(in.readInt());
@@ -925,6 +926,7 @@ public final class MessagingService implements MessagingServiceMBean
boolean isStream = MessagingService.getBits(header, 3, 1) == 1;
int version = MessagingService.getBits(header, 15, 8);
logger.debug("Connection version {} from {}", version, socket.getInetAddress());
+ socket.setSoTimeout(0);
Thread thread = isStream
? new IncomingStreamingConnection(version, socket)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/399a4ecf/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 996e606..a0ad011 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -65,7 +65,7 @@ public class OutboundTcpConnection extends Thread
private volatile boolean isStopped = false;
private static final int OPEN_RETRY_DELAY = 100; // ms between retries
- private static final int WAIT_FOR_VERSION_MAX_TIME = 5000;
+ public static final int WAIT_FOR_VERSION_MAX_TIME = 5000;
private static final int NO_VERSION = Integer.MIN_VALUE;
static final int LZ4_HASH_SEED = 0x9747b28c;