aajisaka opened a new pull request, #4159:
URL: https://github.com/apache/hadoop/pull/4159
(cherry picked from commit 890f2da624465473a5f401a3bcfc4bbd068289a1)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSWithMultipleNodeManager.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
<!--
Thanks for sending a pull request!
1. If this is your first time, please read our contributor guidelines:
https://cwiki.apache.org/confluence/display/HADOOP/How+To+Contribute
2. Make sure your PR title starts with JIRA issue id, e.g.,
'HADOOP-17799. Your PR title ...'.
-->
### Description of PR
Backport YARN-10553 to branch-3.3. Fixed conflicts in
TestDSWithMultipleNodeManager because YARN-10360 is only in trunk.
### How was this patch tested?
Manually ran the related tests but TestDSTimelineV20 failed. I'll
investigate why the test is failing:
```
[ERROR] Tests run: 6, Failures: 3, Errors: 0, Skipped: 0, Time elapsed:
422.012 s <<< FAILURE! - in
org.apache.hadoop.yarn.applications.distributedshell.TestDSTimelineV20
[ERROR]
testDSShellWithoutDomain(org.apache.hadoop.yarn.applications.distributedshell.TestDSTimelineV20)
Time elapsed: 73.413 s <<< FAILURE!
java.lang.AssertionError
at org.junit.Assert.fail(Assert.java:87)
at org.junit.Assert.assertTrue(Assert.java:42)
at org.junit.Assert.assertTrue(Assert.java:53)
at
org.apache.hadoop.yarn.applications.distributedshell.TestDSTimelineV20.verifyEntityTypeFileExists(TestDSTimelineV20.java:478)
...
```
### For code changes:
- [x] Does the title or this PR starts with the corresponding JIRA issue id
(e.g. 'HADOOP-17799. Your PR title ...')?
- n/a Object storage: have the integration tests been executed and the
endpoint declared according to the connector-specific documentation?
- n/a If adding new dependencies to the code, are these dependencies
licensed in a way that is compatible for inclusion under [ASF
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- n/a If applicable, have you updated the `LICENSE`, `LICENSE-binary`,
`NOTICE-binary` files?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
