YARN-11003. Make RMNode aware of all (OContainer inclusive) allocated resources #3646
Conversation
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
… resources * Adds a new method in RMNode: getAllocatedContainerResource, which records how much resource is allocated to containers on a node * Adds up RUNNING and NEW container resources in HB loop to keep track of resources allocated for containers
goiri
reviewed
Nov 11, 2021
| newContainerStatusFromNode, runningContainerStatusFromNode)) | ||
| .when(statusEventFromNode1).getContainers(); | ||
| node.handle(statusEventFromNode1); | ||
| Assert.assertTrue(Resources.equals( |
There was a problem hiding this comment.
Resource has equals which actual is called by this, can't we just use assertEquals()?
| rmContext.getRMApps().put(app0, Mockito.mock(RMApp.class)); | ||
|
|
||
| RMNodeStatusEvent statusEventFromNode1 = getMockRMNodeStatusEvent(null); | ||
| ContainerStatus newContainerStatusFromNode = mock(ContainerStatus.class); |
There was a problem hiding this comment.
Can we create this mock in a static method to make the test easier to read?
...nager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java
Show resolved
Hide resolved
| .when(statusEventFromNode2).getContainers(); | ||
|
|
||
| node.handle(statusEventFromNode2); | ||
| Assert.assertTrue(Resources.equals( |
...nager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java
Show resolved
Hide resolved
|
@goiri thanks for the review! Have pushed a new commit to address your comments. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
goiri
approved these changes
Nov 15, 2021
|
|
||
| // Adding completed containers should not have changed | ||
| // the resources allocated | ||
| Assert.assertEquals(node.getAllocatedContainerResource(), |
There was a problem hiding this comment.
Usually we would put the expected first in the assertEquals
|
🎊 +1 overall
This message was automatically generated. |
| @@ -104,6 +105,14 @@ | |||
| */ | |||
| public Resource getTotalCapability(); | |||
|
|
|||
| /** | |||
| * the total allocated resources to containers. | |||
There was a problem hiding this comment.
Start with upper case in comments.. This will include the sum of O+G containers queued + running + paused on the node.. Comment cane be more explanatory..
bibinchundatt
requested changes
Nov 16, 2021
...cemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
Show resolved
Hide resolved
...nager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java
Show resolved
Hide resolved
|
@bibinchundatt thanks for the review! Updated the PR to address your comments. |
|
🎊 +1 overall
This message was automatically generated. |
bibinchundatt
approved these changes
Nov 23, 2021
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
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.
Description of PR
records how much resource is allocated to containers on a node
of resources allocated for containers
How was this patch tested?