ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject ambari git commit: AMBARI-11863 Stopping Accumulo tservers can deadlock (billie)
Date Thu, 11 Jun 2015 21:17:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5cdafecfb -> d6900c1b2


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/d6900c1b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6900c1b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6900c1b

Branch: refs/heads/trunk
Commit: d6900c1b20c9465e48e452b2f2c0f54fe0cee22d
Parents: 5cdafec
Author: Billie Rinaldi <billie.rinaldi@gmail.com>
Authored: Thu Jun 11 14:16:05 2015 -0700
Committer: Billie Rinaldi <billie.rinaldi@gmail.com>
Committed: Thu Jun 11 14:16:32 2015 -0700

----------------------------------------------------------------------
 .../package/scripts/accumulo_service.py            | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6900c1b/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}"),


Mime
View raw message