Skip to content

#1412 Wait for async close tasks before close completes #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

#1412 Wait for async close tasks before close completes #1435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0af1eb
1412 Wait for async close tasks before close completes
MiErnst Jul 5, 2017
88ce96d
1412 reused timeouts for waits and covered corner cases for await, re…
MiErnst Jul 5, 2017
85f30e2
Merge branch 'master' into ahc-1412
MiErnst Jul 5, 2017
3bb5ae4
1412 fixed compile error after merge
MiErnst Jul 6, 2017
7026fc2
ahc-1412 added a new close method to wait on shared netty resources
MiErnst Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1412 reused timeouts for waits and covered corner cases for await, re… 
…named state property
  • Loading branch information
@MiErnst
MiErnst committed Jul 5, 2017
commit 88ce96d97073f856c56c83dbdde3545ef75a7dcb
10 changes: 5 additions & 5 deletions client/src/main/java/org/asynchttpclient/AsyncHttpClientState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

public class AsyncHttpClientState {

private final AtomicBoolean closed;
private final AtomicBoolean closeTriggered;

public AsyncHttpClientState(AtomicBoolean closed) {
this.closed = closed;
public AsyncHttpClientState(AtomicBoolean closeTriggered) {
this.closeTriggered = closeTriggered;
}

public boolean isClosedOrClosingIsTriggered() {
return closed.get();
public boolean isCloseTriggered() {
Copy link
Contributor

@johnou johnou Jul 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's wrong with the old name?

return closeTriggered.get();
}
}
2 changes: 1 addition & 1 deletion client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void close() {

//see https://github.com/netty/netty/issues/2084#issuecomment-44822314
try {
ThreadDeathWatcher.awaitInactivity(5, TimeUnit.SECONDS);
ThreadDeathWatcher.awaitInactivity(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
} catch(InterruptedException t) {
// Ignore
Copy link
Contributor

@johnou johnou Jul 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-assert interrupted status

}
Expand Down
8 changes: 4 additions & 4 deletions client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,12 @@ private void doClose() {

//see https://github.com/netty/netty/issues/2084#issuecomment-44822314
try {
GlobalEventExecutor.INSTANCE.awaitInactivity(5, TimeUnit.SECONDS);
GlobalEventExecutor.INSTANCE.awaitInactivity(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
} catch(InterruptedException t) {
// Ignore
Copy link
Contributor

@johnou johnou Jul 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-assert interrupted status

} finally {
closeLatch.countDown();
}

closeLatch.countDown();
}

public void close() {
Expand All @@ -326,7 +326,7 @@ public void close() {
doClose();

try {
closeLatch.await();
closeLatch.await(config.getShutdownTimeout(), TimeUnit.MILLISECONDS);
}
catch (InterruptedException e) {
// Ignore
Copy link
Contributor

@johnou johnou Jul 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-assert interrupted status

Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/org/asynchttpclient/netty/request/NettyChannelConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void connect(final Bootstrap bootstrap, final NettyConnectListener<?> con
try {
connect0(bootstrap, connectListener, remoteAddress);
} catch (RejectedExecutionException e) {
if (clientState.isClosedOrClosingIsTriggered()) {
if (clientState.isCloseTriggered()) {
LOGGER.info("Connect crash but engine is shutting down");
} else {
connectListener.onFailure(null, e);
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ public void replayRequest(final NettyResponseFuture<?> future, FilterContext fc,
}

public boolean isClosed() {
Copy link
Contributor

@slandelle slandelle Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename method too.

Copy link
Author

@MiErnst MiErnst Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done and attached another commit to the pull request!

return clientState.isClosedOrClosingIsTriggered();
return clientState.isCloseTriggered();
}

public void drainChannelAndExecuteNextRequest(final Channel channel, final NettyResponseFuture<?> future, Request nextRequest) {
Expand Down