[
https://issues.apache.org/jira/browse/YARN-9134?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16905323#comment-16905323
]
Peter Bacsko edited comment on YARN-9134 at 8/12/19 3:49 PM:
-------------------------------------------------------------
[~snemeth] I'd skip 3.1. Way too many conflicts even if I use the branch-3.2
patch as a starting point.
{noformat}
$ git apply --reject YARN-9134.branch-3.2.001.patch
...
error: patch failed:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java:394
Hunk #16 succeeded at 380 (offset -71 lines).
Applying patch
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
with 8 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Rejected hunk #9.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Rejected hunk #12.
Rejected hunk #13.
Rejected hunk #14.
Rejected hunk #15.
Hunk #16 applied cleanly.{noformat}
was (Author: pbacsko):
[~snemeth] I'd skip 3.1. Way too many conflicts even if I use the branch-3.2
patch as a starting point.
{noformat}
$ git apply --reject YARN-9134.branch-3.2.001.patch
...
error: patch failed:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java:394
Hunk #16 succeeded at 380 (offset -71 lines).
Applying patch
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceUtils.java
with 8 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Rejected hunk #9.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Rejected hunk #12.
Rejected hunk #13.
Rejected hunk #14.
Rejected hunk #15.
Hunk #16 applied cleanly.{noformat}
Too many parts are rejected.
> No test coverage for redefining FPGA / GPU resource types in TestResourceUtils
> ------------------------------------------------------------------------------
>
> Key: YARN-9134
> URL: https://issues.apache.org/jira/browse/YARN-9134
> Project: Hadoop YARN
> Issue Type: Improvement
> Reporter: Szilard Nemeth
> Assignee: Peter Bacsko
> Priority: Major
> Attachments: YARN-9134.001.patch, YARN-9134.002.patch,
> YARN-9134.003.patch, YARN-9134.004.patch, YARN-9134.branch-3.2.001.patch
>
>
> The patch also includes some trivial code cleanup.
> Also, setupResourceTypes has been deprecated as it is dangerous to use, see
> the javadoc for details.
--
This message was sent by Atlassian JIRA
(v7.6.14#76016)
---------------------------------------------------------------------
To unsubscribe, e-mail: yarn-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: yarn-issues-h...@hadoop.apache.org
