You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/02/27 16:17:26 UTC
git commit: AMBARI-4868. HBase install with custom user name does not
work properly (Eugene Chekanskiy via dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9eef77a0e -> 62aa47bef
AMBARI-4868. HBase install with custom user name does not work properly (Eugene Chekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62aa47be
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62aa47be
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62aa47be
Branch: refs/heads/trunk
Commit: 62aa47bef78d04edd88676f0acc0a7da0d1f2d00
Parents: 9eef77a
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Thu Feb 27 17:16:21 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Thu Feb 27 17:16:21 2014 +0200
----------------------------------------------------------------------
.../HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py | 2 +-
.../HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py | 2 +-
.../HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py | 2 +-
.../stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py | 2 +-
.../HDP/1.3.2/services/HBASE/package/scripts/status_params.py | 1 +
.../HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py | 2 +-
.../HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py | 2 +-
.../HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py | 2 +-
.../stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py | 2 +-
.../HDP/2.0.6/services/HBASE/package/scripts/status_params.py | 1 +
10 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py
index 1073dd9..a26254d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_master.py
@@ -56,7 +56,7 @@ class HbaseMaster(Script):
def status(self, env):
import status_params
env.set_params(status_params)
- pid_file = format("{pid_dir}/hbase-hbase-master.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-master.pid")
check_process_status(pid_file)
def decommission(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py
index 232b500..8d66dcc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_regionserver.py
@@ -55,7 +55,7 @@ class HbaseRegionServer(Script):
def status(self, env):
import status_params
env.set_params(status_params)
- pid_file = format("{pid_dir}/hbase-hbase-regionserver.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-regionserver.pid")
check_process_status(pid_file)
def decommission(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py
index 7a1248b..17f0056 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_service.py
@@ -28,7 +28,7 @@ def hbase_service(
role = name
cmd = format("{daemon_script} --config {conf_dir}")
- pid_file = format("{pid_dir}/hbase-hbase-{role}.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-{role}.pid")
daemon_cmd = None
no_op_test = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index f2ec497..80ce0d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -33,7 +33,7 @@ hbase_cmd = "/usr/lib/hbase/bin/hbase"
hbase_excluded_hosts = config['commandParams']['excluded_hosts']
hbase_drain_only = config['commandParams']['mark_draining_only']
-hbase_user = config['configurations']['global']['hbase_user']
+hbase_user = status_params.hbase_user
smokeuser = config['configurations']['global']['smokeuser']
_authentication = config['configurations']['core-site']['hadoop.security.authentication']
security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/status_params.py
index c9b20ef..8360507 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/status_params.py
@@ -23,3 +23,4 @@ from resource_management import *
config = Script.get_config()
pid_dir = config['configurations']['global']['hbase_pid_dir']
+hbase_user = config['configurations']['global']['hbase_user']
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py
index 1073dd9..a26254d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_master.py
@@ -56,7 +56,7 @@ class HbaseMaster(Script):
def status(self, env):
import status_params
env.set_params(status_params)
- pid_file = format("{pid_dir}/hbase-hbase-master.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-master.pid")
check_process_status(pid_file)
def decommission(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py
index 232b500..8d66dcc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_regionserver.py
@@ -55,7 +55,7 @@ class HbaseRegionServer(Script):
def status(self, env):
import status_params
env.set_params(status_params)
- pid_file = format("{pid_dir}/hbase-hbase-regionserver.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-regionserver.pid")
check_process_status(pid_file)
def decommission(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py
index 7a1248b..17f0056 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_service.py
@@ -28,7 +28,7 @@ def hbase_service(
role = name
cmd = format("{daemon_script} --config {conf_dir}")
- pid_file = format("{pid_dir}/hbase-hbase-{role}.pid")
+ pid_file = format("{pid_dir}/hbase-{hbase_user}-{role}.pid")
daemon_cmd = None
no_op_test = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index 68b22da..3b1316c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -33,7 +33,7 @@ hbase_cmd = "/usr/lib/hbase/bin/hbase"
hbase_excluded_hosts = config['commandParams']['excluded_hosts']
hbase_drain_only = config['commandParams']['mark_draining_only']
-hbase_user = config['configurations']['global']['hbase_user']
+hbase_user = status_params.hbase_user
smokeuser = config['configurations']['global']['smokeuser']
_authentication = config['configurations']['core-site']['hadoop.security.authentication']
security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')
http://git-wip-us.apache.org/repos/asf/ambari/blob/62aa47be/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/status_params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/status_params.py
index c9b20ef..8360507 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/status_params.py
@@ -23,3 +23,4 @@ from resource_management import *
config = Script.get_config()
pid_dir = config['configurations']['global']['hbase_pid_dir']
+hbase_user = config['configurations']['global']['hbase_user']