ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-20511. YARN Service Check failing due to incorrect jar name, Slider failing due to storm plugin conf not present at the moment (alejandro)
Date Mon, 20 Mar 2017 23:59:35 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 50d684a95 -> 4d0a5cf65


AMBARI-20511. YARN Service Check failing due to incorrect jar name, Slider failing due to
storm plugin conf not present at the moment (alejandro)


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

Branch: refs/heads/trunk
Commit: 4d0a5cf6591e5990183d9860a648267d84e87005
Parents: 50d684a
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Mon Mar 20 14:46:48 2017 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Mon Mar 20 17:01:50 2017 -0700

----------------------------------------------------------------------
 .../common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py  | 4 ++++
 .../YARN/3.0.0.3.0/package/scripts/params_linux.py               | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d0a5cf6/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py
b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py
index f7d7fbf..83c5629 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.91.0.3.0/package/scripts/slider.py
@@ -68,6 +68,9 @@ def slider():
        content=InlineTemplate(params.slider_env_sh_template)
   )
 
+  # TODO HDP 3.0,
+  # uncomment after Storm is part of the supported services or revisit after Slider is moved
into YARN.
+  '''
   # check to see if the current/storm_slider_client symlink is broken if it is then the storm
slider client is not installed
   storm_slider_client_dir = os.path.join(params.storm_slider_conf_dir, "..")
   if (os.path.exists(storm_slider_client_dir) or not os.path.islink(storm_slider_client_dir)):
@@ -79,6 +82,7 @@ def slider():
          mode=0755,
          content=Template('storm-slider-env.sh.j2')
     )
+  '''
 
   if (params.log4j_props != None):
     File(format("{params.slider_conf_dir}/log4j.properties"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d0a5cf6/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
index d88f518..d069722 100644
--- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
@@ -220,8 +220,8 @@ nm_log_dirs_list = nm_log_dirs.split(',')
 nm_log_dir_to_mount_file = "/var/lib/ambari-agent/data/yarn/yarn_log_dir_mount.hist"
 nm_local_dir_to_mount_file = "/var/lib/ambari-agent/data/yarn/yarn_local_dir_mount.hist"
 
-distrAppJarName = "hadoop-yarn-applications-distributedshell-2.*.jar"
-hadoopMapredExamplesJarName = "hadoop-mapreduce-examples-2.*.jar"
+distrAppJarName = "hadoop-yarn-applications-distributedshell-3.*.jar"
+hadoopMapredExamplesJarName = "hadoop-mapreduce-examples-3.*.jar"
 
 entity_file_history_directory = "/tmp/entity-file-history/active"
 


Mime
View raw message