This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new b8eedd8 [AMBARI-24275] - Unable to Restart Hive When Using An
Ambari-Managed MySQL Server (#1742) (#2209)
b8eedd8 is described below
commit b8eedd8c8af2959b30884785105ed6fdd04eb48a
Author: avijayanhwx <[email protected]>
AuthorDate: Thu Aug 30 11:30:35 2018 -0700
[AMBARI-24275] - Unable to Restart Hive When Using An Ambari-Managed MySQL
Server (#1742) (#2209)
---
.../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 fce6e0a..3725aec 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
@@ -964,7 +964,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')
