AMBARI-3442. Update upgrade script with latest config mapping.

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",

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)