Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 77280 invoked from network); 27 Dec 2010 16:59:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Dec 2010 16:59:10 -0000 Received: (qmail 77887 invoked by uid 500); 27 Dec 2010 16:59:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 77732 invoked by uid 500); 27 Dec 2010 16:59:08 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 77721 invoked by uid 99); 27 Dec 2010 16:59:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 16:59:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 16:59:06 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id oBRGwkQt008091 for ; Mon, 27 Dec 2010 16:58:46 GMT Message-ID: <21788966.30481293469126129.JavaMail.jira@thor> Date: Mon, 27 Dec 2010 11:58:46 -0500 (EST) From: "Brandon Williams (JIRA)" To: commits@cassandra.apache.org Subject: [jira] Updated: (CASSANDRA-1896) Improve throughput by adding buffering to the inter-node TCP communication In-Reply-To: <19646767.286451293101521224.JavaMail.jira@thor> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CASSANDRA-1896?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-1896: ---------------------------------------- Affects Version/s: 0.6 Fix Version/s: 0.7.1 0.6.9 > Improve throughput by adding buffering to the inter-node TCP communication > -------------------------------------------------------------------------- > > Key: CASSANDRA-1896 > URL: https://issues.apache.org/jira/browse/CASSANDRA-1896 > Project: Cassandra > Issue Type: Improvement > Components: Core > Affects Versions: 0.6 > Reporter: Tsiki > Assignee: Brandon Williams > Fix For: 0.6.9, 0.7.1 > > Attachments: 1896.txt > > > The inbound and outbound TCP implementation under org.apache.cassandra.net does not buffer the socket streams. A simple change in IncomingTcpConnection and OutboundTcpConnection may give a rather big throughput increase. In my tests, I got up t o 30% more out of my cluster. Below is the diff of these two files with buffering included. The diff is over release 0.6.5 but can be quite simply applied also to 0.7. I suggest perhaps to limit the buffered input stream I added in IncomingTcpConnection to 4K. The Outbound implementation can surely be implemented a bit better (remove some of the code I duplicated there). > diff -r apache-cassandra-0.6.5-src/src/java/org/apache/cassandra/net/IncomingTcpConnection.java fix/apache-cassandra-0.6.5-src/src/java/org/apache/cassandra/net/IncomingTcpConnection.java > 44c44 > < input = new DataInputStream(new BufferedInputStream(socket.getInputStream())); > --- > > input = new DataInputStream(socket.getInputStream()); > diff -r apache-cassandra-0.6.5-src/src/java/org/apache/cassandra/net/OutboundTcpConnection.java fix/apache-cassandra-0.6.5-src/src/java/org/apache/cassandra/net/OutboundTcpConnection.java > 77d76 > < byte[] buf = new byte[4096]; > 80,112c79,89 > < int l = 0; > < ByteBuffer bb; > < while ((bb = queue.peek()) != null && l+bb.limit() < buf.length) { > < bb = take(); > < System.arraycopy(bb.array(), 0, buf, l, bb.limit()); > < l += bb.limit(); > < } > < if (l == 0) { > < bb = take(); > < if (bb == CLOSE_SENTINEL) > < { > < disconnect(); > < continue; > < } > < if (socket != null || connect()) > < writeConnected(bb); > < else > < // clear out the queue, else gossip messages back up. > < queue.clear(); > < } else { > < if (socket != null || connect()) { > < try { > < output.write(buf, 0, l); > < if (queue.peek() == null) > < output.flush(); > < } catch (IOException e) { > < logger.info("error writing to " + endpoint); > < disconnect(); > < } > < } else { > < queue.clear(); > < } > < } > --- > > ByteBuffer bb = take(); > > if (bb == CLOSE_SENTINEL) > > { > > disconnect(); > > continue; > > } > > if (socket != null || connect()) > > writeConnected(bb); > > else > > // clear out the queue, else gossip messages back up. > > queue.clear(); -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.