Updated Branches: refs/heads/trunk f792d3d3f -> 58ce96dc5
AMBARI-4405. Remove property fs.checkpoint.size during upgrade Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/58ce96dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58ce96dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58ce96dc Branch: refs/heads/trunk Commit: 58ce96dc5afbe09948b4df587d3290e9f2abcd11 Parents: f792d3d Author: Sumit Mohanty <[email protected]> Authored: Thu Jan 23 15:00:24 2014 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Thu Jan 23 15:02:31 2014 -0800 ---------------------------------------------------------------------- ambari-server/src/main/python/UpgradeHelper_HDP2.py | 4 ++-- ambari-server/src/test/python/TestUpgradeScript_HDP2.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/58ce96dc/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 b6dc9df..4a04632 100644 --- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/58ce96dc/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 6871974..3289290 100644 --- a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py +++ b/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)
