Change in asterixdb-bad[master]: Prevent case where drop channel hangs indefinitely

[Steven Jacobs (Code Review)]

Steven Jacobs has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2203

Change subject: Prevent case where drop channel hangs indefinitely
......................................................................

Prevent case where drop channel hangs indefinitely

Change-Id: I7ed8efea454c19b2d0b86f01b196bb361d35450f
---
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
M 
asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/03/2203/1

diff --git 
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
 
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
index 2b189be..21de269 100644
--- 
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
+++ 
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ChannelDropStatement.java
@@ -122,7 +122,11 @@
 
             } else {
                 listener.getExecutorService().shutdown();
-                listener.getExecutorService().awaitTermination(Long.MAX_VALUE, 
TimeUnit.SECONDS);
+                if (!listener.getExecutorService().awaitTermination(10, 
TimeUnit.SECONDS)) {
+                    LOGGER.log(Level.SEVERE,
+                            "Executor Service is terminating non-gracefully 
for: " + entityId.getExtensionName() + " "
+                                    + entityId.getDataverse() + "." + 
entityId.getEntityName());
+                }
                 DeployedJobSpecId deployedJobSpecId = 
listener.getDeployedJobSpecId();
                 listener.deActivate();
                 activeEventHandler.unregisterListener(listener);
diff --git 
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java
 
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java
index 18e769d..3b3c0a8 100644
--- 
a/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java
+++ 
b/asterix-bad/src/main/java/org/apache/asterix/bad/lang/statement/ProcedureDropStatement.java
@@ -120,7 +120,11 @@
             } else {
                 if (listener.getExecutorService() != null) {
                     listener.getExecutorService().shutdown();
-                    
listener.getExecutorService().awaitTermination(Long.MAX_VALUE, 
TimeUnit.SECONDS);
+                    if (!listener.getExecutorService().awaitTermination(10, 
TimeUnit.SECONDS)) {
+                        LOGGER.log(Level.SEVERE,
+                                "Executor Service is terminating 
non-gracefully for: " + entityId.getExtensionName()
+                                        + " " + entityId.getDataverse() + "." 
+ entityId.getEntityName());
+                    }
                 }
                 DeployedJobSpecId deployedJobSpecId = 
listener.getDeployedJobSpecId();
                 listener.deActivate();

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2203
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed8efea454c19b2d0b86f01b196bb361d35450f
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Steven Jacobs <sjaco...@ucr.edu>