natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 0.6 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1055313 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2011-01-05 06:52:54 +00:00
parent d718dddd6e
commit d650fb6af2
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.rat-excludes
View File

@ -20,3 +20,4 @@ redhat/cassandra
redhat/cassandra.conf
redhat/cassandra.in.sh
redhat/default
.externalToolBuilders/**

2
CHANGES.txt
View File

@ -1,4 +1,6 @@
dev
* buffer network stack to avoid inefficient small TCP messages while avoiding
the nagle/delayed ack problem (CASSANDRA-1896)
* check log4j configuration for changes every 10s (CASSANDRA-1525, 1907)
* More-efficient cross-DC replication (CASSANDRA-1530)
* upgrade to TFastFramedTransport (CASSANDRA-1743)

2
src/java/org/apache/cassandra/net/IncomingTcpConnection.java
View File

@ -43,7 +43,7 @@ public class IncomingTcpConnection extends Thread
this.socket = socket;
try
{
input = new DataInputStream(socket.getInputStream());
input = new DataInputStream(new BufferedInputStream(socket.getInputStream(), 4096));
}
catch (IOException e)
{

3
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
View File

@ -21,6 +21,7 @@ package org.apache.cassandra.net;
*/
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.InetAddress;
@ -164,7 +165,7 @@ public class OutboundTcpConnection extends Thread
socket = new Socket(endpoint, DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
socket.setKeepAlive(true);
socket.setTcpNoDelay(true);
output = new DataOutputStream(socket.getOutputStream());
output = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream(), 4096));
return true;
}
catch (IOException e)