add 'stopped' check and handling to HttpLoadQueuePeon load and drop segment methods #5555
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gianm
reviewed
Apr 2, 2018
| @@ -261,6 +260,7 @@ public void onSuccess(InputStream result) | |||
| public void onFailure(Throwable t) | |||
| { | |||
| try { | |||
| responseHandler.description = t.getMessage(); | |||
There was a problem hiding this comment.
t.toString() is more informative than t.getMessage(), since typically it includes the type of the exception but getMessage does not.
| @@ -398,6 +403,15 @@ public void loadSegment(DataSegment segment, LoadPeonCallback callback) | |||
| public void dropSegment(DataSegment segment, LoadPeonCallback callback) | |||
| { | |||
| synchronized (lock) { | |||
| if (stopped) { | |||
| log.warn( | |||
| "Server[%s] failed to drop segment[%s] because load queue peon is stopped.", | |||
There was a problem hiding this comment.
Instead of "failed to drop", "cannot drop" is a better log message.
| @@ -382,6 +377,16 @@ public void stop() | |||
| public void loadSegment(DataSegment segment, LoadPeonCallback callback) | |||
| { | |||
| synchronized (lock) { | |||
| if (stopped) { | |||
| log.warn( | |||
| "Server[%s] failed to load segment[%s] because load queue peon is stopped.", | |||
There was a problem hiding this comment.
Instead of "failed to load", "cannot load" is a better log message.
gianm
reviewed
Apr 2, 2018
| @@ -405,7 +405,7 @@ public void dropSegment(DataSegment segment, LoadPeonCallback callback) | |||
| synchronized (lock) { | |||
| if (stopped) { | |||
| log.warn( | |||
| "Server[%s] failed to drop segment[%s] because load queue peon is stopped.", | |||
| "Server[%s] cannot to drop segment[%s] because load queue peon is stopped.", | |||
There was a problem hiding this comment.
“cannot to” should be “cannot”
jon-wei
pushed a commit
to implydata/druid-public
that referenced
this pull request
Apr 4, 2018
…egment methods (apache#5555) * add stopped check and handling to HttpLoadQueuePeon load and drop segment methods * fix unrelated timeout :( * revert unintended change * PR feedback: change logging * fix dumb
jihoonson
pushed a commit
to jihoonson/druid
that referenced
this pull request
Jul 6, 2018
…egment methods (apache#5555) * add stopped check and handling to HttpLoadQueuePeon load and drop segment methods * fix unrelated timeout :( * revert unintended change * PR feedback: change logging * fix dumb
leventov
pushed a commit
to metamx/druid
that referenced
this pull request
Jul 20, 2018
…egment methods (apache#5555) (apache#5960) * add stopped check and handling to HttpLoadQueuePeon load and drop segment methods * fix unrelated timeout :( * revert unintended change * PR feedback: change logging * fix dumb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5542 by checking if
HttpLoadQueuePeonis stopped before loading or dropping a segment, and adds a test to ensure callbacks execute.