[hadoop] branch trunk updated: HADOOP-16591 Fix S3A ITest*MRjob failures.

[stevel]

This is an automated email from the ASF dual-hosted git repository.

stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2b5fc95  HADOOP-16591 Fix S3A ITest*MRjob failures.
2b5fc95 is described below

commit 2b5fc95851552599e33674d9a23e7e9af74a304e
Author: Siddharth Seth <ss...@apache.org>
AuthorDate: Mon Sep 23 14:55:24 2019 +0100

    HADOOP-16591 Fix S3A ITest*MRjob failures.
    
    Contributed by Siddharth Seth.
    
    Change-Id: I7f08201c9f7c0551514049389b5b398a84855191
---
 .../org/apache/hadoop/fs/s3a/commit/AbstractYarnClusterITest.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/AbstractYarnClusterITest.java
 
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/AbstractYarnClusterITest.java
index 2501662..2e8f1f0 100644
--- 
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/AbstractYarnClusterITest.java
+++ 
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/AbstractYarnClusterITest.java
@@ -196,8 +196,9 @@ public abstract class AbstractYarnClusterITest extends 
AbstractCommitITest {
 
 
   protected Job createJob() throws IOException {
-    Job mrJob = Job.getInstance(getClusterBinding().getConf(),
-        getMethodName());
+    Configuration jobConf = getClusterBinding().getConf();
+    jobConf.addResource(getConfiguration());
+    Job mrJob = Job.getInstance(jobConf, getMethodName());
     patchConfigurationForCommitter(mrJob.getConfiguration());
     return mrJob;
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org