ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject git commit: AMBARI-5503. Review upgrade helper script for Ambari-1.6.0 (Eugene Chekanskiy via smohanty)
Date Thu, 17 Apr 2014 20:24:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8425bd120 -> da88fb5fa


AMBARI-5503. Review upgrade helper script for Ambari-1.6.0 (Eugene Chekanskiy via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da88fb5f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da88fb5f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da88fb5f

Branch: refs/heads/trunk
Commit: da88fb5fa360b6d156f63e847af8fcfc78a43205
Parents: 8425bd1
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Thu Apr 17 13:17:07 2014 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Thu Apr 17 13:17:07 2014 -0700

----------------------------------------------------------------------
 .../src/main/python/UpgradeHelper_HDP2.py       | 78 ++++++++++++++++----
 .../src/test/python/TestUpgradeScript_HDP2.py   |  4 +-
 2 files changed, 65 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/da88fb5f/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 b8e3387..0c43850 100644
--- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py
+++ b/ambari-server/src/main/python/UpgradeHelper_HDP2.py
@@ -463,21 +463,21 @@ MAPRED_SITE = {
 }
 
 GLOBAL = {
-  "datanode_du_reserved": "1073741824",
+  "datanode_du_reserved": "DELETE_OLD",
   "dfs_block_local_path_access_user": "DELETE_OLD",
-  "dfs_datanode_data_dir": "REPLACE_WITH_dfs_data_dir",
+  "dfs_datanode_data_dir": "DELETE_OLD",
   "dfs_exclude": "dfs.exclude",
   "dfs_include": "DELETE_OLD",
-  "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",
+  "dfs_namenode_checkpoint_dir": "DELETE_OLD",
+  "dfs_namenode_checkpoint_period": "DELETE_OLD",
+  "dfs_namenode_name_dir": "DELETE_OLD",
   "fs_checkpoint_size": "DELETE_OLD",
   "io_sort_spill_percent": "DELETE_OLD",
-  "hadoop_conf_dir": "/etc/hadoop/conf",
+  "hadoop_conf_dir": "DELETE_OLD",
   "hdfs_support_append": "DELETE_OLD",
-  "hfile_blockcache_size": "0.25",
-  "hregion_majorcompaction": "604800000",
-  "hstore_blockingstorefiles": "10",
+  "hfile_blockcache_size": "DELETE_OLD",
+  "hregion_majorcompaction": "DELETE_OLD",
+  "hstore_blockingstorefiles": "DELETE_OLD",
   "jtnode_heapsize": "DELETE_OLD",
   "jtnode_opt_maxnewsize": "DELETE_OLD",
   "jtnode_opt_newsize": "DELETE_OLD",
@@ -486,8 +486,8 @@ GLOBAL = {
   "mapred_cluster_max_map_mem_mb": "DELETE_OLD",
   "mapred_cluster_max_red_mem_mb": "DELETE_OLD",
   "mapred_cluster_red_mem_mb": "DELETE_OLD",
-  "mapred_hosts_exclude": "mapred.exclude",
-  "mapred_hosts_include": "mapred.include",
+  "mapred_hosts_exclude": "DELETE_OLD",
+  "mapred_hosts_include": "DELETE_OLD",
   "mapred_job_map_mem_mb": "DELETE_OLD",
   "mapred_job_red_mem_mb": "DELETE_OLD",
   "mapred_local_dir": "DELETE_OLD",
@@ -495,10 +495,10 @@ GLOBAL = {
   "mapred_map_tasks_max": "DELETE_OLD",
   "mapred_pid_dir_prefix": "/var/run/hadoop-mapreduce",
   "mapred_red_tasks_max": "DELETE_OLD",
-  "mapreduce_jobtracker_system_dir": "REPLACE_WITH_mapred_system_dir",
+  "mapreduce_jobtracker_system_dir": "DELETE_OLD",
   "mapreduce_map_memory_mb": "DELETE_OLD",
   "mapreduce_reduce_memory_mb": "DELETE_OLD",
-  "mapreduce_task_io_sort_mb": "REPLACE_WITH_io_sort_mb",
+  "mapreduce_task_io_sort_mb": "DELETE_OLD",
   "maxtasks_per_job": "DELETE_OLD",
   "mapreduce_userlog_retainhours": "DELETE_OLD",
   "namenode_opt_maxnewsize": "640m",
@@ -507,12 +507,60 @@ GLOBAL = {
   "resourcemanager_heapsize": "1024",
   "scheduler_name": "DELETE_OLD",
   "snappy_enabled": "DELETE_OLD",
-  "task_controller": "org.apache.hadoop.mapred.DefaultTaskController",
+  "task_controller": "DELETE_OLD",
   "yarn_heapsize": "1024",
   "yarn_log_dir_prefix": "/var/log/hadoop-yarn",
   "yarn_pid_dir_prefix": "/var/run/hadoop-yarn",
   "yarn_user": "yarn",
-  "zookeeper_sessiontimeout": "30000"
+  "zookeeper_sessiontimeout": "DELETE_OLD",
+  "apache_artifacts_download_url": "DELETE_OLD",
+  "client_scannercaching": "DELETE_OLD",
+  "dfs_data_dir": "DELETE_OLD",
+  "dfs_datanode_address": "DELETE_OLD",
+  "dfs_datanode_data_dir_perm": "DELETE_OLD",
+  "dfs_datanode_failed_volume_tolerated": "DELETE_OLD",
+  "dfs_datanode_http_address": "DELETE_OLD",
+  "dfs_exclude": "DELETE_OLD",
+  "dfs_name_dir": "DELETE_OLD",
+  "dfs_replication": "DELETE_OLD",
+  "dfs_webhdfs_enabled": "DELETE_OLD",
+  "fs_checkpoint_dir": "DELETE_OLD",
+  "fs_checkpoint_period": "DELETE_OLD",
+  "gpl_artifacts_download_url": "DELETE_OLD",
+  "hbase_conf_dir": "DELETE_OLD",
+  "hbase_hdfs_root_dir": "DELETE_OLD",
+  "hbase_tmp_dir": "DELETE_OLD",
+  "hdfs_enable_shortcircuit_read": "DELETE_OLD",
+  "hfile_max_keyvalue_size": "DELETE_OLD",
+  "hive_conf_dir": "DELETE_OLD",
+  "hive_database_name": "DELETE_OLD",
+  "hive_jdbc_connection_url": "DELETE_OLD",
+  "hive_jdbc_driver": "DELETE_OLD",
+  "hive_lib": "DELETE_OLD",
+  "hive_dbroot": "DELETE_OLD",
+  "hive_metastore_user_name": "DELETE_OLD",
+  "hive_metastore_user_passwd": "DELETE_OLD",
+  "hregion_blockmultiplier": "DELETE_OLD",
+  "hregion_memstoreflushsize": "DELETE_OLD",
+  "hstore_compactionthreshold": "DELETE_OLD",
+  "hstorefile_maxsize": "DELETE_OLD",
+  "io_sort_mb": "DELETE_OLD",
+  "java64_home": "DELETE_OLD",
+  "mapred_jobstatus_dir": "DELETE_OLD",
+  "mapred_system_dir": "DELETE_OLD",
+  "mysql_connector_url": "DELETE_OLD",
+  "namenode_formatted_mark_dir": "DELETE_OLD",
+  "oozie_database_name": "DELETE_OLD",
+  "oozie_jdbc_connection_url": "DELETE_OLD",
+  "oozie_jdbc_driver": "DELETE_OLD",
+  "oozie_metastore_user_name": "DELETE_OLD",
+  "oozie_metastore_user_passwd": "DELETE_OLD",
+  "regionserver_handlers": "DELETE_OLD",
+  "regionserver_memstore_lab": "DELETE_OLD",
+  "regionserver_memstore_lowerlimit": "DELETE_OLD",
+  "regionserver_memstore_upperlimit": "DELETE_OLD",
+  "run_dir": "DELETE_OLD",
+  "zk_pid_file": "DELETE_OLD"
 }
 
 HDFS_SITE = {

http://git-wip-us.apache.org/repos/asf/ambari/blob/da88fb5f/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 b3d02bb..36ce54c 100644
--- a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py
+++ b/ambari-server/src/test/python/TestUpgradeScript_HDP2.py
@@ -582,8 +582,8 @@ class TestUpgradeHDP2Script(TestCase):
       return deleted, replaced
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.GLOBAL)
-    self.assertEqual(6, replaced)
-    self.assertEqual(25, deleted)
+    self.assertEqual(0, replaced)
+    self.assertEqual(88, deleted)
 
     deleted, replaced = count_tags(UpgradeHelper_HDP2.MAPRED_SITE)
     self.assertEqual(0, replaced)


Mime
View raw message