Repository: ambari Updated Branches: refs/heads/branch-2.1 ebf56d060 -> f88b30e9e
AMBARI-11863 Stopping Accumulo tservers can deadlock (billie) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f88b30e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f88b30e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f88b30e9 Branch: refs/heads/branch-2.1 Commit: f88b30e9e928746790445a98224bd38a28a8ca9c Parents: ebf56d0 Author: Billie Rinaldi <[email protected]> Authored: Thu Jun 11 14:16:05 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Thu Jun 11 14:18:37 2015 -0700 ---------------------------------------------------------------------- .../package/scripts/accumulo_service.py | 17 ----------------- 1 file changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f88b30e9/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py index 0c35c98..14050c3 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py @@ -47,23 +47,6 @@ def accumulo_service( name, elif action == 'stop': no_pid_exists = format("! ({pid_exists})") - try: - if name == 'master': - Execute(format("{daemon_script} admin stopMaster"), - not_if=no_pid_exists, - timeout=30, - user=params.accumulo_user - ) - elif name == 'tserver': - Execute(format("{daemon_script} admin stop {hostname}"), - not_if=no_pid_exists, - timeout=30, - user=params.accumulo_user - ) - except: - pass - - time.sleep(5) pid = format("`cat {pid_file}` >/dev/null 2>&1") Execute(format("kill {pid}"),
