cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject cassandra git commit: Fix possible race condition in NativeTransportService.testConcurrentDestroys
Date Mon, 25 Apr 2016 08:01:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 7afc1571b -> f07a406e5


Fix possible race condition in NativeTransportService.testConcurrentDestroys

patch by ifesdjeen; reviewed by jkni for CASSANDRA-10756


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f07a406e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07a406e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f07a406e

Branch: refs/heads/trunk
Commit: f07a406e5707966d3afcc2347b186743fc3c6f9f
Parents: 7afc157
Author: Alex Petrov <oleksandr.petrov@gmail.com>
Authored: Fri Apr 15 14:41:53 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Apr 25 10:00:20 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                              |  1 +
 .../apache/cassandra/service/NativeTransportService.java | 11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07a406e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0c86ff7..7110b84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * Fix potential timeout in NativeTransportService.testConcurrentDestroys (CASSANDRA-10756)
  * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
  * JSON datetime formatting needs timezone (CASSANDRA-11137)
  * Add support to rebuild from specific range (CASSANDRA-10409)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07a406e/src/java/org/apache/cassandra/service/NativeTransportService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/NativeTransportService.java b/src/java/org/apache/cassandra/service/NativeTransportService.java
index eff3a89..48839f1 100644
--- a/src/java/org/apache/cassandra/service/NativeTransportService.java
+++ b/src/java/org/apache/cassandra/service/NativeTransportService.java
@@ -145,16 +145,7 @@ public class NativeTransportService
         servers = Collections.emptyList();
 
         // shutdown executors used by netty for native transport server
-        Future<?> wgStop = workerGroup.shutdownGracefully(0, 0, TimeUnit.SECONDS);
-
-        try
-        {
-            wgStop.await(5000);
-        }
-        catch (InterruptedException e1)
-        {
-            Thread.currentThread().interrupt();
-        }
+        workerGroup.shutdownGracefully(3, 5, TimeUnit.SECONDS).awaitUninterruptibly();
 
         // shutdownGracefully not implemented yet in RequestThreadPoolExecutor
         eventExecutorGroup.shutdown();


Mime
View raw message