ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From magyari_san...@apache.org
Subject ambari git commit: AMBARI-19414. Cannot install Accumulo via blueprint with default settings (Attila Doroszlai via magyari_sandor)
Date Mon, 16 Jan 2017 14:56:54 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bd0237636 -> a4015da1b


AMBARI-19414. Cannot install Accumulo via blueprint with default settings (Attila Doroszlai
via magyari_sandor)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4015da1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4015da1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4015da1

Branch: refs/heads/trunk
Commit: a4015da1be687b7a1c0e296c893356403d876127
Parents: bd02376
Author: Attila Doroszlai <adoroszlai@hortonworks.com>
Authored: Mon Jan 16 15:51:26 2017 +0100
Committer: Sandor Magyari <smagyari@hortonworks.com>
Committed: Mon Jan 16 15:51:26 2017 +0100

----------------------------------------------------------------------
 .../1.6.1.2.2.0/package/scripts/accumulo_script.py    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4015da1/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
index f9d5fce..01fbce2 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
@@ -48,11 +48,7 @@ class AccumuloScript(Script):
   }
 
   def __init__(self, component):
-    import status_params
-    env.set_params(status_params)
-
     self.component = component
-    self.pid_file = format("{pid_dir}/accumulo-{accumulo_user}-{component}.pid")
 
 
   def get_component_name(self):
@@ -98,7 +94,8 @@ class AccumuloScript(Script):
     import status_params
     env.set_params(status_params)
 
-    check_process_status(self.pid_file)
+    pid_file = self.get_pid_files()[0]
+    check_process_status(pid_file)
 
 
   def pre_upgrade_restart(self, env, upgrade_type=None):
@@ -179,9 +176,12 @@ class AccumuloScript(Script):
 
   def get_pid_files(self):
     import status_params
-    env.set_params(status_params)
 
-    return [self.pid_file]
+    pid_file = "{pid_dir}/accumulo-{accumulo_user}-{component}.pid".format(
+        pid_dir = status_params.pid_dir,
+        accumulo_user = status_params.accumulo_user,
+        component = self.component)
+    return [pid_file]
 
   def get_user(self):
     import params


Mime
View raw message