Repository: hadoop Updated Branches: refs/heads/trunk a2dcba185 -> 0adc0471d
Revert "YARN-7162. Remove XML excludes file format (rkanter)" - wrong commit message This reverts commit 3a8d57a0a2e047b34be82f602a2b6cf5593d2125. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f496683 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f496683 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f496683 Branch: refs/heads/trunk Commit: 5f496683fb00ba26a6bf5a506ae87d4bc4088727 Parents: a2dcba1 Author: Robert Kanter <rkan...@apache.org> Authored: Mon Sep 18 10:32:08 2017 -0700 Committer: Robert Kanter <rkan...@apache.org> Committed: Mon Sep 18 10:32:08 2017 -0700 ---------------------------------------------------------------------- .../hadoop-mapreduce-client-core/pom.xml | 4 -- .../hadoop/mapreduce/JobResourceUploader.java | 17 -------- .../apache/hadoop/mapreduce/MRJobConfig.java | 5 --- .../src/main/resources/mapred-default.xml | 9 ---- .../mapreduce/TestJobResourceUploader.java | 46 -------------------- 5 files changed, 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f496683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index ce5fdc8..c34f7bd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -44,10 +44,6 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f496683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java index d9bf988..f1cad57 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java @@ -36,8 +36,6 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DistributedFileSystem; -import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies; import org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager; import org.apache.hadoop.mapreduce.filecache.DistributedCache; @@ -96,11 +94,6 @@ class JobResourceUploader { new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION); mkdirs(jtFs, submitJobDir, mapredSysPerms); - if (!conf.getBoolean(MRJobConfig.MR_AM_STAGING_DIR_ERASURECODING_ENABLED, - MRJobConfig.DEFAULT_MR_AM_STAGING_ERASURECODING_ENABLED)) { - disableErasureCodingForPath(jtFs, submitJobDir); - } - Collection<String> files = conf.getStringCollection("tmpfiles"); Collection<String> libjars = conf.getStringCollection("tmpjars"); Collection<String> archives = conf.getStringCollection("tmparchives"); @@ -582,14 +575,4 @@ class JobResourceUploader { } return finalPath; } - - private void disableErasureCodingForPath(FileSystem fs, Path path) - throws IOException { - if (jtFs instanceof DistributedFileSystem) { - LOG.info("Disabling Erasure Coding for path: " + path); - DistributedFileSystem dfs = (DistributedFileSystem) jtFs; - dfs.setErasureCodingPolicy(path, - SystemErasureCodingPolicies.getReplicationPolicy().getName()); - } - } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f496683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index 86abb42..2023ba3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -1037,9 +1037,4 @@ public interface MRJobConfig { String FINISH_JOB_WHEN_REDUCERS_DONE = "mapreduce.job.finish-when-all-reducers-done"; boolean DEFAULT_FINISH_JOB_WHEN_REDUCERS_DONE = true; - - String MR_AM_STAGING_DIR_ERASURECODING_ENABLED = - MR_AM_STAGING_DIR + "erasurecoding.enabled"; - - boolean DEFAULT_MR_AM_STAGING_ERASURECODING_ENABLED = false; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f496683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 6b6faf2..ee9b906 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -1261,15 +1261,6 @@ </property> <property> - <name>yarn.app.mapreduce.am.staging-dir.erasurecoding.enabled</name> - <value>false</value> - <description>Whether Erasure Coding should be enabled for - files that are copied to the MR staging area. This is a job-level - setting. - </description> -</property> - -<property> <name>mapreduce.am.max-attempts</name> <value>2</value> <description>The maximum number of application attempts. It is a http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f496683/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java index d0d7a34..20b7b7d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java @@ -20,11 +20,6 @@ package org.apache.hadoop.mapreduce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.times; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import java.io.IOException; import java.net.URI; @@ -41,12 +36,9 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DistributedFileSystem; -import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies; import org.apache.hadoop.mapred.JobConf; import org.junit.Assert; import org.junit.Test; -import org.mockito.verification.VerificationMode; /** * A class for unit testing JobResourceUploader. @@ -365,40 +357,6 @@ public class TestJobResourceUploader { expectedArchivesWithFrags, expectedJobJar); } - @Test - public void testErasureCodingDefault() throws IOException { - testErasureCodingSetting(true); - } - - @Test - public void testErasureCodingDisabled() throws IOException { - testErasureCodingSetting(false); - } - - private void testErasureCodingSetting(boolean defaultBehavior) - throws IOException { - JobConf jConf = new JobConf(); - // don't set to false if EC remains disabled to check default setting - if (!defaultBehavior) { - jConf.setBoolean(MRJobConfig.MR_AM_STAGING_DIR_ERASURECODING_ENABLED, - true); - } - - DistributedFileSystem fs = mock(DistributedFileSystem.class); - Path path = new Path("/"); - when(fs.makeQualified(any(Path.class))).thenReturn(path); - JobResourceUploader uploader = new StubedUploader(fs, true); - Job job = Job.getInstance(jConf); - - uploader.uploadResources(job, new Path("/test")); - - String replicationPolicyName = SystemErasureCodingPolicies - .getReplicationPolicy().getName(); - VerificationMode mode = defaultBehavior ? times(1) : never(); - verify(fs, mode).setErasureCodingPolicy(eq(path), - eq(replicationPolicyName)); - } - private void runTmpResourcePathTest(JobResourceUploader uploader, ResourceConf rConf, JobConf jConf, String[] expectedFiles, String[] expectedArchives, String expectedJobJar) throws IOException { @@ -740,10 +698,6 @@ public class TestJobResourceUploader { super(FileSystem.getLocal(conf), useWildcard); } - StubedUploader(FileSystem fs, boolean useWildcard) throws IOException { - super(fs, useWildcard); - } - @Override FileStatus getFileStatus(Map<URI, FileStatus> statCache, Configuration job, Path p) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org