Updated Branches: refs/heads/cassandra-1.2 8d9510ae4 -> 6487bc50b refs/heads/trunk 8201299dc -> 69540e025
make inter_dc_tcp_nodelay default to false for 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69540e02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69540e02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69540e02 Branch: refs/heads/trunk Commit: 69540e0253d5a849a50752bdd69311145a100c0b Parents: 9e07a28 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jan 11 16:13:00 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jan 11 16:13:00 2013 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- src/java/org/apache/cassandra/config/Config.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69540e02/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 493f101..91e0ec3 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -647,4 +647,4 @@ internode_compression: all # Disabling it will result in larger (but fewer) network packets being sent, # reducing overhead from the TCP protocol itself, at the cost of increasing # latency if you block for cross-datacenter responses. -inter_dc_tcp_nodelay: true +inter_dc_tcp_nodelay: false http://git-wip-us.apache.org/repos/asf/cassandra/blob/69540e02/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index af47e84..fe91257 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -164,7 +164,7 @@ public class Config public String memory_allocator = NativeAllocator.class.getSimpleName(); public boolean populate_io_cache_on_flush = false; - public boolean inter_dc_tcp_nodelay = true; + public boolean inter_dc_tcp_nodelay = false; private static boolean loadYaml = true; private static boolean outboundBindAny = false;
