MAPREDUCE-7407. Avoid stopContainer() on dead node#4779
Merged
goiri merged 5 commits intoapache:trunkfrom Sep 15, 2022
Merged
Conversation
|
🎊 +1 overall
This message was automatically generated. |
slfan1989
approved these changes
Aug 21, 2022
Samrat002
approved these changes
Aug 22, 2022
goiri
reviewed
Sep 14, 2022
| // it is not necessary and could cost 15 minutes delay if the node is dead. | ||
| if (event.getType() == EventType.CONTAINER_REMOTE_CLEANUP && | ||
| !containers.containsKey(containerID)) { | ||
| LOG.info("Skip cleanup of already-removed container " + containerID); |
Member
There was a problem hiding this comment.
As we are at it, fix this in line 382 too.
Contributor
Author
There was a problem hiding this comment.
Ack, Will make this change.
| // CONTAINER_REMOTE_LAUNCH event handling. | ||
| // Skip kill() such container during CONTAINER_REMOTE_CLEANUP as | ||
| // it is not necessary and could cost 15 minutes delay if the node is dead. | ||
| if (event.getType() == EventType.CONTAINER_REMOTE_CLEANUP && |
Member
There was a problem hiding this comment.
This should be done in the switch case CONTAINER_REMOTE_CLEANUP
Contributor
Author
There was a problem hiding this comment.
I am doing it outside the switch case because in this case I dont want it to go to getContainer code which is before the switch case check and getContainer will end up giving the a new container and which will evenually fail this check - !containers.containsKey(containerID)
Container c = getContainer(event);
private Container getContainer(ContainerLauncherEvent event) {
ContainerId id = event.getContainerID();
Container c = containers.get(id);
if(c == null) {
System.out.println("entering null");
c = new Container(event.getTaskAttemptID(), event.getContainerID(),
event.getContainerMgrAddress());
Container old = containers.putIfAbsent(id, c);
if(old != null) {
c = old;
}
}
return c;
}
Contributor
Author
There was a problem hiding this comment.
I have made small changes to handle the above case and addressing your comment by moving it inside switch case CONTAINER_REMOTE_CLEANUP
|
🎊 +1 overall
This message was automatically generated. |
goiri
approved these changes
Sep 14, 2022
| @Override | ||
| public void run() { | ||
| LOG.info("Processing the event " + event.toString()); | ||
| LOG.info("Processing the event {}", event.toString()); |
Member
There was a problem hiding this comment.
You don't need the toString() as logger does it for you.
Contributor
Author
There was a problem hiding this comment.
Thanks. Made the change.
goiri
reviewed
Sep 15, 2022
| verify(mockCM).startContainers(any(StartContainersRequest.class)); | ||
|
|
||
| LOG.info("inserting cleanup event"); | ||
| ContainerLauncherEvent mockCleanupEvent2 = |
Member
There was a problem hiding this comment.
Another nit, now the line char limit is 100 characters; we can make these lines into one.
Contributor
Author
There was a problem hiding this comment.
Makes sense, addressed.
added 2 commits
September 15, 2022 02:20
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
goiri
approved these changes
Sep 15, 2022
Contributor
Author
|
Thanks @goiri for final review and merging. |
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Description of PR
If a container failed to launch earlier due to terminated instances, it has already been removed from the container hash map. Avoiding the kill() for CONTAINER_REMOTE_CLEANUP will avoid wasting 15min per container on retries/timeout.
JIRA - MAPREDUCE-7407
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?