Quellcode durchsuchen

AMBARI-4405. Remove property fs.checkpoint.size during upgrade

Sumit Mohanty vor 11 Jahren
Ursprung
Commit
58ce96dc5a

+ 2 - 2
ambari-server/src/main/python/UpgradeHelper_HDP2.py

@@ -468,7 +468,7 @@ GLOBAL = {
   "dfs_namenode_checkpoint_dir": "REPLACE_WITH_fs_checkpoint_dir",
   "dfs_namenode_checkpoint_period": "REPLACE_WITH_fs_checkpoint_period",
   "dfs_namenode_name_dir": "REPLACE_WITH_dfs_name_dir",
-  "fs_checkpoint_size": "0.5",
+  "fs_checkpoint_size": "DELETE_OLD",
   "io_sort_spill_percent": "DELETE_OLD",
   "hadoop_conf_dir": "/etc/hadoop/conf",
   "hdfs_support_append": "DELETE_OLD",
@@ -531,7 +531,7 @@ HDFS_SITE = {
 }
 
 CORE_SITE = {
-  "fs.checkpoint.size": "0.5",
+  "fs.checkpoint.size": "DELETE_OLD",
   "hadoop.security.auth_to_local": "\n        RULE:[2:$1@$0]([rn]m@.*)s/.*/yarn/\n        RULE:[2:$1@$0](jhs@.*)s/.*/mapred/\n        RULE:[2:$1@$0]([nd]n@.*)s/.*/hdfs/\n        RULE:[2:$1@$0](hm@.*)s/.*/hbase/\n        RULE:[2:$1@$0](rs@.*)s/.*/hbase/\n        DEFAULT\n    ",
   "hadoop.security.authentication": "simple",
   "hadoop.security.authorization": "false",

+ 2 - 2
ambari-server/src/test/python/TestUpgradeScript_HDP2.py

@@ -515,7 +515,7 @@ class TestUpgradeHDP2Script(TestCase):
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.GLOBAL)
     self.assertEqual(6, replaced)
-    self.assertEqual(24, deleted)
+    self.assertEqual(25, deleted)
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.MAPRED_SITE)
     self.assertEqual(0, replaced)
@@ -523,7 +523,7 @@ class TestUpgradeHDP2Script(TestCase):
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.CORE_SITE)
     self.assertEqual(0, replaced)
-    self.assertEqual(1, deleted)
+    self.assertEqual(2, deleted)
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.HDFS_SITE)
     self.assertEqual(0, replaced)