Updated Branches: refs/heads/branch-1.4.1 f1c029ff2 -> 3baa99008
AMBARI-3442. Update upgrade script with latest config mapping. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3baa9900 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3baa9900 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3baa9900 Branch: refs/heads/branch-1.4.1 Commit: 3baa9900854cbae4c6b8b2fdc9fb0e7a8ce979e2 Parents: f1c029f Author: Sumit Mohanty <[email protected]> Authored: Tue Oct 8 23:21:44 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Oct 8 23:25:55 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/UpgradeHelper_HDP2.py | 10 ++++++++++ ambari-server/src/test/python/TestUpgradeScript_HDP2.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3baa9900/ambari-server/src/main/python/UpgradeHelper_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/UpgradeHelper_HDP2.py b/ambari-server/src/main/python/UpgradeHelper_HDP2.py index 985400b..43da6b8 100644 --- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py +++ b/ambari-server/src/main/python/UpgradeHelper_HDP2.py @@ -345,6 +345,7 @@ MAPRED_SITE = { "mapred.create.symlink": "DELETE_OLD", "mapred.fairscheduler.allocation.file": "DELETE_OLD", "mapred.fairscheduler.assignmultiple": "DELETE_OLD", + "mapreduce.job.priority": "DELETE_OLD", "mapred.jobtracker.blacklist.fault-bucket-width": "DELETE_OLD", "mapred.jobtracker.blacklist.fault-timeout-window": "DELETE_OLD", "mapred.jobtracker.completeuserjobs.maximum": "DELETE_OLD", @@ -352,11 +353,18 @@ MAPRED_SITE = { "mapred.jobtracker.retirejob.check": "DELETE_OLD", "mapred.jobtracker.retirejob.interval": "DELETE_OLD", "mapred.jobtracker.taskScheduler": "DELETE_OLD", + "mapred.permissions.supergroup": "DELETE_OLD", "mapred.queue.names": "DELETE_OLD", + "mapreduce.cluster.acls.enabled": "DELETE_OLD", "mapreduce.cluster.local.dir": "DELETE_OLD", "mapreduce.cluster.mapmemory.mb": "DELETE_OLD", + "mapreduce.cluster.permissions.supergroup": "DELETE_OLD", "mapreduce.cluster.reducememory.mb": "DELETE_OLD", + "mapreduce.cluster.temp.dir": "DELETE_OLD", + "mapreduce.jobtracker.jobinit.threads": "DELETE_OLD", + "mapreduce.jobtracker.permissions.supergroup": "DELETE_OLD", "mapreduce.job.cache.symlink.create": "DELETE_OLD", + "mapreduce.job.speculative.slownodethreshold": "DELETE_OLD", "mapreduce.job.userlog.retain.hours": "DELETE_OLD", "mapreduce.admin.map.child.java.opts": "-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN", "mapreduce.admin.reduce.child.java.opts": "-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN", @@ -367,6 +375,7 @@ MAPRED_SITE = { "mapreduce.framework.name": "yarn", "mapreduce.history.server.embedded": "DELETE_OLD", "mapreduce.history.server.http.address": "DELETE_OLD", + "mapreduce.job.committer.setup.cleanup.needed": "DELETE_OLD", "mapreduce.job.jvm.numtasks": "DELETE_OLD", "mapreduce.jobhistory.address": "REPLACE_JH_HOST:10020", "mapreduce.jobhistory.done-dir": "/mr-history/done", @@ -417,6 +426,7 @@ MAPRED_SITE = { "mapreduce.reduce.merge.inmem.threshold": "DELETE_OLD", "mapreduce.shuffle.port": "13562", "mapreduce.task.timeout": "300000", + "mapreduce.task.userlog.limit.kb": "DELETE_OLD", "mapreduce.tasktracker.cache.local.size": "DELETE_OLD", "mapreduce.tasktracker.contention.tracking": "DELETE_OLD", "mapreduce.tasktracker.dns.interface": "DELETE_OLD", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3baa9900/ambari-server/src/test/python/TestUpgradeScript_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py b/ambari-server/src/test/python/TestUpgradeScript_HDP2.py index 49c81ba..ffbc2a4 100644 --- a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py +++ b/ambari-server/src/test/python/TestUpgradeScript_HDP2.py @@ -519,7 +519,7 @@ class TestUpgradeHDP2Script(TestCase): deleted, replaced = count_tags(UpgradeHelper_HDP2.MAPRED_SITE) self.assertEqual(0, replaced) - self.assertEqual(85, deleted) + self.assertEqual(95, deleted) deleted, replaced = count_tags(UpgradeHelper_HDP2.CORE_SITE) self.assertEqual(0, replaced)
