You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2014/01/24 00:01:10 UTC
git commit: AMBARI-4405. Remove property fs.checkpoint.size during
upgrade
Updated Branches:
refs/heads/branch-1.4.4 12c2781b4 -> 987527db2
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/987527db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/987527db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/987527db
Branch: refs/heads/branch-1.4.4
Commit: 987527db23f145954c6627f57f038a0dea56be98
Parents: 12c2781
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Jan 23 15:00:24 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Jan 23 15:00:24 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/987527db/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/987527db/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)