You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/10/19 13:25:47 UTC
[1/2] ambari git commit: AMBARI-13467. ACCUMULO_MASTER start is
failing (Josh Elser via aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 66de959d8 -> c308ea513
refs/heads/trunk 0ccc873e8 -> 87999547f
AMBARI-13467. ACCUMULO_MASTER start is failing (Josh Elser via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87999547
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87999547
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87999547
Branch: refs/heads/trunk
Commit: 87999547f18c560744a2296853e9106ca377ad5a
Parents: 0ccc873
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Oct 19 14:25:30 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Oct 19 14:25:30 2015 +0300
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/87999547/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 6b3aae1..a4e9c54 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
@@ -37,7 +37,7 @@ def accumulo_service( name,
ignore_failures=True)
if name != 'tserver':
Execute(format("{daemon_script} org.apache.accumulo.master.state.SetGoalState NORMAL"),
- not_if=pid_exists,
+ not_if=as_user(pid_exists, params.accumulo_user),
user=params.accumulo_user
)
address = params.hostname
@@ -45,7 +45,7 @@ def accumulo_service( name,
address = '0.0.0.0'
daemon_cmd = format("{daemon_script} {role} --address {address} > {log_dir}/accumulo-{role}.out 2>{log_dir}/accumulo-{role}.err & echo $! > {pid_file}")
Execute ( daemon_cmd,
- not_if=pid_exists,
+ not_if=as_user(pid_exists, params.accumulo_user),
user=params.accumulo_user
)
@@ -54,11 +54,11 @@ def accumulo_service( name,
pid = format("`cat {pid_file}` >/dev/null 2>&1")
Execute(format("kill {pid}"),
- not_if=no_pid_exists,
+ not_if=as_user(no_pid_exists, params.accumulo_user),
user=params.accumulo_user
)
Execute(format("kill -9 {pid}"),
- not_if=format("sleep 2; {no_pid_exists} || sleep 20; {no_pid_exists}"),
+ not_if=as_user(format("sleep 2; {no_pid_exists} || sleep 20; {no_pid_exists}"), params.accumulo_user),
ignore_failures=True,
user=params.accumulo_user
)
[2/2] ambari git commit: AMBARI-13467. ACCUMULO_MASTER start is
failing (Josh Elser via aonishuk)
Posted by ao...@apache.org.
AMBARI-13467. ACCUMULO_MASTER start is failing (Josh Elser via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c308ea51
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c308ea51
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c308ea51
Branch: refs/heads/branch-2.1
Commit: c308ea513a4a592d7335e9a9a3c23469989b9e6e
Parents: 66de959
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Oct 19 14:25:33 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Oct 19 14:25:33 2015 +0300
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c308ea51/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 6b3aae1..a4e9c54 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
@@ -37,7 +37,7 @@ def accumulo_service( name,
ignore_failures=True)
if name != 'tserver':
Execute(format("{daemon_script} org.apache.accumulo.master.state.SetGoalState NORMAL"),
- not_if=pid_exists,
+ not_if=as_user(pid_exists, params.accumulo_user),
user=params.accumulo_user
)
address = params.hostname
@@ -45,7 +45,7 @@ def accumulo_service( name,
address = '0.0.0.0'
daemon_cmd = format("{daemon_script} {role} --address {address} > {log_dir}/accumulo-{role}.out 2>{log_dir}/accumulo-{role}.err & echo $! > {pid_file}")
Execute ( daemon_cmd,
- not_if=pid_exists,
+ not_if=as_user(pid_exists, params.accumulo_user),
user=params.accumulo_user
)
@@ -54,11 +54,11 @@ def accumulo_service( name,
pid = format("`cat {pid_file}` >/dev/null 2>&1")
Execute(format("kill {pid}"),
- not_if=no_pid_exists,
+ not_if=as_user(no_pid_exists, params.accumulo_user),
user=params.accumulo_user
)
Execute(format("kill -9 {pid}"),
- not_if=format("sleep 2; {no_pid_exists} || sleep 20; {no_pid_exists}"),
+ not_if=as_user(format("sleep 2; {no_pid_exists} || sleep 20; {no_pid_exists}"), params.accumulo_user),
ignore_failures=True,
user=params.accumulo_user
)