Updated Branches: refs/heads/cassandra-1.2 27943b117 -> 7d45d2bde refs/heads/cassandra-2.0 18f0234bf -> 23becceb7 refs/heads/cassandra-2.0.0 19767fcd1 -> 88fea9fe7 refs/heads/trunk 9cf1068b7 -> 66182082c
fix HsHa to respect max frame size patch by Pavel Yaskevich; reviewed by Tyler Hobbs (CASSANDRA-4573) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19767fcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19767fcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19767fcd Branch: refs/heads/cassandra-2.0 Commit: 19767fcd173418002e82a10e1b08a2231bb29e99 Parents: af85f23 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Aug 6 15:20:48 2013 -0700 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Aug 6 15:20:48 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 4 ++-- lib/thrift-server-0.2.1.jar | Bin 123693 -> 0 bytes lib/thrift-server-0.3.0.jar | Bin 0 -> 123898 bytes .../cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 5 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/19767fcd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index af94bc8..86401d9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 2.0.0 * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) 2.0.0-rc1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/19767fcd/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a40405e..a72adf4 100644 --- a/build.xml +++ b/build.xml @@ -353,7 +353,7 @@ <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/> <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/> <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/> - <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.2.1"/> + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/> <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/> @@ -451,7 +451,7 @@ <dependency groupId="edu.stanford.ppl" artifactId="snaptree"/> <dependency groupId="org.mindrot" artifactId="jbcrypt"/> <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/> - <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.2.1"/> + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/> <dependency groupId="log4j" artifactId="log4j"/> <!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider at runtime --> http://git-wip-us.apache.org/repos/asf/cassandra/blob/19767fcd/lib/thrift-server-0.2.1.jar ---------------------------------------------------------------------- diff --git a/lib/thrift-server-0.2.1.jar b/lib/thrift-server-0.2.1.jar deleted file mode 100644 index 6b8de7d..0000000 Binary files a/lib/thrift-server-0.2.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/19767fcd/lib/thrift-server-0.3.0.jar ---------------------------------------------------------------------- diff --git a/lib/thrift-server-0.3.0.jar b/lib/thrift-server-0.3.0.jar new file mode 100644 index 0000000..3c93bb9 Binary files /dev/null and b/lib/thrift-server-0.3.0.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/19767fcd/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 57a7893..0df90ec 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -84,7 +84,8 @@ public class THsHaDisruptorServer extends TDisruptorServer .outputTransportFactory(args.outTransportFactory) .inputProtocolFactory(protocolFactory) .outputProtocolFactory(protocolFactory) - .processor(args.processor); + .processor(args.processor) + .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize()); return new THsHaDisruptorServer(serverArgs); }
