Repository: cassandra Updated Branches: refs/heads/trunk 8c1e4e089 -> 32f056708
Fix HSHA server introducing corrupt data patch by xedin; reviewed by slebresne for CASSANDRA-6285 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edd6636e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd6636e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edd6636e Branch: refs/heads/trunk Commit: edd6636e054b0a60ba88da6262b8d439feaa6bcc Parents: c2ec94b Author: Sylvain Lebresne <[email protected]> Authored: Fri Mar 7 11:06:40 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Mar 7 11:06:40 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd6636e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6ef9025..42c78af 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -35,6 +35,7 @@ (CASSANDRA-6733) * FBUtilities.singleton() should use the CF comparator (CASSANDRA-6778) * Fix CQLSStableWriter.addRow(Map<String, Object>) (CASSANDRA-6526) + * Fix HSHA server introducing corrupt data (CASSANDRA-6285) Merged from 1.2: * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541) * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd6636e/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index 0df90ec..fb7ef35 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -80,7 +80,8 @@ public class THsHaDisruptorServer extends TDisruptorServer com.thinkaurelius.thrift.util.TBinaryProtocol.Factory protocolFactory = new com.thinkaurelius.thrift.util.TBinaryProtocol.Factory(true, true); - TDisruptorServer.Args serverArgs = new TDisruptorServer.Args(serverTransport).inputTransportFactory(args.inTransportFactory) + TDisruptorServer.Args serverArgs = new TDisruptorServer.Args(serverTransport).useHeapBasedAllocation(true) + .inputTransportFactory(args.inTransportFactory) .outputTransportFactory(args.outTransportFactory) .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory)
