Updated Branches: refs/heads/trunk 626b0783c -> 47ac42fdb
Expire entries out of ThriftSessionManager (round two, for THsHaDisruptorServer on trunk) patch by jasobrown; reviewed by jbellis for CASSANDRA-5719 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47ac42fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47ac42fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47ac42fd Branch: refs/heads/trunk Commit: 47ac42fdbbd0e2944f44beeb52a8881af98cc341 Parents: 626b078 Author: Jason Brown <[email protected]> Authored: Wed Jul 3 09:56:28 2013 -0700 Committer: Jason Brown <[email protected]> Committed: Wed Jul 10 07:00:15 2013 -0700 ---------------------------------------------------------------------- build.xml | 2 +- lib/thrift-server-0.1.jar | Bin 122900 -> 0 bytes lib/thrift-server-0.2.jar | Bin 0 -> 123020 bytes .../cassandra/thrift/THsHaDisruptorServer.java | 7 +++++++ 4 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47ac42fd/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b6fb489..20d9b51 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.1"/> + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.2"/> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/> <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/47ac42fd/lib/thrift-server-0.1.jar ---------------------------------------------------------------------- diff --git a/lib/thrift-server-0.1.jar b/lib/thrift-server-0.1.jar deleted file mode 100644 index 2c595a0..0000000 Binary files a/lib/thrift-server-0.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/47ac42fd/lib/thrift-server-0.2.jar ---------------------------------------------------------------------- diff --git a/lib/thrift-server-0.2.jar b/lib/thrift-server-0.2.jar new file mode 100644 index 0000000..3fdedc6 Binary files /dev/null and b/lib/thrift-server-0.2.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/47ac42fd/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 a757315..c363743 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -22,6 +22,7 @@ import java.net.InetSocketAddress; import com.thinkaurelius.thrift.Message; import com.thinkaurelius.thrift.TDisruptorServer; +import org.apache.thrift.transport.TNonblockingTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +55,12 @@ public class THsHaDisruptorServer extends TDisruptorServer ThriftSessionManager.instance.setCurrentSocket(socket.getSocketChannel().socket().getRemoteSocketAddress()); } + public void beforeClose(Message buffer) + { + TNonblockingSocket socket = (TNonblockingSocket) buffer.transport; + ThriftSessionManager.instance.connectionComplete(socket.getSocketChannel().socket().getRemoteSocketAddress()); + } + public static class Factory implements TServerFactory { public TServer buildTServer(Args args)
