Author: frm
Date: Wed Oct 5 09:15:43 2016
New Revision: 1763368
URL: http://svn.apache.org/viewvc?rev=1763368&view=rev
Log:
OAK-4884 - Adjust timeouts when shutting down the server and the client
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java?rev=1763368&r1=1763367&r2=1763368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClient.java
Wed Oct 5 09:15:43 2016
@@ -147,7 +147,7 @@ class StandbyClient implements AutoClose
channel = null;
- if (group.shutdownGracefully().awaitUninterruptibly(1,
TimeUnit.SECONDS)) {
+ if (group.shutdownGracefully(2, 15,
TimeUnit.SECONDS).awaitUninterruptibly(20, TimeUnit.SECONDS)) {
log.debug("Group shut down");
} else {
log.debug("Group shutdown timed out");
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java?rev=1763368&r1=1763367&r2=1763368&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
Wed Oct 5 09:15:43 2016
@@ -209,7 +209,7 @@ class StandbyServer implements AutoClose
}
private boolean shutDown(EventLoopGroup group) {
- return group.shutdownGracefully(0, 1,
TimeUnit.SECONDS).awaitUninterruptibly(1, TimeUnit.SECONDS);
+ return group.shutdownGracefully(0, 5,
TimeUnit.SECONDS).awaitUninterruptibly(10, TimeUnit.SECONDS);
}
private void onTimelyConnect() {
