You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2018/07/10 20:36:24 UTC
[ambari] branch trunk updated: [AMBARI-24275] - Unable to Restart
Hive When Using An Ambari-Managed MySQL Server (#1742)
This is an automated email from the ASF dual-hosted git repository.
jonathanhurley 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 0781b30 [AMBARI-24275] - Unable to Restart Hive When Using An Ambari-Managed MySQL Server (#1742)
0781b30 is described below
commit 0781b30762c1df19b9eb2b875b892bfbe81818bb
Author: Jonathan Hurley <jo...@apache.org>
AuthorDate: Tue Jul 10 16:36:21 2018 -0400
[AMBARI-24275] - Unable to Restart Hive When Using An Ambari-Managed MySQL Server (#1742)
---
.../src/main/python/resource_management/libraries/script/script.py | 2 +-
.../common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 556412a..10276ec 100644
--- a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -954,7 +954,7 @@ class Script(object):
else:
# To remain backward compatible with older stacks, only pass upgrade_type if available.
# TODO, remove checking the argspec for "upgrade_type" once all of the services support that optional param.
- if True:
+ if "upgrade_type" in inspect.getargspec(self.stop).args:
self.stop(env, upgrade_type=upgrade_type)
else:
if is_stack_upgrade:
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
index 76a8b55..305991d 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_server.py
@@ -42,12 +42,12 @@ class MysqlServer(Script):
env.set_params(params)
mysql_configure()
- def start(self, env, rolling_restart=False):
+ def start(self, env):
import params
env.set_params(params)
mysql_service(action='start')
- def stop(self, env, rolling_restart=False):
+ def stop(self, env):
import params
env.set_params(params)
mysql_service(action='stop')