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 2013/12/30 13:22:26 UTC
[2/2] git commit: AMBARI-4181. Hive service check timeouts on
enabling security 2.0.8 sometimes (Arsen Babych via aonishuk)
AMBARI-4181. Hive service check timeouts on enabling security 2.0.8
sometimes (Arsen Babych via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7326ebe5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7326ebe5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7326ebe5
Branch: refs/heads/trunk
Commit: 7326ebe580113048b5fabb1e01684e2883fa2b2a
Parents: 1dc1cf1
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Mon Dec 30 04:21:00 2013 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Mon Dec 30 04:21:00 2013 -0800
----------------------------------------------------------------------
.../stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py | 9 ++++-----
.../HDP/1.3._/services/HIVE/package/scripts/hive_client.py | 2 +-
.../1.3._/services/HIVE/package/scripts/hive_metastore.py | 2 +-
.../HDP/1.3._/services/HIVE/package/scripts/hive_server.py | 2 +-
.../stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py | 9 ++++-----
.../HDP/2.0.8/services/HIVE/package/scripts/hive_client.py | 2 +-
.../2.0.8/services/HIVE/package/scripts/hive_metastore.py | 2 +-
.../HDP/2.0.8/services/HIVE/package/scripts/hive_server.py | 2 +-
8 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py
index 1963762..b37ebb2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive.py
@@ -22,18 +22,17 @@ from resource_management import *
import sys
-def hive(type=None, name=None):
+def hive(name=None):
import params
- if name == 'hiveserver2':
+ if name == 'metastore' or name == 'hiveserver2':
hive_config_dir = params.hive_server_conf_dir
config_file_mode = 0600
+ jdbc_connector()
else:
hive_config_dir = params.hive_conf_dir
config_file_mode = 0644
- jdbc_connector()
-
Directory(hive_config_dir,
owner=params.hive_user,
group=params.user_group,
@@ -66,7 +65,7 @@ def hive(type=None, name=None):
content=StaticFile('startHiveserver2.sh')
)
- if type != "client":
+ if name != "client":
crt_directory(params.hive_pid_dir)
crt_directory(params.hive_log_dir)
crt_directory(params.hive_var_lib)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_client.py b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_client.py
index 04e28ba..0a5fb2b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_client.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_client.py
@@ -31,7 +31,7 @@ class HiveClient(Script):
import params
env.set_params(params)
- hive(type='client')
+ hive(name='client')
def status(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_metastore.py
index da7ed18..c741174 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_metastore.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_metastore.py
@@ -34,7 +34,7 @@ class HiveMetastore(Script):
import params
env.set_params(params)
- hive(type='master', name='metastore')
+ hive(name='metastore')
def start(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_server.py
index 3dc7d3d..3ad81a1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3._/services/HIVE/package/scripts/hive_server.py
@@ -33,7 +33,7 @@ class HiveServer(Script):
import params
env.set_params(params)
- hive(type='master', name='hiveserver2')
+ hive(name='hiveserver2')
def start(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py
index 1963762..b37ebb2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive.py
@@ -22,18 +22,17 @@ from resource_management import *
import sys
-def hive(type=None, name=None):
+def hive(name=None):
import params
- if name == 'hiveserver2':
+ if name == 'metastore' or name == 'hiveserver2':
hive_config_dir = params.hive_server_conf_dir
config_file_mode = 0600
+ jdbc_connector()
else:
hive_config_dir = params.hive_conf_dir
config_file_mode = 0644
- jdbc_connector()
-
Directory(hive_config_dir,
owner=params.hive_user,
group=params.user_group,
@@ -66,7 +65,7 @@ def hive(type=None, name=None):
content=StaticFile('startHiveserver2.sh')
)
- if type != "client":
+ if name != "client":
crt_directory(params.hive_pid_dir)
crt_directory(params.hive_log_dir)
crt_directory(params.hive_var_lib)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_client.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_client.py
index 04e28ba..0a5fb2b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_client.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_client.py
@@ -31,7 +31,7 @@ class HiveClient(Script):
import params
env.set_params(params)
- hive(type='client')
+ hive(name='client')
def status(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_metastore.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_metastore.py
index da7ed18..c741174 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_metastore.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_metastore.py
@@ -34,7 +34,7 @@ class HiveMetastore(Script):
import params
env.set_params(params)
- hive(type='master', name='metastore')
+ hive(name='metastore')
def start(self, env):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/7326ebe5/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_server.py
index 3dc7d3d..3ad81a1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/hive_server.py
@@ -33,7 +33,7 @@ class HiveServer(Script):
import params
env.set_params(params)
- hive(type='master', name='hiveserver2')
+ hive(name='hiveserver2')
def start(self, env):
import params