[ambari] branch trunk updated: AMBARI-23977. Slider service check fails with error "ValueError: need more than 3 values to unpack" after Ambari Upgrade (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f3d627d  AMBARI-23977. Slider service check fails with error "ValueError: need more than 3 values to unpack" after Ambari Upgrade (aonishuk)
f3d627d is described below

commit f3d627d9de9710e121393f6bd10d8047dfacccae
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Wed May 30 12:01:33 2018 +0300

    AMBARI-23977. Slider service check fails with error "ValueError: need more than 3 values to unpack" after Ambari Upgrade (aonishuk)
---
 .../python/resource_management/libraries/functions/copy_tarball.py  | 6 ++++++
 .../src/main/java/org/apache/ambari/server/stack/ServiceModule.java | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index 148a0bd..e362f1a 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -204,6 +204,11 @@ def _prepare_mapreduce_tarball():
 # especially since it is an attribute of a stack and becomes
 # complicated to change during a Rolling/Express upgrade.
 TARBALL_MAP = {
+  "slider": {
+    "dirs": ("{0}/{1}/slider/lib/slider.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN),
+              "/{0}/apps/{1}/slider/slider.tar.gz".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)),
+    "service": "SLIDER"
+  },
   "yarn": {
     "dirs": ("{0}/{1}/hadoop-yarn/lib/service-dep.tar.gz".format(STACK_ROOT_PATTERN, STACK_VERSION_PATTERN),
              "/{0}/apps/{1}/yarn/service-dep.tar.gz".format(STACK_NAME_PATTERN, STACK_VERSION_PATTERN)),
@@ -268,6 +273,7 @@ TARBALL_MAP = {
 }
 
 SERVICE_TO_CONFIG_MAP = {
+  "slider": "slider-env",
   "yarn": "yarn-env",
   "tez": "tez-env",
   "pig": "pig-env",
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
index 9189ff8..b3d4b17 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
@@ -205,6 +205,9 @@ public class ServiceModule extends BaseModule<ServiceModule, ServiceInfo> implem
     if (serviceInfo.getDisplayName() == null) {
       serviceInfo.setDisplayName(parent.getDisplayName());
     }
+    if (serviceInfo.getServiceType() == null) {
+      serviceInfo.setServiceType(parent.getServiceType());
+    }
     if (serviceInfo.getServiceAdvisorType() == null) {
       ServiceInfo.ServiceAdvisorType serviceAdvisorType = parent.getServiceAdvisorType();
       serviceInfo.setServiceAdvisorType(serviceAdvisorType == null ? ServiceInfo.ServiceAdvisorType.PYTHON : serviceAdvisorType);

-- 
To stop receiving notification emails like this one, please contact
aonishuk@apache.org.