YARN-11645. Order the queues by queuePath in json assert tests. #6432
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
Change-Id: Iff7c8d0522003f9ae9d5c01a1070158e45903d3c
tomicooler
force-pushed
the
YARN-11645
branch
from
0ebe0e2 to
78565a1
Compare
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
Change-Id: Ia848a19b0d2cb9659b34caa3654888c0fa18a374
Change-Id: I64470d2e28060204e5356432f461041fe732e540
a capacity-scheduler.xml, depending on the test order test cases were failing due to this Change-Id: I2ef59b12b5a1d02efb905eea1e95dd4ea9942400
K0K0V0K
reviewed
Jan 11, 2024
...r/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java
Outdated
Show resolved
Hide resolved
Contributor
|
Thanks @tomicooler for the change! I have just one small question |
|
💔 -1 overall
This message was automatically generated. |
brumi1024
reviewed
Jan 11, 2024
Member
brumi1024
left a comment
brumi1024
left a comment
There was a problem hiding this comment.
Thanks @tomicooler for the patch. Commented.
| IOException { | ||
| assertJsonType(response); | ||
| JSONObject json = response.getEntity(JSONObject.class); | ||
| sortQueuesLexically(json); |
Member
There was a problem hiding this comment.
I was meant to ask this before: is there a reason we're using two separate Json libraries to do (in the end) a string comparison? Couldn't we move completely to Jackson?
Contributor
Author
There was a problem hiding this comment.
Moved to jackson. There was a change in the test data, because jettison converted the floats (e.g. capacity=100.0) to an int (capacity=100).
Change-Id: Icd2e08eb93f9b8a75fb81bc7ebf282974fc52ca8
Change-Id: I7876fb2f11c5ab1b4fd6083542d5a6faa399a936
Change-Id: I23290e1cddec49b8016b0525d3ea0f4ed127c871
Change-Id: I2998e4028fc34e9adbe2112d8a1e4ccd792e3b41
|
💔 -1 overall
This message was automatically generated. |
Change-Id: I422e8ffeed4253f72d85069a7e79544c43a2447e
Change-Id: I30fbe959b1a5e0fd9b5cc8ee8b9b62b9bfdb8e1d
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
Change-Id: I972ad9ae54256849965aa99187d88fe336696b65
brumi1024
approved these changes
Jan 15, 2024
Member
brumi1024
left a comment
brumi1024
left a comment
There was a problem hiding this comment.
Thanks @tomicooler, the latest state LGTM.
|
🎊 +1 overall
This message was automatically generated. |
Member
|
Thanks @tomicooler for the patch, @K0K0V0K , @dineshchitlangia for the review, merging to trunk. |
jiajunmao
pushed a commit
to jiajunmao/hadoop-MLEC
that referenced
this pull request
Feb 6, 2024
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 1, 2025
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 2, 2025
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 5, 2025
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 5, 2025
steveloughran
pushed a commit
to steveloughran/hadoop
that referenced
this pull request
Aug 5, 2025
… tests. (apache#6432) Change-Id: Iea7eaa34b1f24f863c701eb6c31304ed8dc7bce8 (cherry picked from commit 965b8975e87934385e8f3ddc8436adbfbca9aad2) (cherry picked from commit 97a56d70008fc5683cae202bb90069b7e52029cc)
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 6, 2025
susheelgupta7
pushed a commit
to susheelgupta7/hadoop
that referenced
this pull request
Aug 11, 2025
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.
Change-Id: Iff7c8d0522003f9ae9d5c01a1070158e45903d3c
Description of PR
The JSON assert tests that were using the
createMutableRMwere flaky the queue order changed in the "queue": [ {}, {} ] lists. We had a workaround likereinitAfterNodeChane(with a typo) but it didn't work well.Since there is a comment in the production code in
CapacitySchedulerInfo.getQueuesabout a marshalling issue,I didn't introduce sorting there, just here for the tests.
git grep -rn '"queuePath" :'How was this patch tested?
Ran the unit tests locally. YETUS will verify it.
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?