ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [38/50] [abbrv] ambari git commit: AMBARI-21439 Hive/MapRed2 restart fails after Ambari upgrade (dili)
Date Tue, 11 Jul 2017 16:26:11 GMT
AMBARI-21439 Hive/MapRed2 restart fails after Ambari upgrade (dili)


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

Branch: refs/heads/branch-2.5
Commit: 8e1af7a9952df46f7896e15d7228af9d2adde080
Parents: cea0880
Author: Di Li <dili@apache.org>
Authored: Tue Jul 11 11:01:59 2017 -0400
Committer: Di Li <dili@apache.org>
Committed: Tue Jul 11 11:01:59 2017 -0400

----------------------------------------------------------------------
 .../4.0/services/YARN/package/scripts/historyserver.py       | 8 ++++----
 .../BigInsights/4.2/services/HIVE/package/scripts/hive.py    | 8 ++++----
 .../4.2/services/HIVE/package/scripts/hive_server.py         | 2 +-
 .../4.2/services/SLIDER/package/scripts/service_check.py     | 2 +-
 .../4.2/services/YARN/package/scripts/historyserver.py       | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
index bb384e4..20635a2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
@@ -61,8 +61,8 @@ class HistoryServer(Script):
       conf_select.select(params.stack_name, "hadoop", params.version)
       stack_select.select("hadoop-mapreduce-historyserver", params.version)
       # MC Hammer said, "Can't touch this"
-      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
-      copy_to_hdfs("slider", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
+      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
+      copy_to_hdfs("slider", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
       params.HdfsResource(None, action="execute")
 
   def start(self, env, upgrade_type=None):
@@ -75,12 +75,12 @@ class HistoryServer(Script):
       "mapreduce",
       params.user_group,
       params.hdfs_user,
-      host_sys_prepped=params.host_sys_prepped)
+      skip=params.host_sys_prepped)
     resource_created = copy_to_hdfs(
       "slider",
       params.user_group,
       params.hdfs_user,
-      host_sys_prepped=params.host_sys_prepped) or resource_created
+      skip=params.host_sys_prepped) or resource_created
     if resource_created:
       params.HdfsResource(None, action="execute")
     service('historyserver', action='start', serviceName='mapreduce')

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
index f6fddd0..0446e1c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
@@ -133,7 +133,7 @@ def hive(name=None):
     # ****** Begin Copy Tarballs ******
     # *********************************
     if params.stack_version != "" and compare_versions(params.stack_version, '4.0.0.0') >=
0:
-      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
+      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
 
     # Always copy pig.tar.gz and hive.tar.gz using the appropriate mode.
     copy_to_hdfs("pig",
@@ -142,14 +142,14 @@ def hive(name=None):
                  file_mode=params.tarballs_mode,
                  custom_source_file=params.pig_tar_source,
                  custom_dest_file=params.pig_tar_dest_file,
-                 host_sys_prepped=params.host_sys_prepped)
+                 skip=params.host_sys_prepped)
     copy_to_hdfs("hive",
                  params.user_group,
                  params.hdfs_user,
                  file_mode=params.tarballs_mode,
                  custom_source_file=params.hive_tar_source,
                  custom_dest_file=params.hive_tar_dest_file,
-                 host_sys_prepped=params.host_sys_prepped)
+                 skip=params.host_sys_prepped)
 
     wildcard_tarballs = ["sqoop", "hadoop_streaming"]
     for tarball_name in wildcard_tarballs:
@@ -170,7 +170,7 @@ def hive(name=None):
                      file_mode=params.tarballs_mode,
                      custom_source_file=source_file,
                      custom_dest_file=dest_file,
-                     host_sys_prepped=params.host_sys_prepped)
+                     skip=params.host_sys_prepped)
     # ******* End Copy Tarballs *******
     # *********************************
    

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive_server.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive_server.py
index 9c336eb..eb2be94 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive_server.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive_server.py
@@ -106,7 +106,7 @@ class HiveServerDefault(HiveServer):
         "mapreduce",
         params.user_group,
         params.hdfs_user,
-        host_sys_prepped=params.host_sys_prepped)
+        skip=params.host_sys_prepped)
 
       if resource_created:
         params.HdfsResource(None, action="execute")

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/package/scripts/service_check.py
index d56f612..9814de5 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/package/scripts/service_check.py
@@ -39,7 +39,7 @@ class SliderServiceCheck(Script):
     env.set_params(params)
     
     if Script.is_stack_greater_or_equal("4.0"):
-      copy_to_hdfs("slider", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
+      copy_to_hdfs("slider", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
     
     smokeuser_kinit_cmd = format(
       "{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal};") if params.security_enabled
else ""

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/package/scripts/historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/package/scripts/historyserver.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/package/scripts/historyserver.py
index 40ca374..f97bdf3 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/package/scripts/historyserver.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/package/scripts/historyserver.py
@@ -62,8 +62,8 @@ class HistoryServer(Script):
       #Execute(format("iop-select set hadoop-mapreduce-historyserver {version}"))
       #copy_tarballs_to_hdfs('mapreduce', 'hadoop-mapreduce-historyserver', params.mapred_user,
params.hdfs_user, params.user_group)
       # MC Hammer said, "Can't touch this"
-      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
-      copy_to_hdfs("slider", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped)
+      copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
+      copy_to_hdfs("slider", params.user_group, params.hdfs_user, skip=params.host_sys_prepped)
       params.HdfsResource(None, action="execute")
 
   def start(self, env, upgrade_type=None):
@@ -76,12 +76,12 @@ class HistoryServer(Script):
       "mapreduce",
       params.user_group,
       params.hdfs_user,
-      host_sys_prepped=params.host_sys_prepped)
+      skip=params.host_sys_prepped)
     resource_created = copy_to_hdfs(
       "slider",
       params.user_group,
       params.hdfs_user,
-      host_sys_prepped=params.host_sys_prepped) or resource_created
+      skip=params.host_sys_prepped) or resource_created
     if resource_created:
       params.HdfsResource(None, action="execute")
 


Mime
View raw message