diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index b4a34db4b17..ee2cc2e2d8b 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -1262,22 +1262,6 @@ - - io.seqfile.lazydecompress - true - Should values of block-compressed SequenceFiles be decompressed - only when necessary. - - - - - io.seqfile.sorter.recordlimit - 1000000 - The limit on number of records to be kept in memory in a spill - in SequenceFiles.Sorter - - - io.mapfile.bloom.size 1048576 diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java index 571dfae0b76..a3a4026eee9 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java @@ -124,8 +124,6 @@ public class TestCommonConfigurationFields extends TestConfigurationFieldsBase { configurationPropsToSkipCompare.add("dr.who"); // XML deprecated properties. - xmlPropsToSkipCompare.add("io.seqfile.lazydecompress"); - xmlPropsToSkipCompare.add("io.seqfile.sorter.recordlimit"); // - org.apache.hadoop.hdfs.client.HdfsClientConfigKeys xmlPropsToSkipCompare .add("io.bytes.per.checksum"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml index e4619d67922..4c73e8bb17f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml @@ -16,7 +16,6 @@ mapreduce.reduce.shuffle.memory.limit.percent0.25 hadoop.http.authentication.kerberos.keytab${user.home}/hadoop.keytab yarn.nodemanager.keytab/etc/krb5.keytab -io.seqfile.sorter.recordlimit1000000 mapreduce.task.io.sort.factor10 yarn.nodemanager.disk-health-checker.interval-ms120000 mapreduce.job.working.dirhdfs://localhost:8021/user/user @@ -102,7 +101,6 @@ dfs.client.block.write.retries3 hadoop.proxyuser.user.groupsusers dfs.namenode.name.dir.restorefalse -io.seqfile.lazydecompresstrue mapreduce.reduce.merge.inmem.threshold1000 mapreduce.input.fileinputformat.split.minsize0 dfs.replication3 diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json index 095cfd57325..c252539d0db 100644 --- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json +++ b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json @@ -4545,7 +4545,6 @@ "hadoop.ssl.keystores.factory.class" : "org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory", "hadoop.http.authentication.kerberos.keytab" : "${user.home}/hadoop.keytab", "yarn.nodemanager.keytab" : "/etc/krb5.keytab", - "io.seqfile.sorter.recordlimit" : "1000000", "mapreduce.task.io.sort.factor" : "10", "yarn.nodemanager.disk-health-checker.interval-ms" : "120000", "mapreduce.job.working.dir" : "hdfs://a2115.smile.com:9820/user/jenkins", @@ -4662,7 +4661,6 @@ "rpc.engine.org.apache.hadoop.mapreduce.v2.api.MRClientProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine", "dfs.datanode.hdfs-blocks-metadata.enabled" : "true", "ha.zookeeper.parent-znode" : "/hadoop-ha", - "io.seqfile.lazydecompress" : "true", "mapreduce.reduce.merge.inmem.threshold" : "1000", "mapreduce.input.fileinputformat.split.minsize" : "0", "dfs.replication" : "3", @@ -9627,7 +9625,6 @@ "hadoop.ssl.keystores.factory.class" : "org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory", "hadoop.http.authentication.kerberos.keytab" : "${user.home}/hadoop.keytab", "yarn.nodemanager.keytab" : "/etc/krb5.keytab", - "io.seqfile.sorter.recordlimit" : "1000000", "mapreduce.task.io.sort.factor" : "10", "yarn.nodemanager.disk-health-checker.interval-ms" : "120000", "mapreduce.job.working.dir" : "hdfs://a2115.smile.com:9820/user/jenkins", @@ -9744,7 +9741,6 @@ "rpc.engine.org.apache.hadoop.mapreduce.v2.api.MRClientProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine", "dfs.datanode.hdfs-blocks-metadata.enabled" : "true", "ha.zookeeper.parent-znode" : "/hadoop-ha", - "io.seqfile.lazydecompress" : "true", "mapreduce.reduce.merge.inmem.threshold" : "1000", "mapreduce.input.fileinputformat.split.minsize" : "0", "dfs.replication" : "3", @@ -10209,7 +10205,6 @@ "hadoop.ssl.keystores.factory.class" : "org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory", "hadoop.http.authentication.kerberos.keytab" : "${user.home}/hadoop.keytab", "yarn.nodemanager.keytab" : "/etc/krb5.keytab", -"io.seqfile.sorter.recordlimit" : "1000000", "mapreduce.task.io.sort.factor" : "10", "yarn.nodemanager.disk-health-checker.interval-ms" : "120000", "mapreduce.job.working.dir" : "hdfs://a2115.smile.com:9820/user/jenkins", @@ -10327,7 +10322,6 @@ "rpc.engine.org.apache.hadoop.mapreduce.v2.api.MRClientProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine", "dfs.datanode.hdfs-blocks-metadata.enabled" : "true", "ha.zookeeper.parent-znode" : "/hadoop-ha", -"io.seqfile.lazydecompress" : "true", "mapreduce.reduce.merge.inmem.threshold" : "1000", "mapreduce.input.fileinputformat.split.minsize" : "0", "dfs.replication" : "3",