[1/3] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Repository: ambari
Updated Branches:
refs/heads/trunk d256ab8f9 -> 37af1a64f
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit d256ab8f94e9dc1292c9ce69e76235b215ca8dc0.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/742d404e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/742d404e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/742d404e
Branch: refs/heads/trunk
Commit: 742d404efff2c985ebd959fbecd20fa7fbc78530
Parents: d256ab8
Author: Siddharth Wagle
Authored: Thu Nov 6 20:57:03 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:57:03 2014 -0800
--
.../python/resource_management/core/source.py | 3 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22 +++
.../services/HDFS/package/scripts/utils.py | 18 ++
.../services/HDFS/configuration/hadoop-env.xml | 7 ++-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 64 +---
5 files changed, 87 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/742d404e/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py
b/ambari-common/src/main/python/resource_management/core/source.py
index bff22f3..22e1c6d 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -114,8 +114,7 @@ else:
self.context = variables.copy() if variables else {}
if not hasattr(self, 'template_env'):
self.template_env = JinjaEnvironment(loader=TemplateLoader(self.env),
-autoescape=False,
undefined=StrictUndefined,
-trim_blocks=True)
+autoescape=False,
undefined=StrictUndefined, trim_blocks=True)
self.template = self.template_env.get_template(self.name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/742d404e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index 25c1067..c192682 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,3 +81,25 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
+
+def setup_hadoop_env(replace=False):
+ import params
+
+ if params.security_enabled:
+tc_owner = "root"
+ else:
+tc_owner = params.hdfs_user
+ Directory(params.hadoop_conf_empty_dir,
+recursive=True,
+owner='root',
+group='root'
+ )
+ Link(params.hadoop_conf_dir,
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
+ )
+ File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
+ owner=tc_owner,
+ content=InlineTemplate(params.hadoop_env_sh_template),
+ replace=replace
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/742d404e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 0983c3f..150d0a4 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -103,22 +103,11 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
pass
pass
- service_is_up = check_process if action == "start" else None
-
# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
# in secure mode.
- set_secure_dn_user_cmd="sed -i 's/export HADOOP_SECURE_DN_USER=.*/export " \
-"HADOOP_SECURE_DN_USER=\"{0}\"/' {1}"
- if name == 'datanode' and action == 'start':
-if user == 'root':
- secure_dn_user = params.hdfs_user
-else:
- secure_dn_user = ""
-pass
-
-Execute(set_secure_dn_user_cmd.format(secure_dn_user,
- os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh')),
-not_if=service_is_up)
+ if name == 'd
[3/3] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit a4b8c9b30f2756cb24ee372e5741d76db7b517a1.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37af1a64
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37af1a64
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37af1a64
Branch: refs/heads/trunk
Commit: 37af1a64f4eb32c839933ad1b436eae5da3136a8
Parents: be0a3c1
Author: Siddharth Wagle
Authored: Thu Nov 6 20:59:11 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:59:11 2014 -0800
--
.../2.0.6/hooks/before-ANY/scripts/params.py| 2 -
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22
.../services/HDFS/package/scripts/params.py | 2 -
.../services/HDFS/package/scripts/utils.py | 12 +
.../services/HDFS/configuration/hadoop-env.xml | 7 ---
.../python/stacks/2.0.6/HDFS/test_datanode.py | 57
6 files changed, 2 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/37af1a64/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index ddb2b0b..fa3b118 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -136,5 +136,3 @@ if has_nagios:
user_list = json.loads(config['hostLevelParams']['user_list'])
group_list = json.loads(config['hostLevelParams']['group_list'])
-
-dn_proc_user=hdfs_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/37af1a64/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index c192682..25c1067 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,25 +81,3 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
-
-def setup_hadoop_env(replace=False):
- import params
-
- if params.security_enabled:
-tc_owner = "root"
- else:
-tc_owner = params.hdfs_user
- Directory(params.hadoop_conf_empty_dir,
-recursive=True,
-owner='root',
-group='root'
- )
- Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir,
- not_if=format("ls {hadoop_conf_dir}")
- )
- File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
- owner=tc_owner,
- content=InlineTemplate(params.hadoop_env_sh_template),
- replace=replace
- )
http://git-wip-us.apache.org/repos/asf/ambari/blob/37af1a64/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 7e446f1..22ce519 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -253,5 +253,3 @@ ttnode_heapsize = "1024m"
dtnode_heapsize = config['configurations']['hadoop-env']['dtnode_heapsize']
mapred_pid_dir_prefix =
default("/configurations/mapred-env/mapred_pid_dir_prefix","/var/run/hadoop-mapreduce")
mapred_log_dir_prefix =
default("/configurations/mapred-env/mapred_log_dir_prefix","/var/log/hadoop-mapreduce")
-
-dn_proc_user=hdfs_user
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/37af1a64/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 08358f5..a52dc77 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/sc
[2/3] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit 24c39273ff0487c71f5688c14bf2ef8df9786210.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be0a3c15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be0a3c15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be0a3c15
Branch: refs/heads/trunk
Commit: be0a3c15ec23e62cfa2ec9ae3ff542f77c823cd8
Parents: 742d404
Author: Siddharth Wagle
Authored: Thu Nov 6 20:57:56 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:57:56 2014 -0800
--
.../HDP/2.0.6/services/HDFS/package/scripts/utils.py| 12 ++--
.../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/be0a3c15/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 150d0a4..08358f5 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -101,13 +101,13 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
except OSError:
pass # Process is not running
pass
- pass
- # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
- # in secure mode.
- if name == 'datanode' and user == 'root':
-params.dn_proc_user = 'root'
-hdfs.setup_hadoop_env(replace=True)
+# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as
root
+# in secure mode.
+if user == 'root':
+ params.dn_proc_user = 'root'
+ hdfs.setup_hadoop_env(replace=True)
+pass
pass
hadoop_env_exports_str = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/be0a3c15/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index d186922..9b43c20 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
HDFS_DN_PROC_USER={{dn_proc_user}}
-if [ $HDFS_DN_PROC_USER == "root" ]; then
+if [ $HDFS_DN_PROC_USER="root" ]; then
export HADOOP_SECURE_DN_USER="{{hdfs_user}}"
else
export HADOOP_SECURE_DN_USER=""
[2/4] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit c75578a41e80def8841dbebc566a80474f89a8fb.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e2201c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e2201c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e2201c0
Branch: refs/heads/branch-1.7.0
Commit: 4e2201c0da112219d21f6e1f4be106ecc4290ce3
Parents: f09a3ca
Author: Siddharth Wagle
Authored: Thu Nov 6 20:50:55 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:50:55 2014 -0800
--
.../HDP/2.0.6/services/HDFS/package/scripts/utils.py| 12 ++--
.../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2201c0/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index c177d9c..36fbc86 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -101,13 +101,13 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
except OSError:
pass # Process is not running
pass
- pass
- # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
- # in secure mode.
- if name == 'datanode' and user == 'root':
-params.dn_proc_user = 'root'
-hdfs.setup_hadoop_env(replace=True)
+# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as
root
+# in secure mode.
+if user == 'root':
+ params.dn_proc_user = 'root'
+ hdfs.setup_hadoop_env(replace=True)
+pass
pass
hadoop_env_exports_str = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2201c0/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index d186922..9b43c20 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
HDFS_DN_PROC_USER={{dn_proc_user}}
-if [ $HDFS_DN_PROC_USER == "root" ]; then
+if [ $HDFS_DN_PROC_USER="root" ]; then
export HADOOP_SECURE_DN_USER="{{hdfs_user}}"
else
export HADOOP_SECURE_DN_USER=""
[4/4] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit b5ed44138a9781acc6eea877eb71a670f4adaa90.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eacb2812
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eacb2812
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eacb2812
Branch: refs/heads/branch-1.7.0
Commit: eacb28127744e320417438b8ac8c1ef4388b69d8
Parents: 44dce92
Author: Siddharth Wagle
Authored: Thu Nov 6 20:52:39 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:52:39 2014 -0800
--
.../2.0.6/hooks/before-ANY/scripts/params.py| 3 --
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22
.../services/HDFS/package/scripts/params.py | 2 -
.../services/HDFS/package/scripts/utils.py | 12 +
.../services/HDFS/configuration/hadoop-env.xml | 7 ---
.../python/stacks/2.0.6/HDFS/test_datanode.py | 57
6 files changed, 2 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eacb2812/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 6389f33..fa3b118 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -136,6 +136,3 @@ if has_nagios:
user_list = json.loads(config['hostLevelParams']['user_list'])
group_list = json.loads(config['hostLevelParams']['group_list'])
-
-if security_enabled :
- dn_proc_user=hdfs_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/eacb2812/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index c192682..25c1067 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,25 +81,3 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
-
-def setup_hadoop_env(replace=False):
- import params
-
- if params.security_enabled:
-tc_owner = "root"
- else:
-tc_owner = params.hdfs_user
- Directory(params.hadoop_conf_empty_dir,
-recursive=True,
-owner='root',
-group='root'
- )
- Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir,
- not_if=format("ls {hadoop_conf_dir}")
- )
- File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
- owner=tc_owner,
- content=InlineTemplate(params.hadoop_env_sh_template),
- replace=replace
- )
http://git-wip-us.apache.org/repos/asf/ambari/blob/eacb2812/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 7e446f1..22ce519 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -253,5 +253,3 @@ ttnode_heapsize = "1024m"
dtnode_heapsize = config['configurations']['hadoop-env']['dtnode_heapsize']
mapred_pid_dir_prefix =
default("/configurations/mapred-env/mapred_pid_dir_prefix","/var/run/hadoop-mapreduce")
mapred_log_dir_prefix =
default("/configurations/mapred-env/mapred_log_dir_prefix","/var/log/hadoop-mapreduce")
-
-dn_proc_user=hdfs_user
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/eacb2812/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 36fbc86..14251cd 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/H
[1/4] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 b7f10831d -> eacb28127
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit b7f10831d48de70052bc308596237775c12494a4.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f09a3caa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f09a3caa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f09a3caa
Branch: refs/heads/branch-1.7.0
Commit: f09a3caa212e772f65f79b8dbcc96b5ca330980e
Parents: b7f1083
Author: Siddharth Wagle
Authored: Thu Nov 6 20:50:10 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 20:50:10 2014 -0800
--
.../python/resource_management/core/source.py | 3 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22 +++
.../services/HDFS/package/scripts/utils.py | 18 ++
.../services/HDFS/configuration/hadoop-env.xml | 7 ++-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 64 +---
5 files changed, 87 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f09a3caa/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py
b/ambari-common/src/main/python/resource_management/core/source.py
index bff22f3..22e1c6d 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -114,8 +114,7 @@ else:
self.context = variables.copy() if variables else {}
if not hasattr(self, 'template_env'):
self.template_env = JinjaEnvironment(loader=TemplateLoader(self.env),
-autoescape=False,
undefined=StrictUndefined,
-trim_blocks=True)
+autoescape=False,
undefined=StrictUndefined, trim_blocks=True)
self.template = self.template_env.get_template(self.name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/f09a3caa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index 25c1067..c192682 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,3 +81,25 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
+
+def setup_hadoop_env(replace=False):
+ import params
+
+ if params.security_enabled:
+tc_owner = "root"
+ else:
+tc_owner = params.hdfs_user
+ Directory(params.hadoop_conf_empty_dir,
+recursive=True,
+owner='root',
+group='root'
+ )
+ Link(params.hadoop_conf_dir,
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
+ )
+ File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
+ owner=tc_owner,
+ content=InlineTemplate(params.hadoop_env_sh_template),
+ replace=replace
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/f09a3caa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 28a9ccb..c177d9c 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -103,22 +103,11 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
pass
pass
- service_is_up = check_process if action == "start" else None
-
# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
# in secure mode.
- set_secure_dn_user_cmd="sed -i 's/export HADOOP_SECURE_DN_USER=.*/export " \
-"HADOOP_SECURE_DN_USER=\"{0}\"/' {1}"
- if name == 'datanode' and action == 'start':
-if user == 'root':
- secure_dn_user = params.hdfs_user
-else:
- secure_dn_user = ""
-pass
-
-Execute(set_secure_dn_user_cmd.format(secure_dn_user,
- os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh')),
-not_if=service_is_up)
+
[3/4] ambari git commit: Revert "AMBARI-8174. Reverting all patches. (swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)" This reverts commit a7e1a379330af4370f219e476f04a280d2ac9643. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44dce929 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44dce929 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44dce929 Branch: refs/heads/branch-1.7.0 Commit: 44dce929aad6b71f1eed18c0b08c52bbf4b6a1d6 Parents: 4e2201c Author: Siddharth Wagle Authored: Thu Nov 6 20:51:49 2014 -0800 Committer: Siddharth Wagle Committed: Thu Nov 6 20:51:49 2014 -0800 -- .../resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/44dce929/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index ddb2b0b..6389f33 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -137,4 +137,5 @@ if has_nagios: user_list = json.loads(config['hostLevelParams']['user_list']) group_list = json.loads(config['hostLevelParams']['group_list']) -dn_proc_user=hdfs_user +if security_enabled : + dn_proc_user=hdfs_user
ambari git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 41cf385ff -> d256ab8f9
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d256ab8f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d256ab8f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d256ab8f
Branch: refs/heads/trunk
Commit: d256ab8f94e9dc1292c9ce69e76235b215ca8dc0
Parents: 41cf385
Author: Siddharth Wagle
Authored: Thu Nov 6 19:11:39 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 19:11:39 2014 -0800
--
.../python/resource_management/core/source.py | 3 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22 ---
.../services/HDFS/package/scripts/utils.py | 18 --
.../services/HDFS/configuration/hadoop-env.xml | 7 +--
.../python/stacks/2.0.6/HDFS/test_datanode.py | 64 +++-
5 files changed, 27 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d256ab8f/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py
b/ambari-common/src/main/python/resource_management/core/source.py
index 22e1c6d..bff22f3 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -114,7 +114,8 @@ else:
self.context = variables.copy() if variables else {}
if not hasattr(self, 'template_env'):
self.template_env = JinjaEnvironment(loader=TemplateLoader(self.env),
-autoescape=False,
undefined=StrictUndefined, trim_blocks=True)
+autoescape=False,
undefined=StrictUndefined,
+trim_blocks=True)
self.template = self.template_env.get_template(self.name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d256ab8f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index c192682..25c1067 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,25 +81,3 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
-
-def setup_hadoop_env(replace=False):
- import params
-
- if params.security_enabled:
-tc_owner = "root"
- else:
-tc_owner = params.hdfs_user
- Directory(params.hadoop_conf_empty_dir,
-recursive=True,
-owner='root',
-group='root'
- )
- Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir,
- not_if=format("ls {hadoop_conf_dir}")
- )
- File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
- owner=tc_owner,
- content=InlineTemplate(params.hadoop_env_sh_template),
- replace=replace
- )
http://git-wip-us.apache.org/repos/asf/ambari/blob/d256ab8f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 150d0a4..0983c3f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -103,11 +103,22 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
pass
pass
+ service_is_up = check_process if action == "start" else None
+
# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
# in secure mode.
- if name == 'datanode' and user == 'root':
-params.dn_proc_user = 'root'
-hdfs.setup_hadoop_env(replace=True)
+ set_secure_dn_user_cmd="sed -i 's/export HADOOP_SECURE_DN_USER=.*/export " \
+"HADOOP_SECURE_DN_USER=\"{0}\"/' {1}"
+ if name == 'datanode' and action == 'start':
+if user == 'root':
+ secure_dn_user = params.hdfs_user
+else:
+ secure_dn_user = ""
+pass
+
+Execute(set_secure_dn_user_cmd.format(secure_dn_user,
+ os.path.j
ambari git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 9502f0c9d -> b7f10831d
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7f10831
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7f10831
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7f10831
Branch: refs/heads/branch-1.7.0
Commit: b7f10831d48de70052bc308596237775c12494a4
Parents: 9502f0c
Author: Siddharth Wagle
Authored: Thu Nov 6 19:10:05 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 19:10:15 2014 -0800
--
.../python/resource_management/core/source.py | 3 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22 ---
.../services/HDFS/package/scripts/utils.py | 18 --
.../services/HDFS/configuration/hadoop-env.xml | 7 +--
.../python/stacks/2.0.6/HDFS/test_datanode.py | 64 +++-
5 files changed, 27 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f10831/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py
b/ambari-common/src/main/python/resource_management/core/source.py
index 22e1c6d..bff22f3 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -114,7 +114,8 @@ else:
self.context = variables.copy() if variables else {}
if not hasattr(self, 'template_env'):
self.template_env = JinjaEnvironment(loader=TemplateLoader(self.env),
-autoescape=False,
undefined=StrictUndefined, trim_blocks=True)
+autoescape=False,
undefined=StrictUndefined,
+trim_blocks=True)
self.template = self.template_env.get_template(self.name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f10831/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index c192682..25c1067 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,25 +81,3 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
-
-def setup_hadoop_env(replace=False):
- import params
-
- if params.security_enabled:
-tc_owner = "root"
- else:
-tc_owner = params.hdfs_user
- Directory(params.hadoop_conf_empty_dir,
-recursive=True,
-owner='root',
-group='root'
- )
- Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir,
- not_if=format("ls {hadoop_conf_dir}")
- )
- File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
- owner=tc_owner,
- content=InlineTemplate(params.hadoop_env_sh_template),
- replace=replace
- )
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f10831/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index c177d9c..28a9ccb 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -103,11 +103,22 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
pass
pass
+ service_is_up = check_process if action == "start" else None
+
# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
# in secure mode.
- if name == 'datanode' and user == 'root':
-params.dn_proc_user = 'root'
-hdfs.setup_hadoop_env(replace=True)
+ set_secure_dn_user_cmd="sed -i 's/export HADOOP_SECURE_DN_USER=.*/export " \
+"HADOOP_SECURE_DN_USER=\"{0}\"/' {1}"
+ if name == 'datanode' and action == 'start':
+if user == 'root':
+ secure_dn_user = params.hdfs_user
+else:
+ secure_dn_user = ""
+pass
+
+Execute(set_secure_dn_user_cmd.format(secure_dn_user,
+
ambari git commit: AMBARI-8148. Rolling Upgrade Bootstrap - Create new tables and populate during the installation of a new cluster (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 5172bdf2a -> 41cf385ff
AMBARI-8148. Rolling Upgrade Bootstrap - Create new tables and populate during
the installation of a new cluster (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41cf385f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41cf385f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41cf385f
Branch: refs/heads/trunk
Commit: 41cf385ffe59c297f4a1a7c4c72866186fcc4cea
Parents: 5172bdf
Author: Alejandro Fernandez
Authored: Mon Nov 3 19:10:29 2014 -0800
Committer: Alejandro Fernandez
Committed: Thu Nov 6 16:47:12 2014 -0800
--
.../server/orm/entities/ClusterEntity.java | 9 +
.../orm/entities/ClusterVersionEntity.java | 177 +++
.../orm/entities/HostComponentStateEntity.java | 15 ++
.../ambari/server/orm/entities/HostEntity.java | 24 ++-
.../server/orm/entities/HostVersionEntity.java | 143 +++
.../server/state/ClusterVersionState.java | 81 +
.../ambari/server/state/HostVersionState.java | 49 +
.../server/state/ServiceComponentHost.java | 2 +
.../svccomphost/ServiceComponentHostImpl.java | 25 +++
.../server/upgrade/UpgradeCatalog200.java | 65 ++-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 39 +++-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 38 +++-
.../resources/Ambari-DDL-Postgres-CREATE.sql| 40 -
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 38 +++-
.../src/main/resources/META-INF/persistence.xml | 2 +
.../server/upgrade/UpgradeCatalog200Test.java | 47 +
.../src/test/python/TestAmbariServer.py | 2 +-
17 files changed, 780 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/41cf385f/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
index b030ea1..69a2a9d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
@@ -121,6 +121,9 @@ public class ClusterEntity {
@OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.REMOVE, fetch =
FetchType.LAZY)
private Collection alertDefinitionEntities;
+ @OneToMany(mappedBy = "clusterEntity", cascade = CascadeType.REMOVE, fetch =
FetchType.LAZY)
+ private Collection clusterVersionEntities;
+
@OneToOne(cascade = CascadeType.ALL)
@JoinColumns({
@JoinColumn(name = "resource_id", referencedColumnName = "resource_id",
nullable = false)
@@ -285,6 +288,12 @@ public class ClusterEntity {
return alertDefinitionEntities;
}
+ public Collection getClusterVersionEntities() {
+return clusterVersionEntities;
+ }
+
+ public void setClusterVersionEntities(Collection
clusterVersionEntities) { this.clusterVersionEntities = clusterVersionEntities;
}
+
/**
* Get the admin resource entity.
*
http://git-wip-us.apache.org/repos/asf/ambari/blob/41cf385f/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
new file mode 100644
index 000..9daa70e
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
@@ -0,0 +1,177 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.orm.entities;
+
+import org.apache.ambari.server.state.ClusterVersionState;
+
+import javax.persistenc
ambari git commit: AMBARI-8060. [Test] The framework executes the tests in random order, which makes some tests fail inconsistently (Florian Barca via alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev 9cff20bf1 -> 051f5e160
AMBARI-8060. [Test] The framework executes the tests in random order, which
makes some tests fail inconsistently (Florian Barca via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/051f5e16
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/051f5e16
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/051f5e16
Branch: refs/heads/branch-windows-dev
Commit: 051f5e1604fb0c66a062a8a62f2824e2799986f8
Parents: 9cff20b
Author: Alejandro Fernandez
Authored: Thu Nov 6 16:42:49 2014 -0800
Committer: Alejandro Fernandez
Committed: Thu Nov 6 16:42:49 2014 -0800
--
ambari-agent/src/test/python/unitTests.py | 6 --
ambari-server/src/test/python/unitTests.py | 6 --
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/051f5e16/ambari-agent/src/test/python/unitTests.py
--
diff --git a/ambari-agent/src/test/python/unitTests.py
b/ambari-agent/src/test/python/unitTests.py
index 082e1a1..83b6bdf 100644
--- a/ambari-agent/src/test/python/unitTests.py
+++ b/ambari-agent/src/test/python/unitTests.py
@@ -23,7 +23,8 @@ import doctest
from os.path import dirname, split, isdir
import logging.handlers
import logging
-from random import shuffle
+#TODO Add an option to randomize the tests' execution
+#from random import shuffle
LOG_FILE_NAME='tests.log'
SELECTED_PREFIX = "_"
@@ -55,7 +56,8 @@ def all_tests_suite():
for directory in os.listdir(src_dir):
if os.path.isdir(directory):
files_list += os.listdir(src_dir + os.sep + directory)
- shuffle(files_list)
+ #TODO Add an option to randomize the tests' execution
+ #shuffle(files_list)
tests_list = []
logger.info('TESTS
LIST:-')
http://git-wip-us.apache.org/repos/asf/ambari/blob/051f5e16/ambari-server/src/test/python/unitTests.py
--
diff --git a/ambari-server/src/test/python/unitTests.py
b/ambari-server/src/test/python/unitTests.py
index 773a698..f1e70e1 100644
--- a/ambari-server/src/test/python/unitTests.py
+++ b/ambari-server/src/test/python/unitTests.py
@@ -89,7 +89,8 @@ def stack_test_executor(base_folder, stack, service,
custom_tests, executor_resu
tests = get_test_files(base_folder, mask = test_mask)
- shuffle(tests)
+ #TODO Add an option to randomize the tests' execution
+ #shuffle(tests)
modules = [os.path.basename(s)[:-3] for s in tests]
suites = [unittest.defaultTestLoader.loadTestsFromName(name) for name in
modules]
@@ -182,7 +183,8 @@ def main():
test_mask = TEST_MASK
tests = get_test_files(pwd, mask=test_mask, recursive=False)
- shuffle(tests)
+ #TODO Add an option to randomize the tests' execution
+ #shuffle(tests)
modules = [os.path.basename(s)[:-3] for s in tests]
suites = [unittest.defaultTestLoader.loadTestsFromName(name) for name in
modules]
ambari git commit: AMBARI-8130. Provide ability to download client configurations in Windows (Florian Barca via alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev 2868c2051 -> 9cff20bf1
AMBARI-8130. Provide ability to download client configurations in Windows
(Florian Barca via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9cff20bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9cff20bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9cff20bf
Branch: refs/heads/branch-windows-dev
Commit: 9cff20bf1634a8b242a8b150c41ae5a93888adcb
Parents: 2868c20
Author: Alejandro Fernandez
Authored: Thu Nov 6 16:39:31 2014 -0800
Committer: Alejandro Fernandez
Committed: Thu Nov 6 16:39:31 2014 -0800
--
.../libraries/functions/tar_archive.py | 30 ++
.../libraries/functions/zip_archive.py | 40 +
.../libraries/providers/xml_config.py | 6 +-
.../libraries/script/script.py | 59 ++--
ambari-server/conf/unix/ambari.properties | 1 +
ambari-server/conf/windows/ambari.properties| 1 +
.../src/main/assemblies/server-windows.xml | 8 +++
.../server/api/services/ComponentService.java | 6 +-
.../server/configuration/Configuration.java | 19 +++
.../internal/ClientConfigResourceProvider.java | 7 ++-
10 files changed, 141 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9cff20bf/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
new file mode 100644
index 000..efbf933
--- /dev/null
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import os
+import tarfile
+from contextlib import closing
+
+def archive_dir(output_filename, input_dir):
+ with closing(tarfile.open(output_filename, "w:gz")) as tar:
+try:
+ tar.add(input_dir, arcname=os.path.basename("."))
+finally:
+ tar.close()
http://git-wip-us.apache.org/repos/asf/ambari/blob/9cff20bf/ambari-common/src/main/python/resource_management/libraries/functions/zip_archive.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/zip_archive.py
b/ambari-common/src/main/python/resource_management/libraries/functions/zip_archive.py
new file mode 100644
index 000..cab3627
--- /dev/null
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/zip_archive.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import os
+import zipfile
+
+def _zip_dir(zip, root):
+ for dirname, dirnames, filenames in os.walk(root):
+for filename in filenames:
+ if len(dirname) > len(root):
+rel_path = os.path.relpath(dirname, root)
+arch_name = rel_path + os.sep + filename
+ else:
+arch_name = filename
+ zip.write(os.path.join(dirname, filename), arch_name)
+
+
+def archive_dir(output_filename, input_dir):
+ zipf = zipfile
ambari git commit: AMBARI-8195. Slider App View is not replacing JAVA_HOME (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 5b1be0f35 -> 5172bdf2a
AMBARI-8195. Slider App View is not replacing JAVA_HOME (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5172bdf2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5172bdf2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5172bdf2
Branch: refs/heads/trunk
Commit: 5172bdf2ad6f83e3be38df03a13c37992e80231d
Parents: 5b1be0f
Author: Srimanth Gunturi
Authored: Thu Nov 6 14:50:49 2014 -0800
Committer: Srimanth Gunturi
Committed: Thu Nov 6 15:25:55 2014 -0800
--
.../view/slider/SliderAppsViewController.java| 1 +
.../slider/SliderAppsViewControllerImpl.java | 19 +++
.../ui/app/controllers/slider_controller.js | 4
.../src/main/resources/ui/app/translations.js| 2 +-
4 files changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5172bdf2/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
index 25b0b89..694a434 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
@@ -43,6 +43,7 @@ public interface SliderAppsViewController {
public static final String PROPERTY_GANGLIA_CUSTOM_CLUSTERS =
"ganglia.additional.clusters";
public static final String PROPERTY_YARN_RM_WEBAPP_URL =
"yarn.rm.webapp.url";
public static final String PROPERTY_SLIDER_USER = "view.slider.user";
+ public static final String PROPERTY_JAVA_HOME = "java.home";
public static final String PROPERTY_SLIDER_SECURITY_ENABLED =
"slider.security.enabled";
public static final String METRICS_API_NAME = "Metrics API";
http://git-wip-us.apache.org/repos/asf/ambari/blob/5172bdf2/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index c26c495..b1f8d2d 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -178,6 +178,7 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
Map ambariServerConfigs =
ambariClient.getAmbariServerConfigs();
if (ambariServerConfigs.containsKey("java.home")) {
newHadoopConfigs.put("java.home",
ambariServerConfigs.get("java.home"));
+ status.getParameters().put(PROPERTY_JAVA_HOME,
ambariServerConfigs.get("java.home"));
}
// Configs
if (cluster.getDesiredConfigs().containsKey("core-site")) {
@@ -307,14 +308,16 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
new ViewStatus.Validation(
"View parameters specifying Ambari details required"));
}
-if (!newHadoopConfigs.equals(viewContext.getInstanceData())) {
- Set removeKeys = new
HashSet(viewContext.getInstanceData().keySet());
- for (Entry e : newHadoopConfigs.entrySet()) {
-viewContext.putInstanceData(e.getKey(), e.getValue());
-removeKeys.remove(e.getKey());
- }
- for (String key : removeKeys) {
-viewContext.removeInstanceData(key);
+synchronized (viewContext) {
+ if (!newHadoopConfigs.equals(viewContext.getInstanceData())) {
+Set removeKeys = new
HashSet(viewContext.getInstanceData().keySet());
+for (Entry e : newHadoopConfigs.entrySet()) {
+ viewContext.putInstanceData(e.getKey(), e.getValue());
+ removeKeys.remove(e.getKey());
+}
+for (String key : removeKeys) {
+ viewContext.removeInstanceData(key);
+}
}
}
return status;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5172bdf2/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
b/contrib/views/slider/src/main/resources/ui/app/con
ambari git commit: AMBARI-8195. Slider App View is not replacing JAVA_HOME (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 830a4b3f0 -> 9502f0c9d
AMBARI-8195. Slider App View is not replacing JAVA_HOME (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9502f0c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9502f0c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9502f0c9
Branch: refs/heads/branch-1.7.0
Commit: 9502f0c9dcc5e701a75b233ef12cee90adaf6aa5
Parents: 830a4b3
Author: Srimanth Gunturi
Authored: Thu Nov 6 14:50:49 2014 -0800
Committer: Srimanth Gunturi
Committed: Thu Nov 6 14:50:58 2014 -0800
--
.../view/slider/SliderAppsViewController.java| 1 +
.../slider/SliderAppsViewControllerImpl.java | 19 +++
.../ui/app/controllers/slider_controller.js | 4
.../src/main/resources/ui/app/translations.js| 2 +-
4 files changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9502f0c9/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
index 25b0b89..694a434 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
@@ -43,6 +43,7 @@ public interface SliderAppsViewController {
public static final String PROPERTY_GANGLIA_CUSTOM_CLUSTERS =
"ganglia.additional.clusters";
public static final String PROPERTY_YARN_RM_WEBAPP_URL =
"yarn.rm.webapp.url";
public static final String PROPERTY_SLIDER_USER = "view.slider.user";
+ public static final String PROPERTY_JAVA_HOME = "java.home";
public static final String PROPERTY_SLIDER_SECURITY_ENABLED =
"slider.security.enabled";
public static final String METRICS_API_NAME = "Metrics API";
http://git-wip-us.apache.org/repos/asf/ambari/blob/9502f0c9/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index c26c495..b1f8d2d 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -178,6 +178,7 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
Map ambariServerConfigs =
ambariClient.getAmbariServerConfigs();
if (ambariServerConfigs.containsKey("java.home")) {
newHadoopConfigs.put("java.home",
ambariServerConfigs.get("java.home"));
+ status.getParameters().put(PROPERTY_JAVA_HOME,
ambariServerConfigs.get("java.home"));
}
// Configs
if (cluster.getDesiredConfigs().containsKey("core-site")) {
@@ -307,14 +308,16 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
new ViewStatus.Validation(
"View parameters specifying Ambari details required"));
}
-if (!newHadoopConfigs.equals(viewContext.getInstanceData())) {
- Set removeKeys = new
HashSet(viewContext.getInstanceData().keySet());
- for (Entry e : newHadoopConfigs.entrySet()) {
-viewContext.putInstanceData(e.getKey(), e.getValue());
-removeKeys.remove(e.getKey());
- }
- for (String key : removeKeys) {
-viewContext.removeInstanceData(key);
+synchronized (viewContext) {
+ if (!newHadoopConfigs.equals(viewContext.getInstanceData())) {
+Set removeKeys = new
HashSet(viewContext.getInstanceData().keySet());
+for (Entry e : newHadoopConfigs.entrySet()) {
+ viewContext.putInstanceData(e.getKey(), e.getValue());
+ removeKeys.remove(e.getKey());
+}
+for (String key : removeKeys) {
+ viewContext.removeInstanceData(key);
+}
}
}
return status;
http://git-wip-us.apache.org/repos/asf/ambari/blob/9502f0c9/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
b/contrib/views/slider/src/main/resour
ambari git commit: AMBARI-8193. set HiveServer2 permgen space limit to 512 MB.
Repository: ambari
Updated Branches:
refs/heads/trunk 2dcb2153d -> 5b1be0f35
AMBARI-8193. set HiveServer2 permgen space limit to 512 MB.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5b1be0f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5b1be0f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5b1be0f3
Branch: refs/heads/trunk
Commit: 5b1be0f35d34c13f4b3240c59f03bf8e1a2334ec
Parents: 2dcb215
Author: Siddharth Wagle
Authored: Thu Nov 6 14:46:12 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 14:46:12 2014 -0800
--
.../stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml| 2 +-
.../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b1be0f3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
index 8865d18..316407a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m
${HADOOP_BALANCER_OPTS}"
export HADOOP_SECONDARYNAMENODE_OPTS="-server -XX:ParallelGCThreads=8
-XX:+UseConcMarkSweepGC
-XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log
-XX:NewSize={{namenode_opt_newsize}} -XX:MaxNewSize={{namenode_opt_maxnewsize}}
-XX:PermSize={{namenode_opt_permsize}}
-XX:MaxPermSize={{namenode_opt_maxpermsize}}
-Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps
${HADOOP_NAMENODE_INIT_HEAPSIZE} -Xmx{{namenode_heapsize}}
-Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
${HADOOP_SECONDARYNAMENODE_OPTS}"
# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
+export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m -XX:MaxPermSize=512m
$HADOOP_CLIENT_OPTS"
# On secure datanodes, user to run the datanode as after dropping privileges
export HADOOP_SECURE_DN_USER={{hdfs_user}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b1be0f3/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 461204b..d186922 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -66,7 +66,7 @@ HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m
${HADOOP_BALANCER_OPTS}"
export HADOOP_SECONDARYNAMENODE_OPTS=$HADOOP_NAMENODE_OPTS
# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
+export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m -XX:MaxPermSize=512m
$HADOOP_CLIENT_OPTS"
# Extra ssh options. Empty by default.
export HADOOP_SSH_OPTS="-o ConnectTimeout=5 -o SendEnv=HADOOP_CONF_DIR"
ambari git commit: AMBARI-8193. set HiveServer2 permgen space limit to 512 MB.
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 48fcb344c -> 830a4b3f0
AMBARI-8193. set HiveServer2 permgen space limit to 512 MB.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/830a4b3f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/830a4b3f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/830a4b3f
Branch: refs/heads/branch-1.7.0
Commit: 830a4b3f05e8af8623a4cc0eff2b447f0a53c089
Parents: 48fcb34
Author: Siddharth Wagle
Authored: Thu Nov 6 14:37:35 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 14:45:49 2014 -0800
--
.../stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml| 2 +-
.../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/830a4b3f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
index 8865d18..316407a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m
${HADOOP_BALANCER_OPTS}"
export HADOOP_SECONDARYNAMENODE_OPTS="-server -XX:ParallelGCThreads=8
-XX:+UseConcMarkSweepGC
-XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log
-XX:NewSize={{namenode_opt_newsize}} -XX:MaxNewSize={{namenode_opt_maxnewsize}}
-XX:PermSize={{namenode_opt_permsize}}
-XX:MaxPermSize={{namenode_opt_maxpermsize}}
-Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc
-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps
${HADOOP_NAMENODE_INIT_HEAPSIZE} -Xmx{{namenode_heapsize}}
-Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT
${HADOOP_SECONDARYNAMENODE_OPTS}"
# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
+export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m -XX:MaxPermSize=512m
$HADOOP_CLIENT_OPTS"
# On secure datanodes, user to run the datanode as after dropping privileges
export HADOOP_SECURE_DN_USER={{hdfs_user}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/830a4b3f/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 461204b..d186922 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -66,7 +66,7 @@ HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m
${HADOOP_BALANCER_OPTS}"
export HADOOP_SECONDARYNAMENODE_OPTS=$HADOOP_NAMENODE_OPTS
# The following applies to multiple commands (fs, dfs, fsck, distcp etc)
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
+export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m -XX:MaxPermSize=512m
$HADOOP_CLIENT_OPTS"
# Extra ssh options. Empty by default.
export HADOOP_SSH_OPTS="-o ConnectTimeout=5 -o SendEnv=HADOOP_CONF_DIR"
ambari git commit: AMBARI-8194. Remove current references in PATH for hadoop env. (mahadev)
Repository: ambari
Updated Branches:
refs/heads/trunk 24c39273f -> 2dcb2153d
AMBARI-8194. Remove current references in PATH for hadoop env. (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2dcb2153
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2dcb2153
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2dcb2153
Branch: refs/heads/trunk
Commit: 2dcb2153d948af8922a8b4007a26ccf41c08c059
Parents: 24c3927
Author: Mahadev Konar
Authored: Thu Nov 6 14:44:45 2014 -0800
Committer: Mahadev Konar
Committed: Thu Nov 6 14:45:33 2014 -0800
--
.../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dcb2153/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 929e9c9..461204b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -131,7 +131,7 @@ fi
export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
# Mostly required for hadoop 2.0
-export
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib/native/Linux-amd64-64
+export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
ambari git commit: AMBARI-8194. Remove current references in PATH for hadoop env. (mahadev)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 c75578a41 -> 48fcb344c
AMBARI-8194. Remove current references in PATH for hadoop env. (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48fcb344
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48fcb344
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48fcb344
Branch: refs/heads/branch-1.7.0
Commit: 48fcb344c4ed404d476be4c211638fc6e68b5aed
Parents: c75578a
Author: Mahadev Konar
Authored: Thu Nov 6 14:44:45 2014 -0800
Committer: Mahadev Konar
Committed: Thu Nov 6 14:44:45 2014 -0800
--
.../stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/48fcb344/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 929e9c9..461204b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -131,7 +131,7 @@ fi
export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
# Mostly required for hadoop 2.0
-export
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib/native/Linux-amd64-64
+export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
ambari git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. Fix for hadoop-env. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 8f1adfc68 -> c75578a41
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. Fix for hadoop-env. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c75578a4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c75578a4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c75578a4
Branch: refs/heads/branch-1.7.0
Commit: c75578a41e80def8841dbebc566a80474f89a8fb
Parents: 8f1adfc
Author: Siddharth Wagle
Authored: Thu Nov 6 12:01:27 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 12:16:47 2014 -0800
--
.../HDP/2.0.6/services/HDFS/package/scripts/utils.py| 12 ++--
.../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c75578a4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 36fbc86..c177d9c 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -101,13 +101,13 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
except OSError:
pass # Process is not running
pass
+ pass
-# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as
root
-# in secure mode.
-if user == 'root':
- params.dn_proc_user = 'root'
- hdfs.setup_hadoop_env(replace=True)
-pass
+ # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
+ # in secure mode.
+ if name == 'datanode' and user == 'root':
+params.dn_proc_user = 'root'
+hdfs.setup_hadoop_env(replace=True)
pass
hadoop_env_exports_str = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/c75578a4/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index d25a25b..929e9c9 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ export
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
HDFS_DN_PROC_USER={{dn_proc_user}}
-if [ $HDFS_DN_PROC_USER="root" ]; then
+if [ $HDFS_DN_PROC_USER == "root" ]; then
export HADOOP_SECURE_DN_USER="{{hdfs_user}}"
else
export HADOOP_SECURE_DN_USER=""
ambari git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. Fix for hadoop-env. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk f0d571c3a -> 24c39273f
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. Fix for hadoop-env. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24c39273
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24c39273
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24c39273
Branch: refs/heads/trunk
Commit: 24c39273ff0487c71f5688c14bf2ef8df9786210
Parents: f0d571c
Author: Siddharth Wagle
Authored: Thu Nov 6 12:20:09 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 12:20:09 2014 -0800
--
.../HDP/2.0.6/services/HDFS/package/scripts/utils.py| 12 ++--
.../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/24c39273/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 08358f5..150d0a4 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
@@ -101,13 +101,13 @@ def service(action=None, name=None, user=None,
create_pid_dir=False,
except OSError:
pass # Process is not running
pass
+ pass
-# Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as
root
-# in secure mode.
-if user == 'root':
- params.dn_proc_user = 'root'
- hdfs.setup_hadoop_env(replace=True)
-pass
+ # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root
+ # in secure mode.
+ if name == 'datanode' and user == 'root':
+params.dn_proc_user = 'root'
+hdfs.setup_hadoop_env(replace=True)
pass
hadoop_env_exports_str = ''
http://git-wip-us.apache.org/repos/asf/ambari/blob/24c39273/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index d25a25b..929e9c9 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -136,7 +136,7 @@ export
JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/hdp/current/hadoop-client/lib
export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
HDFS_DN_PROC_USER={{dn_proc_user}}
-if [ $HDFS_DN_PROC_USER="root" ]; then
+if [ $HDFS_DN_PROC_USER == "root" ]; then
export HADOOP_SECURE_DN_USER="{{hdfs_user}}"
else
export HADOOP_SECURE_DN_USER=""
ambari git commit: Revert "AMBARI-8172. Knox Gateway failed to start when Knox service account name was customized. (Sumit Gupta via yusaku)"
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 93cbbbaad -> 8f1adfc68
Revert "AMBARI-8172. Knox Gateway failed to start when Knox service account
name was customized. (Sumit Gupta via yusaku)"
This reverts commit fa35bd986ca82c2776c42180ed8d78ff86cff01f.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f1adfc6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f1adfc6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f1adfc6
Branch: refs/heads/branch-1.7.0
Commit: 8f1adfc6873462de194c6dc2946c0e7b8a150e58
Parents: 93cbbba
Author: Yusaku Sako
Authored: Thu Nov 6 12:05:45 2014 -0800
Committer: Yusaku Sako
Committed: Thu Nov 6 12:05:45 2014 -0800
--
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 3 ---
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py| 3 ---
2 files changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f1adfc6/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 627462a..2061db1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -55,8 +55,6 @@ def knox():
owner = params.knox_user,
template_tag = None
)
-cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir}
{knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
-Execute(cmd)
cmd = format('{knox_client_bin} create-master --master
{knox_master_secret!p}')
Execute(cmd,
@@ -71,4 +69,3 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_cert_store_path}')
)
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f1adfc6/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index 326d678..e11f287 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -110,9 +110,6 @@ if has_oozie:
# server configurations
knox_conf_dir = '/etc/knox/conf'
-knox_data_dir = '/var/lib/knox/data'
-knox_logs_dir = '/var/log/knox'
-knox_pid_dir = status_params.knox_pid_dir
knox_user = default("/configurations/knox-env/knox_user", "knox")
knox_group = default("/configurations/knox-env/knox_group", "knox")
knox_pid_file = status_params.knox_pid_file
ambari git commit: Revert "AMBARI-8172. Knox Gateway failed to start when Knox service account name was customized. (Sumit Gupta via yusaku)"
Repository: ambari
Updated Branches:
refs/heads/trunk 662ce6007 -> f0d571c3a
Revert "AMBARI-8172. Knox Gateway failed to start when Knox service account
name was customized. (Sumit Gupta via yusaku)"
This reverts commit c097a8f7bcd86aa4b102bedda714c4122682b058.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0d571c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0d571c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0d571c3
Branch: refs/heads/trunk
Commit: f0d571c3a780ae952de0b272f82b6047b7c7f9fd
Parents: 662ce60
Author: Yusaku Sako
Authored: Thu Nov 6 12:05:07 2014 -0800
Committer: Yusaku Sako
Committed: Thu Nov 6 12:05:12 2014 -0800
--
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 3 ---
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py| 3 ---
2 files changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d571c3/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 627462a..2061db1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -55,8 +55,6 @@ def knox():
owner = params.knox_user,
template_tag = None
)
-cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir}
{knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
-Execute(cmd)
cmd = format('{knox_client_bin} create-master --master
{knox_master_secret!p}')
Execute(cmd,
@@ -71,4 +69,3 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_cert_store_path}')
)
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0d571c3/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index 326d678..e11f287 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -110,9 +110,6 @@ if has_oozie:
# server configurations
knox_conf_dir = '/etc/knox/conf'
-knox_data_dir = '/var/lib/knox/data'
-knox_logs_dir = '/var/log/knox'
-knox_pid_dir = status_params.knox_pid_dir
knox_user = default("/configurations/knox-env/knox_user", "knox")
knox_group = default("/configurations/knox-env/knox_group", "knox")
knox_pid_file = status_params.knox_pid_file
ambari git commit: AMBARI-8177. ATS should remain enabled after kerberization, and keytab owner should be yarn (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 fa35bd986 -> 93cbbbaad
AMBARI-8177. ATS should remain enabled after kerberization, and keytab owner
should be yarn (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93cbbbaa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93cbbbaa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93cbbbaa
Branch: refs/heads/branch-1.7.0
Commit: 93cbbbaad52c0c956970277e7f9ecf8309a2be2b
Parents: fa35bd9
Author: Alejandro Fernandez
Authored: Thu Nov 6 11:44:31 2014 -0800
Committer: Alejandro Fernandez
Committed: Thu Nov 6 11:44:31 2014 -0800
--
ambari-web/app/controllers/main/admin/security.js | 14 +-
.../controllers/main/admin/security/add/step3.js| 16 +---
ambari-web/app/data/HDP2/secure_mapping.js | 2 +-
ambari-web/app/data/HDP2/secure_properties.js | 6 ++
ambari-web/app/messages.js | 1 -
5 files changed, 21 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/93cbbbaa/ambari-web/app/controllers/main/admin/security.js
--
diff --git a/ambari-web/app/controllers/main/admin/security.js
b/ambari-web/app/controllers/main/admin/security.js
index 0d4c031..a38e264 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -38,7 +38,13 @@ App.MainAdminSecurityController = Em.Controller.extend({
getDisableSecurityStatus: function (status) {
return App.db.getDisableSecurityStatus();
},
-
+ content: Em.Object.create({
+isATSInstalled: function() {
+ // Because the ATS component can be installed/removed at will, the check
has to happen every time that security is added.
+ var yarnService = App.Service.find().findProperty('serviceName','YARN');
+ return !!yarnService &&
yarnService.get('hostComponents').someProperty('componentName',
'APP_TIMELINE_SERVER');
+}.property('App.router.clusterController.isLoaded')
+ }),
notifySecurityOff: false,
notifySecurityAdd: false,
@@ -64,6 +70,12 @@ App.MainAdminSecurityController = Em.Controller.extend({
secureServices = $.extend(true, [], require('data/secure_configs'));
}
+// Typically, ATS will support Kerberos in HDP 2.2 and higher
+if (this.get('content.isATSInstalled') &&
App.get('doesATSSupportKerberos')) {
+ var yarnConfigCategories = secureServices.findProperty('serviceName',
'YARN').configCategories;
+ yarnConfigCategories.push(App.ServiceConfigCategory.create({ name:
'AppTimelineServer', displayName : 'Application Timeline Service'}));
+}
+
var installedServices = App.Service.find().mapProperty('serviceName');
//General (only non service tab) tab is always displayed
services.push(secureServices.findProperty('serviceName', 'GENERAL'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/93cbbbaa/ambari-web/app/controllers/main/admin/security/add/step3.js
--
diff --git a/ambari-web/app/controllers/main/admin/security/add/step3.js
b/ambari-web/app/controllers/main/admin/security/add/step3.js
index 2bcd59c..c2bba07 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -46,7 +46,8 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
'NIMBUS': 'storm_user',
'STORM_UI_SERVER': 'storm_user',
'FALCON_SERVER': 'falcon_user',
- 'KNOX_GATEWAY': 'knox_user'
+ 'KNOX_GATEWAY': 'knox_user',
+ 'APP_TIMELINE_SERVER': 'yarn_user'
};
if (App.get('isHadoop22Stack')) {
map['DRPC_SERVER'] = 'storm_user'
@@ -120,13 +121,6 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
},
{
componentName: 'APP_TIMELINE_SERVER',
-principal: 'apptimelineserver_principal_name',
-keytab: 'apptimelineserver_keytab',
-displayName: Em.I18n.t('admin.addSecurity.user.yarn.atsUser'),
-isHadoop2Stack: true
- },
- {
-componentName: 'APP_TIMELINE_SERVER',
principal: 'apptimelineserver_http_principal_name',
keytab: 'apptimelineserver_http_keytab',
displayName: Em.I18n.t('admin.addSecurity.user.yarn.atsHTTPUser'),
@@ -262,8 +256,8 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
var componentToOwnerMap = {};
for (var component in componentToUserMap) {
var user = componentToUserMap[component];
- var secutityUser = securityUsers.findProperty('name', user);
- componentToOwnerMap[component] = secutityUser.value;
+
ambari git commit: AMBARI-8177. ATS should remain enabled after kerberization, and keytab owner should be yarn (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk c097a8f7b -> 662ce6007
AMBARI-8177. ATS should remain enabled after kerberization, and keytab owner
should be yarn (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/662ce600
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/662ce600
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/662ce600
Branch: refs/heads/trunk
Commit: 662ce6007ade2413c965e6340706522469357de9
Parents: c097a8f
Author: Alejandro Fernandez
Authored: Wed Nov 5 18:37:31 2014 -0800
Committer: Alejandro Fernandez
Committed: Thu Nov 6 11:40:23 2014 -0800
--
ambari-web/app/controllers/main/admin/security.js | 14 +-
.../controllers/main/admin/security/add/step3.js| 16 +---
ambari-web/app/data/HDP2/secure_mapping.js | 2 +-
ambari-web/app/data/HDP2/secure_properties.js | 6 ++
ambari-web/app/messages.js | 1 -
5 files changed, 21 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/662ce600/ambari-web/app/controllers/main/admin/security.js
--
diff --git a/ambari-web/app/controllers/main/admin/security.js
b/ambari-web/app/controllers/main/admin/security.js
index 0d4c031..a38e264 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -38,7 +38,13 @@ App.MainAdminSecurityController = Em.Controller.extend({
getDisableSecurityStatus: function (status) {
return App.db.getDisableSecurityStatus();
},
-
+ content: Em.Object.create({
+isATSInstalled: function() {
+ // Because the ATS component can be installed/removed at will, the check
has to happen every time that security is added.
+ var yarnService = App.Service.find().findProperty('serviceName','YARN');
+ return !!yarnService &&
yarnService.get('hostComponents').someProperty('componentName',
'APP_TIMELINE_SERVER');
+}.property('App.router.clusterController.isLoaded')
+ }),
notifySecurityOff: false,
notifySecurityAdd: false,
@@ -64,6 +70,12 @@ App.MainAdminSecurityController = Em.Controller.extend({
secureServices = $.extend(true, [], require('data/secure_configs'));
}
+// Typically, ATS will support Kerberos in HDP 2.2 and higher
+if (this.get('content.isATSInstalled') &&
App.get('doesATSSupportKerberos')) {
+ var yarnConfigCategories = secureServices.findProperty('serviceName',
'YARN').configCategories;
+ yarnConfigCategories.push(App.ServiceConfigCategory.create({ name:
'AppTimelineServer', displayName : 'Application Timeline Service'}));
+}
+
var installedServices = App.Service.find().mapProperty('serviceName');
//General (only non service tab) tab is always displayed
services.push(secureServices.findProperty('serviceName', 'GENERAL'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/662ce600/ambari-web/app/controllers/main/admin/security/add/step3.js
--
diff --git a/ambari-web/app/controllers/main/admin/security/add/step3.js
b/ambari-web/app/controllers/main/admin/security/add/step3.js
index 2bcd59c..c2bba07 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -46,7 +46,8 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
'NIMBUS': 'storm_user',
'STORM_UI_SERVER': 'storm_user',
'FALCON_SERVER': 'falcon_user',
- 'KNOX_GATEWAY': 'knox_user'
+ 'KNOX_GATEWAY': 'knox_user',
+ 'APP_TIMELINE_SERVER': 'yarn_user'
};
if (App.get('isHadoop22Stack')) {
map['DRPC_SERVER'] = 'storm_user'
@@ -120,13 +121,6 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
},
{
componentName: 'APP_TIMELINE_SERVER',
-principal: 'apptimelineserver_principal_name',
-keytab: 'apptimelineserver_keytab',
-displayName: Em.I18n.t('admin.addSecurity.user.yarn.atsUser'),
-isHadoop2Stack: true
- },
- {
-componentName: 'APP_TIMELINE_SERVER',
principal: 'apptimelineserver_http_principal_name',
keytab: 'apptimelineserver_http_keytab',
displayName: Em.I18n.t('admin.addSecurity.user.yarn.atsHTTPUser'),
@@ -262,8 +256,8 @@ App.MainAdminSecurityAddStep3Controller =
Em.Controller.extend({
var componentToOwnerMap = {};
for (var component in componentToUserMap) {
var user = componentToUserMap[component];
- var secutityUser = securityUsers.findProperty('name', user);
- componentToOwnerMap[component] = secutityUser.value;
+ var securityU
ambari git commit: AMBARI-8172. Knox Gateway failed to start when Knox service account name was customized. (Sumit Gupta via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk c72888df0 -> c097a8f7b
AMBARI-8172. Knox Gateway failed to start when Knox service account name was
customized. (Sumit Gupta via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c097a8f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c097a8f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c097a8f7
Branch: refs/heads/trunk
Commit: c097a8f7bcd86aa4b102bedda714c4122682b058
Parents: c72888d
Author: Yusaku Sako
Authored: Thu Nov 6 11:00:01 2014 -0800
Committer: Yusaku Sako
Committed: Thu Nov 6 11:00:47 2014 -0800
--
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 3 +++
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py| 3 +++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c097a8f7/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 2061db1..627462a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -55,6 +55,8 @@ def knox():
owner = params.knox_user,
template_tag = None
)
+cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir}
{knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
+Execute(cmd)
cmd = format('{knox_client_bin} create-master --master
{knox_master_secret!p}')
Execute(cmd,
@@ -69,3 +71,4 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_cert_store_path}')
)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/c097a8f7/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index e11f287..326d678 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -110,6 +110,9 @@ if has_oozie:
# server configurations
knox_conf_dir = '/etc/knox/conf'
+knox_data_dir = '/var/lib/knox/data'
+knox_logs_dir = '/var/log/knox'
+knox_pid_dir = status_params.knox_pid_dir
knox_user = default("/configurations/knox-env/knox_user", "knox")
knox_group = default("/configurations/knox-env/knox_group", "knox")
knox_pid_file = status_params.knox_pid_file
ambari git commit: AMBARI-8172. Knox Gateway failed to start when Knox service account name was customized. (Sumit Gupta via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 e58eda61e -> fa35bd986
AMBARI-8172. Knox Gateway failed to start when Knox service account name was
customized. (Sumit Gupta via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa35bd98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa35bd98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa35bd98
Branch: refs/heads/branch-1.7.0
Commit: fa35bd986ca82c2776c42180ed8d78ff86cff01f
Parents: e58eda6
Author: Yusaku Sako
Authored: Thu Nov 6 11:00:01 2014 -0800
Committer: Yusaku Sako
Committed: Thu Nov 6 11:00:01 2014 -0800
--
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 3 +++
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py| 3 +++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa35bd98/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 2061db1..627462a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -55,6 +55,8 @@ def knox():
owner = params.knox_user,
template_tag = None
)
+cmd = format('chown -R {knox_user}:{knox_group} {knox_data_dir}
{knox_logs_dir} {knox_pid_dir} {knox_conf_dir}')
+Execute(cmd)
cmd = format('{knox_client_bin} create-master --master
{knox_master_secret!p}')
Execute(cmd,
@@ -69,3 +71,4 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_cert_store_path}')
)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa35bd98/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index e11f287..326d678 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -110,6 +110,9 @@ if has_oozie:
# server configurations
knox_conf_dir = '/etc/knox/conf'
+knox_data_dir = '/var/lib/knox/data'
+knox_logs_dir = '/var/log/knox'
+knox_pid_dir = status_params.knox_pid_dir
knox_user = default("/configurations/knox-env/knox_user", "knox")
knox_group = default("/configurations/knox-env/knox_group", "knox")
knox_pid_file = status_params.knox_pid_file
[1/2] ambari git commit: AMBARI-8187. Download client configs gives incorrect content for certain components (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 d8d6bf4bb -> e58eda61e
refs/heads/trunk a320e033c -> c72888df0
AMBARI-8187. Download client configs gives incorrect content for certain
components (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c72888df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c72888df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c72888df
Branch: refs/heads/trunk
Commit: c72888df0f6cccbd67a4106b76a26dea12631a96
Parents: a320e03
Author: Andrew Onishuk
Authored: Thu Nov 6 20:39:26 2014 +0200
Committer: Andrew Onishuk
Committed: Thu Nov 6 20:39:26 2014 +0200
--
.../resource_management/libraries/script/script.py| 14 ++
.../internal/ClientConfigResourceProvider.java| 6 +-
.../stacks/HDP/2.0.6/services/HBASE/metainfo.xml | 5 +
.../stacks/HDP/2.1/services/FALCON/metainfo.xml | 4 ++--
.../test/python/stacks/1.3.2/HDFS/test_hdfs_client.py | 6 ++
.../stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py | 6 ++
.../src/test/python/stacks/1.3.2/configs/default.json | 1 +
.../test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 6 ++
.../src/test/python/stacks/2.0.6/configs/default.json | 1 +
9 files changed, 46 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c72888df/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 4caaa78..001922d 100644
---
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -30,6 +30,7 @@ from contextlib import closing
from resource_management.libraries.resources import XmlConfig
+from resource_management.libraries.resources import PropertiesFile
from resource_management.core.resources import File, Directory
from resource_management.core.source import InlineTemplate
@@ -250,6 +251,10 @@ class Script(object):
import params
return {'configurations':params.config['configurations'][dict],
'configuration_attributes':params.config['configuration_attributes'][dict]}
+
+ def generate_configs_get_xml_file_dict(self, filename, dict):
+import params
+return params.config['configurations'][dict]
def generate_configs(self, env):
"""
@@ -260,6 +265,8 @@ class Script(object):
env.set_params(params)
xml_configs_list = params.config['commandParams']['xml_configs_list']
env_configs_list = params.config['commandParams']['env_configs_list']
+properties_configs_list =
params.config['commandParams']['properties_configs_list']
+
conf_tmp_dir = tempfile.mkdtemp()
output_filename =
os.path.join(self.get_tmp_dir(),params.config['commandParams']['output_file'])
@@ -274,6 +281,13 @@ class Script(object):
for filename,dicts in file_dict.iteritems():
File(os.path.join(conf_tmp_dir, filename),
content=InlineTemplate(self.generate_configs_get_template_file_content(filename,
dicts)))
+
+for file_dict in properties_configs_list:
+ for filename, dict in file_dict.iteritems():
+PropertiesFile(os.path.join(conf_tmp_dir, filename),
+ properties=self.generate_configs_get_xml_file_dict(filename, dict)
+)
+
with closing(tarfile.open(output_filename, "w:gz")) as tar:
tar.add(conf_tmp_dir, arcname=os.path.basename("."))
tar.close()
http://git-wip-us.apache.org/repos/asf/ambari/blob/c72888df/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 94c0d58..5aca65b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -267,6 +267,7 @@ public class ClientConfigResourceProvider extends
AbstractControllerResourceProv
Map commandParams = new HashMap();
List> xmlConfigs = new LinkedList>();
List> envConfigs = new LinkedList>();
+ List> propertiesConfigs = new LinkedList>();
//Fill file-dictionary configs from metainfo
[2/2] ambari git commit: AMBARI-8187. Download client configs gives incorrect content for certain components (aonishuk)
AMBARI-8187. Download client configs gives incorrect content for certain
components (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e58eda61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e58eda61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e58eda61
Branch: refs/heads/branch-1.7.0
Commit: e58eda61e4c94a9ffc20c6c6667fa3d183a647bf
Parents: d8d6bf4
Author: Andrew Onishuk
Authored: Thu Nov 6 20:39:28 2014 +0200
Committer: Andrew Onishuk
Committed: Thu Nov 6 20:39:28 2014 +0200
--
.../resource_management/libraries/script/script.py| 14 ++
.../internal/ClientConfigResourceProvider.java| 6 +-
.../stacks/HDP/2.0.6/services/HBASE/metainfo.xml | 5 +
.../stacks/HDP/2.1/services/FALCON/metainfo.xml | 4 ++--
.../test/python/stacks/1.3.2/HDFS/test_hdfs_client.py | 6 ++
.../stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py | 6 ++
.../src/test/python/stacks/1.3.2/configs/default.json | 1 +
.../test/python/stacks/2.0.6/HDFS/test_hdfs_client.py | 6 ++
.../src/test/python/stacks/2.0.6/configs/default.json | 1 +
9 files changed, 46 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e58eda61/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 4caaa78..001922d 100644
---
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -30,6 +30,7 @@ from contextlib import closing
from resource_management.libraries.resources import XmlConfig
+from resource_management.libraries.resources import PropertiesFile
from resource_management.core.resources import File, Directory
from resource_management.core.source import InlineTemplate
@@ -250,6 +251,10 @@ class Script(object):
import params
return {'configurations':params.config['configurations'][dict],
'configuration_attributes':params.config['configuration_attributes'][dict]}
+
+ def generate_configs_get_xml_file_dict(self, filename, dict):
+import params
+return params.config['configurations'][dict]
def generate_configs(self, env):
"""
@@ -260,6 +265,8 @@ class Script(object):
env.set_params(params)
xml_configs_list = params.config['commandParams']['xml_configs_list']
env_configs_list = params.config['commandParams']['env_configs_list']
+properties_configs_list =
params.config['commandParams']['properties_configs_list']
+
conf_tmp_dir = tempfile.mkdtemp()
output_filename =
os.path.join(self.get_tmp_dir(),params.config['commandParams']['output_file'])
@@ -274,6 +281,13 @@ class Script(object):
for filename,dicts in file_dict.iteritems():
File(os.path.join(conf_tmp_dir, filename),
content=InlineTemplate(self.generate_configs_get_template_file_content(filename,
dicts)))
+
+for file_dict in properties_configs_list:
+ for filename, dict in file_dict.iteritems():
+PropertiesFile(os.path.join(conf_tmp_dir, filename),
+ properties=self.generate_configs_get_xml_file_dict(filename, dict)
+)
+
with closing(tarfile.open(output_filename, "w:gz")) as tar:
tar.add(conf_tmp_dir, arcname=os.path.basename("."))
tar.close()
http://git-wip-us.apache.org/repos/asf/ambari/blob/e58eda61/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 339ebc4..8f59581 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -265,6 +265,7 @@ public class ClientConfigResourceProvider extends
AbstractControllerResourceProv
Map commandParams = new HashMap();
List> xmlConfigs = new LinkedList>();
List> envConfigs = new LinkedList>();
+ List> propertiesConfigs = new LinkedList>();
//Fill file-dictionary configs from metainfo
for (ClientConfigFileDefinition clientConfigFile : clientConfigFiles) {
@@ -272,13 +273,16 @@ public class ClientConfi
ambari git commit: AMBARI-8176. Set correct properties in oozie-site.xml for knox impersonation in kerberized cluster. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk a1e5cadd5 -> a320e033c
AMBARI-8176. Set correct properties in oozie-site.xml for knox impersonation in
kerberized cluster. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a320e033
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a320e033
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a320e033
Branch: refs/heads/trunk
Commit: a320e033ced9361ca5fcd2116feda5014bbd308a
Parents: a1e5cad
Author: Jaimin Jetly
Authored: Thu Nov 6 10:29:04 2014 -0800
Committer: Jaimin Jetly
Committed: Thu Nov 6 10:30:18 2014 -0800
--
ambari-web/app/data/HDP2/secure_mapping.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a320e033/ambari-web/app/data/HDP2/secure_mapping.js
--
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js
b/ambari-web/app/data/HDP2/secure_mapping.js
index 191bb63..62afd26 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -720,7 +720,7 @@ var props = [
"serviceName": "KNOX"
},
{
-"name": "hadoop.proxyuser..groups",
+"name": "oozie.service.ProxyUserService.proxyuser..groups",
"templateName": ["proxyuser_group"],
"foreignKey": ["knox_primary_name"],
"value": "",
@@ -728,7 +728,7 @@ var props = [
"serviceName": "KNOX"
},
{
-"name": "hadoop.proxyuser..hosts",
+"name": "oozie.service.ProxyUserService.proxyuser..hosts",
"templateName": ["knox_gateway_hosts"],
"foreignKey": ["knox_primary_name"],
"value": "",
ambari git commit: AMBARI-8176. Set correct properties in oozie-site.xml for knox impersonation in kerberized cluster. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 a7bc7350d -> d8d6bf4bb
AMBARI-8176. Set correct properties in oozie-site.xml for knox impersonation in
kerberized cluster. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8d6bf4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8d6bf4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8d6bf4b
Branch: refs/heads/branch-1.7.0
Commit: d8d6bf4bb55afd29781855e3d0254246037b2eb0
Parents: a7bc735
Author: Jaimin Jetly
Authored: Thu Nov 6 10:29:04 2014 -0800
Committer: Jaimin Jetly
Committed: Thu Nov 6 10:29:04 2014 -0800
--
ambari-web/app/data/HDP2/secure_mapping.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8d6bf4b/ambari-web/app/data/HDP2/secure_mapping.js
--
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js
b/ambari-web/app/data/HDP2/secure_mapping.js
index 191bb63..62afd26 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -720,7 +720,7 @@ var props = [
"serviceName": "KNOX"
},
{
-"name": "hadoop.proxyuser..groups",
+"name": "oozie.service.ProxyUserService.proxyuser..groups",
"templateName": ["proxyuser_group"],
"foreignKey": ["knox_primary_name"],
"value": "",
@@ -728,7 +728,7 @@ var props = [
"serviceName": "KNOX"
},
{
-"name": "hadoop.proxyuser..hosts",
+"name": "oozie.service.ProxyUserService.proxyuser..hosts",
"templateName": ["knox_gateway_hosts"],
"foreignKey": ["knox_primary_name"],
"value": "",
ambari git commit: AMBARI-8175. Security wizard: Cluster deployed with customized user fails to kerberize succesffully. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk a4b8c9b30 -> a1e5cadd5
AMBARI-8175. Security wizard: Cluster deployed with customized user fails to
kerberize succesffully. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1e5cadd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1e5cadd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1e5cadd
Branch: refs/heads/trunk
Commit: a1e5cadd589e72c38f31035c74e08e0adce0edcc
Parents: a4b8c9b
Author: Jaimin Jetly
Authored: Thu Nov 6 10:16:22 2014 -0800
Committer: Jaimin Jetly
Committed: Thu Nov 6 10:20:18 2014 -0800
--
ambari-web/app/controllers/global/cluster_controller.js | 7 ++-
ambari-web/app/controllers/main/admin/security.js | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5cadd/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index f5784da..c405c0d 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -70,6 +70,12 @@ App.ClusterController = Em.Controller.extend({
this.set('clusterDataLoadedPercent', 'width:' + (Math.floor(numLoaded /
loadListLength * 100)).toString() + '%');
},
+ doOnClusterLoad: function (item) {
+if (this.get('isLoaded')) {
+ App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
+}
+ }.observes('isLoaded'),
+
dataLoadList: Em.Object.create({
'hosts': false,
'serviceMetrics': false,
@@ -338,7 +344,6 @@ App.ClusterController = Em.Controller.extend({
});
});
});
-App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
},
requestHosts: function (realUrl, callback) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5cadd/ambari-web/app/controllers/main/admin/security.js
--
diff --git a/ambari-web/app/controllers/main/admin/security.js
b/ambari-web/app/controllers/main/admin/security.js
index 39eec54..0d4c031 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -83,6 +83,7 @@ App.MainAdminSecurityController = Em.Controller.extend({
'hdfs_user': {defaultValue: 'hdfs', siteName: 'hadoop-env', serviceName:
'HDFS'},
'yarn_user': {defaultValue: 'yarn', siteName: 'yarn-env', serviceName:
'YARN'},
'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env',
serviceName: 'MAPREDUCE'},
+'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env',
serviceName: 'MAPREDUCE2'},
'hbase_user': {defaultValue: 'hbase', siteName: 'hbase-env', serviceName:
'HBASE'},
'hive_user': {defaultValue: 'hive', siteName: 'hive-env', serviceName:
'HIVE'},
'proxyuser_group': {defaultValue: 'users', siteName: 'hadoop-env',
serviceName: 'HDFS'},
ambari git commit: AMBARI-8175. Security wizard: Cluster deployed with customized user fails to kerberize succesffully. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 a7e1a3793 -> a7bc7350d
AMBARI-8175. Security wizard: Cluster deployed with customized user fails to
kerberize succesffully. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7bc7350
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7bc7350
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7bc7350
Branch: refs/heads/branch-1.7.0
Commit: a7bc7350d49fef867419af3ac794619f3d1c05c2
Parents: a7e1a37
Author: Jaimin Jetly
Authored: Thu Nov 6 10:16:22 2014 -0800
Committer: Jaimin Jetly
Committed: Thu Nov 6 10:16:33 2014 -0800
--
ambari-web/app/controllers/global/cluster_controller.js | 7 ++-
ambari-web/app/controllers/main/admin/security.js | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7bc7350/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index e6e4b03..ab1cb75 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -70,6 +70,12 @@ App.ClusterController = Em.Controller.extend({
this.set('clusterDataLoadedPercent', 'width:' + (Math.floor(numLoaded /
loadListLength * 100)).toString() + '%');
},
+ doOnClusterLoad: function (item) {
+if (this.get('isLoaded')) {
+ App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
+}
+ }.observes('isLoaded'),
+
dataLoadList: Em.Object.create({
'hosts': false,
'serviceMetrics': false,
@@ -336,7 +342,6 @@ App.ClusterController = Em.Controller.extend({
});
});
});
-App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
},
requestHosts: function (realUrl, callback) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7bc7350/ambari-web/app/controllers/main/admin/security.js
--
diff --git a/ambari-web/app/controllers/main/admin/security.js
b/ambari-web/app/controllers/main/admin/security.js
index 39eec54..0d4c031 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -83,6 +83,7 @@ App.MainAdminSecurityController = Em.Controller.extend({
'hdfs_user': {defaultValue: 'hdfs', siteName: 'hadoop-env', serviceName:
'HDFS'},
'yarn_user': {defaultValue: 'yarn', siteName: 'yarn-env', serviceName:
'YARN'},
'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env',
serviceName: 'MAPREDUCE'},
+'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env',
serviceName: 'MAPREDUCE2'},
'hbase_user': {defaultValue: 'hbase', siteName: 'hbase-env', serviceName:
'HBASE'},
'hive_user': {defaultValue: 'hive', siteName: 'hive-env', serviceName:
'HIVE'},
'proxyuser_group': {defaultValue: 'users', siteName: 'hadoop-env',
serviceName: 'HDFS'},
ambari git commit: AMBARI-8120 - Configs tab doesn't appear for all services
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev be54a4fcf -> 2868c2051
AMBARI-8120 - Configs tab doesn't appear for all services
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2868c205
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2868c205
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2868c205
Branch: refs/heads/branch-windows-dev
Commit: 2868c20515cc56f5f044c1bf5a289cb8d1c4c4d1
Parents: be54a4f
Author: Artem Baranchuk
Authored: Mon Nov 3 13:13:20 2014 +0200
Committer: Artem Baranchuk
Committed: Thu Nov 6 20:06:54 2014 +0200
--
.../YARN/configuration-mapred/mapred-site.xml | 212 +++
.../services/YARN/configuration/mapred-site.xml | 212 ---
.../HDPWIN/2.1/services/YARN/metainfo.xml | 1 -
.../data/configuration/cluster_env_site.json| 14 ++
.../controllers/main/service/info/configs.js| 27 +++
ambari-web/app/utils/ajax/ajax.js | 5 +
6 files changed, 258 insertions(+), 213 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2868c205/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml
new file mode 100644
index 000..8e909bc
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml
@@ -0,0 +1,212 @@
+
+
+
+http://www.w3.org/2001/XInclude";>
+
+
+mapreduce.framework.name
+yarn
+
+
+yarn.app.mapreduce.am.staging-dir
+/user
+
+
+mapreduce.job.hdfs-servers
+${fs.defaultFS}
+
+
+mapreduce.map.speculative
+false
+If true, then multiple instances of some map tasks
+ may be executed in parallel.
+
+
+mapreduce.reduce.speculative
+false
+If true, then multiple instances of some reduce tasks
+ may be executed in parallel.
+
+
+mapreduce.job.reduce.slowstart.completedmaps
+0.05
+Fraction of the number of maps in the job which should be
+ complete before reduces are scheduled for the job.
+
+
+
+mapreduce.task.timeout
+60
+The number of milliseconds before a task will be
+ terminated if it neither reads an input, writes an output, nor
+ updates its status string. A value of 0 disables the timeout.
+
+
+
+jetty.connector
+org.mortbay.jetty.nio.SelectChannelConnector
+No description
+
+
+mapred.child.root.logger
+INFO,TLA
+
+
+mapreduce.fileoutputcommitter.marksuccessfuljobs
+true
+
+
+mapreduce.job.acl-view-job
+*
+
+
+
+io.sort.mb
+200
+No description
+
+
+io.sort.spill.percent
+0.9
+No description
+
+
+io.sort.factor
+100
+No description
+
+
+
+mapreduce.map.output.compress
+true
+Should the outputs of the maps be compressed before being
+ sent across the network. Uses SequenceFile compression.
+
+
+
+mapreduce.map.output.compress.codec
+org.apache.hadoop.io.compress.SnappyCodec
+If the map outputs are compressed, how should they be
+ compressed?
+
+
+
+
+mapreduce.reduce.shuffle.parallelcopies
+30
+The default number of parallel transfers run by reduce
+ during the copy(shuffle) phase.
+
+
+
+mapreduce.reduce.merge.inmem.threshold
+1000
+The threshold, in terms of the number of files
+ for the in-memory merge process. When we accumulate threshold number of
files
+ we initiate the in-memory merge and spill to disk. A value of 0 or less
than
+ 0 indicates we want to DON'T have any threshold and instead depend only
on
+ the ramfs's memory consumption to trigger the merge.
+
+
+
+mapreduce.reduce.shuffle.merge.percent
+0.66
+The usage threshold at which an in-memory merge will be
+ initiated, expressed as a percentage of the total memory allocated to
+ storing in-memory map outputs, as defined by
+ mapreduce.reduce.shuffle.input.buffer.percent.
+
+
+
+mapreduce.reduce.shuffle.input.buffer.percent
+0.70
+The percentage of memory to be allocated from the maximum heap
+ size to storing map outputs during the shuffle.
+
+
+
+
+mapreduce.jobhistory.intermediate-done-dir
+/mapred/history/done_intermediate
+
+
+mapreduce.jobhistory.done-dir
+/mapred/history/done
+
+
+mapreduce.jobhistory.address
+l
git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk e50d850ce -> a4b8c9b30
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4b8c9b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4b8c9b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4b8c9b3
Branch: refs/heads/trunk
Commit: a4b8c9b30f2756cb24ee372e5741d76db7b517a1
Parents: e50d850
Author: Siddharth Wagle
Authored: Thu Nov 6 09:35:53 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 09:35:53 2014 -0800
--
.../2.0.6/hooks/before-ANY/scripts/params.py| 2 +
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22
.../services/HDFS/package/scripts/params.py | 2 +
.../services/HDFS/package/scripts/utils.py | 12 -
.../services/HDFS/configuration/hadoop-env.xml | 7 +++
.../python/stacks/2.0.6/HDFS/test_datanode.py | 57
6 files changed, 100 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4b8c9b3/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index fa3b118..ddb2b0b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -136,3 +136,5 @@ if has_nagios:
user_list = json.loads(config['hostLevelParams']['user_list'])
group_list = json.loads(config['hostLevelParams']['group_list'])
+
+dn_proc_user=hdfs_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4b8c9b3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index 25c1067..c192682 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,3 +81,25 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
+
+def setup_hadoop_env(replace=False):
+ import params
+
+ if params.security_enabled:
+tc_owner = "root"
+ else:
+tc_owner = params.hdfs_user
+ Directory(params.hadoop_conf_empty_dir,
+recursive=True,
+owner='root',
+group='root'
+ )
+ Link(params.hadoop_conf_dir,
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
+ )
+ File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
+ owner=tc_owner,
+ content=InlineTemplate(params.hadoop_env_sh_template),
+ replace=replace
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4b8c9b3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 22ce519..7e446f1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -253,3 +253,5 @@ ttnode_heapsize = "1024m"
dtnode_heapsize = config['configurations']['hadoop-env']['dtnode_heapsize']
mapred_pid_dir_prefix =
default("/configurations/mapred-env/mapred_pid_dir_prefix","/var/run/hadoop-mapreduce")
mapred_log_dir_prefix =
default("/configurations/mapred-env/mapred_log_dir_prefix","/var/log/hadoop-mapreduce")
+
+dn_proc_user=hdfs_user
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a4b8c9b3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index a52dc77..08358f5 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/s
[1/2] git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. Fix variable init. (swagle)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 ceb454991 -> a7e1a3793 AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. Fix variable init. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7e1a379 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7e1a379 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7e1a379 Branch: refs/heads/branch-1.7.0 Commit: a7e1a379330af4370f219e476f04a280d2ac9643 Parents: b5ed441 Author: Siddharth Wagle Authored: Thu Nov 6 09:29:41 2014 -0800 Committer: Siddharth Wagle Committed: Thu Nov 6 09:29:56 2014 -0800 -- .../resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a7e1a379/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index 6389f33..ddb2b0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -137,5 +137,4 @@ if has_nagios: user_list = json.loads(config['hostLevelParams']['user_list']) group_list = json.loads(config['hostLevelParams']['group_list']) -if security_enabled : - dn_proc_user=hdfs_user +dn_proc_user=hdfs_user
[2/2] git commit: AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command line. (swagle)
AMBARI-8174. Ambari-deployed cluster can't start datanode as root from command
line. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5ed4413
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5ed4413
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5ed4413
Branch: refs/heads/branch-1.7.0
Commit: b5ed44138a9781acc6eea877eb71a670f4adaa90
Parents: ceb4549
Author: Siddharth Wagle
Authored: Wed Nov 5 18:58:37 2014 -0800
Committer: Siddharth Wagle
Committed: Thu Nov 6 09:29:56 2014 -0800
--
.../2.0.6/hooks/before-ANY/scripts/params.py| 3 ++
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 22
.../services/HDFS/package/scripts/params.py | 2 +
.../services/HDFS/package/scripts/utils.py | 12 -
.../services/HDFS/configuration/hadoop-env.xml | 7 +++
.../python/stacks/2.0.6/HDFS/test_datanode.py | 57
6 files changed, 101 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ed4413/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index fa3b118..6389f33 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -136,3 +136,6 @@ if has_nagios:
user_list = json.loads(config['hostLevelParams']['user_list'])
group_list = json.loads(config['hostLevelParams']['group_list'])
+
+if security_enabled :
+ dn_proc_user=hdfs_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ed4413/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
index 25c1067..c192682 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs.py
@@ -81,3 +81,25 @@ def hdfs(name=None):
if params.lzo_enabled:
Package(params.lzo_packages_for_current_host)
+
+def setup_hadoop_env(replace=False):
+ import params
+
+ if params.security_enabled:
+tc_owner = "root"
+ else:
+tc_owner = params.hdfs_user
+ Directory(params.hadoop_conf_empty_dir,
+recursive=True,
+owner='root',
+group='root'
+ )
+ Link(params.hadoop_conf_dir,
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
+ )
+ File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
+ owner=tc_owner,
+ content=InlineTemplate(params.hadoop_env_sh_template),
+ replace=replace
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ed4413/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 22ce519..7e446f1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -253,3 +253,5 @@ ttnode_heapsize = "1024m"
dtnode_heapsize = config['configurations']['hadoop-env']['dtnode_heapsize']
mapred_pid_dir_prefix =
default("/configurations/mapred-env/mapred_pid_dir_prefix","/var/run/hadoop-mapreduce")
mapred_log_dir_prefix =
default("/configurations/mapred-env/mapred_log_dir_prefix","/var/log/hadoop-mapreduce")
+
+dn_proc_user=hdfs_user
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ed4413/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index 14251cd..36fbc86 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS
git commit: AMBARI-8184 Comparing identical config versions created by rollback for a new config group shows incorrect differences. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 0b930529c -> ceb454991
AMBARI-8184 Comparing identical config versions created by rollback for a new
config group shows incorrect differences. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ceb45499
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ceb45499
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ceb45499
Branch: refs/heads/branch-1.7.0
Commit: ceb45499122738682ae102023ea31ec90cf99f0b
Parents: 0b93052
Author: aBabiichuk
Authored: Thu Nov 6 18:45:50 2014 +0200
Committer: aBabiichuk
Committed: Thu Nov 6 18:45:50 2014 +0200
--
ambari-web/app/controllers/main/service/info/configs.js | 6 +++---
ambari-web/app/models/service_config.js | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ceb45499/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index bb0cac7..4dcc8a9 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -799,8 +799,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* @return {Boolean}
*/
hasCompareDiffs: function (originalConfig, compareConfig) {
-return (originalConfig.value !== compareConfig.value) ||
-(originalConfig.isFinal !== (compareConfig.isFinal == true));
+return (originalConfig.value !== compareConfig.value) ||
(!!originalConfig.isFinal !== (compareConfig.isFinal == true));
},
/**
@@ -1236,6 +1235,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
}
parentOverridesArray.pushObject(newSCP);
serviceConfigProperty.set('overrideValues',
parentOverridesArray.mapProperty('value'));
+ serviceConfigProperty.set('overrideIsFinalValues',
parentOverridesArray.mapProperty('isFinal'));
console.debug("createOverrideProperty(): Added override to
main-property:", serviceConfigProperty.get('name'));
}, this);
},
@@ -1658,7 +1658,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
buildGroupDesiredConfigs: function (configs, timeTag) {
var sites = [];
var time = timeTag || (new Date).getTime();
-var siteFileNames = configs.mapProperty('filename');
+var siteFileNames = configs.mapProperty('filename').uniq();
sites = siteFileNames.map(function (filename) {
return {
type: filename.replace('.xml', ''),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ceb45499/ambari-web/app/models/service_config.js
--
diff --git a/ambari-web/app/models/service_config.js
b/ambari-web/app/models/service_config.js
index cc864b2..e9fe148 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -224,7 +224,8 @@ App.ServiceConfigProperty = Ember.Object.extend({
}.property('overrides', 'overrides.length', 'isOriginalSCP'),
isOverrideChanged: function () {
if (Em.isNone(this.get('overrides')) && this.get('overrideValues.length')
=== 0) return false;
-return JSON.stringify(this.get('overrides').mapProperty('value')) !==
JSON.stringify(this.get('overrideValues'));
+return JSON.stringify(this.get('overrides').mapProperty('isFinal')) !==
JSON.stringify(this.get('overrideIsFinalValues'))
+ || JSON.stringify(this.get('overrides').mapProperty('value')) !==
JSON.stringify(this.get('overrideValues'));
}.property('isOverridden', 'overrides.@each.isNotDefaultValue'),
isRemovable: function() {
var isOriginalSCP = this.get('isOriginalSCP');
git commit: AMBARI-8184 Comparing identical config versions created by rollback for a new config group shows incorrect differences. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a9092f990 -> e50d850ce
AMBARI-8184 Comparing identical config versions created by rollback for a new
config group shows incorrect differences. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e50d850c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e50d850c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e50d850c
Branch: refs/heads/trunk
Commit: e50d850cecc1c7c8bbc5c1c384dec4c29c185147
Parents: a9092f9
Author: aBabiichuk
Authored: Thu Nov 6 18:02:25 2014 +0200
Committer: aBabiichuk
Committed: Thu Nov 6 18:43:19 2014 +0200
--
ambari-web/app/controllers/main/service/info/configs.js | 6 +++---
ambari-web/app/models/service_config.js | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e50d850c/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index a2465c2..bf31a0e 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -771,8 +771,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* @return {Boolean}
*/
hasCompareDiffs: function (originalConfig, compareConfig) {
-return (originalConfig.value !== compareConfig.value) ||
-(originalConfig.isFinal !== (compareConfig.isFinal == true));
+return (originalConfig.value !== compareConfig.value) ||
(!!originalConfig.isFinal !== (compareConfig.isFinal == true));
},
/**
@@ -1195,6 +1194,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
}
parentOverridesArray.pushObject(newSCP);
serviceConfigProperty.set('overrideValues',
parentOverridesArray.mapProperty('value'));
+ serviceConfigProperty.set('overrideIsFinalValues',
parentOverridesArray.mapProperty('isFinal'));
console.debug("createOverrideProperty(): Added override to
main-property:", serviceConfigProperty.get('name'));
}, this);
},
@@ -1599,7 +1599,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
buildGroupDesiredConfigs: function (configs, timeTag) {
var sites = [];
var time = timeTag || (new Date).getTime();
-var siteFileNames = configs.mapProperty('filename');
+var siteFileNames = configs.mapProperty('filename').uniq();
sites = siteFileNames.map(function (filename) {
return {
type: filename.replace('.xml', ''),
http://git-wip-us.apache.org/repos/asf/ambari/blob/e50d850c/ambari-web/app/models/service_config.js
--
diff --git a/ambari-web/app/models/service_config.js
b/ambari-web/app/models/service_config.js
index e94de00..d652410 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -224,7 +224,8 @@ App.ServiceConfigProperty = Ember.Object.extend({
}.property('overrides', 'overrides.length', 'isOriginalSCP'),
isOverrideChanged: function () {
if (Em.isNone(this.get('overrides')) && this.get('overrideValues.length')
=== 0) return false;
-return JSON.stringify(this.get('overrides').mapProperty('value')) !==
JSON.stringify(this.get('overrideValues'));
+return JSON.stringify(this.get('overrides').mapProperty('isFinal')) !==
JSON.stringify(this.get('overrideIsFinalValues'))
+ || JSON.stringify(this.get('overrides').mapProperty('value')) !==
JSON.stringify(this.get('overrideValues'));
}.property('isOverridden', 'overrides.@each.isNotDefaultValue'),
isRemovable: function() {
var isOriginalSCP = this.get('isOriginalSCP');
[3/3] git commit: AMBARI-8185. Services fail to start when pid file is empty (dlysnichenko)
AMBARI-8185. Services fail to start when pid file is empty (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9092f99 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9092f99 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9092f99 Branch: refs/heads/trunk Commit: a9092f99087d4305bc323352204d2005fed0053d Parents: f003a20 Author: Lisnichenko Dmitro Authored: Thu Nov 6 18:39:42 2014 +0200 Committer: Lisnichenko Dmitro Committed: Thu Nov 6 18:40:19 2014 +0200 -- ambari-agent/conf/unix/ambari-agent | 8 ++-- .../HBASE/package/scripts/hbase_service.py | 4 +- .../HDFS/package/scripts/service_check.py | 2 +- .../0.8/services/HDFS/package/scripts/utils.py | 2 +- .../HIVE/package/scripts/hive_service.py| 4 +- .../0.8/services/OOZIE/package/scripts/oozie.py | 2 +- .../OOZIE/package/scripts/oozie_service.py | 2 +- .../WEBHCAT/package/scripts/webhcat_service.py | 2 +- .../services/YARN/package/scripts/service.py| 2 +- .../package/scripts/zookeeper_service.py| 2 +- .../HBASE/package/scripts/hbase_service.py | 2 +- .../HDFS/package/scripts/service_check.py | 2 +- .../services/HDFS/package/scripts/utils.py | 4 +- .../HIVE/package/scripts/hive_service.py| 2 +- .../HIVE/package/scripts/webhcat_service.py | 2 +- .../MAPREDUCE/package/scripts/service.py| 2 +- .../services/OOZIE/package/scripts/oozie.py | 2 +- .../OOZIE/package/scripts/oozie_service.py | 2 +- .../package/scripts/zookeeper_service.py| 2 +- .../services/YARN/package/scripts/service.py| 2 +- .../HBASE/package/scripts/hbase_service.py | 4 +- .../HDFS/package/scripts/service_check.py | 2 +- .../services/HDFS/package/scripts/utils.py | 4 +- .../HIVE/package/scripts/hive_service.py| 2 +- .../HIVE/package/scripts/webhcat_service.py | 2 +- .../services/OOZIE/package/scripts/oozie.py | 2 +- .../OOZIE/package/scripts/oozie_service.py | 2 +- .../services/YARN/package/scripts/service.py| 2 +- .../package/scripts/zookeeper_service.py| 2 +- .../services/STORM/package/scripts/service.py | 2 +- .../services/YARN/package/scripts/service.py| 2 +- .../services/STORM/package/scripts/service.py | 2 +- .../KAFKA/package/scripts/kafka_broker.py | 2 +- .../KNOX/package/scripts/knox_gateway.py| 4 +- .../stacks/1.3.2/HBASE/test_hbase_master.py | 4 +- .../1.3.2/HBASE/test_hbase_regionserver.py | 4 +- .../python/stacks/1.3.2/HDFS/test_datanode.py | 12 +++--- .../python/stacks/1.3.2/HDFS/test_namenode.py | 12 +++--- .../python/stacks/1.3.2/HDFS/test_snamenode.py | 12 +++--- .../stacks/1.3.2/HIVE/test_hive_metastore.py| 8 ++-- .../stacks/1.3.2/HIVE/test_hive_server.py | 8 ++-- .../stacks/1.3.2/HIVE/test_webhcat_server.py| 6 +-- .../MAPREDUCE/test_mapreduce_historyserver.py | 14 +++ .../MAPREDUCE/test_mapreduce_jobtracker.py | 12 +++--- .../MAPREDUCE/test_mapreduce_tasktracker.py | 14 +++ .../stacks/1.3.2/OOZIE/test_oozie_server.py | 44 ++-- .../1.3.2/ZOOKEEPER/test_zookeeper_server.py| 6 +-- .../stacks/2.0.6/HBASE/test_hbase_master.py | 8 ++-- .../2.0.6/HBASE/test_hbase_regionserver.py | 8 ++-- .../python/stacks/2.0.6/HDFS/test_datanode.py | 24 +-- .../stacks/2.0.6/HDFS/test_journalnode.py | 12 +++--- .../python/stacks/2.0.6/HDFS/test_namenode.py | 20 - .../python/stacks/2.0.6/HDFS/test_snamenode.py | 12 +++--- .../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 12 +++--- .../stacks/2.0.6/HIVE/test_hive_metastore.py| 8 ++-- .../stacks/2.0.6/HIVE/test_hive_server.py | 8 ++-- .../stacks/2.0.6/HIVE/test_webhcat_server.py| 6 +-- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 28 ++--- .../stacks/2.0.6/YARN/test_historyserver.py | 4 +- .../stacks/2.0.6/YARN/test_nodemanager.py | 6 +-- .../stacks/2.0.6/YARN/test_resourcemanager.py | 4 +- .../2.0.6/ZOOKEEPER/test_zookeeper_server.py| 4 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 8 ++-- .../stacks/2.1/STORM/test_storm_drpc_server.py | 12 +++--- .../stacks/2.1/STORM/test_storm_nimbus.py | 14 +++ .../2.1/STORM/test_storm_rest_api_service.py| 12 +++--- .../stacks/2.1/STORM/test_storm_supervisor.py | 24 +-- .../2.1/STORM/test_storm_supervisor_prod.py | 12 +++--- .../stacks/2.1/STORM/test_storm_ui_server.py| 14 +++ .../stacks/2.1/YARN/test_apptimelineserver.py | 2 +- 70 files changed, 252 insertions(+), 252 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a9092f99/ambari-agent/conf/unix/ambari-agent -
[2/3] AMBARI-8185. Services fail to start when pid file is empty (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9092f99/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
index 13e1fdc..0cabe63 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
@@ -115,16 +115,16 @@ class TestOozieServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf
oozie-sharelib.tar.gz',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p
/var/tmp/oozie',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown
oozie:hadoop /var/tmp/oozie',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie &&
/usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs
/usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name
"hadoop-lzo-*")); echo ${LZO_JARS[0]}`:',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
self.assertNoMoreResources()
@@ -138,7 +138,7 @@ class TestOozieServer(RMFTestCase):
)
self.configure_default()
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie &&
/usr/lib/oozie/bin/ooziedb.sh create -sqlfile oozie.sql -run',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
ignore_failures = True,
user = 'oozie',
)
@@ -147,7 +147,7 @@ class TestOozieServer(RMFTestCase):
user = 'oozie',
)
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie &&
/usr/lib/oozie/bin/oozie-start.sh',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
self.assertNoMoreResources()
@@ -161,7 +161,7 @@ class TestOozieServer(RMFTestCase):
config_file="default.json"
)
self.assertResourceCalled('Execute', "su -s /bin/bash - oozie -c 'cd
/var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh' && rm -f
/var/run/oozie/oozie.pid",
- only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertNoMoreResources()
@@ -259,16 +259,16 @@ class TestOozieServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf
oozie-sharelib.tar.gz',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p
/var/tmp/oozie',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown
oozie:hadoop /var/tmp/oozie',
- not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat
/var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie &&
/usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.2
[1/3] AMBARI-8185. Services fail to start when pid file is empty (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk f003a20bf -> a9092f990
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9092f99/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
index b502859..195fa43 100644
---
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
+++
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
@@ -45,7 +45,7 @@ class TestStormRestApi(TestStormBase):
self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -jar
/usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep
-wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml >
/var/log/storm/restapi.log 2>&1',
wait_for_finish = False,
- not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
path = ['/usr/bin'],
user = 'storm',
)
@@ -65,10 +65,10 @@ class TestStormRestApi(TestStormBase):
config_file="default.json"
)
self.assertResourceCalled('Execute', 'kill `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
- not_if = '! (ls /var/run/storm/restapi.pid
>/dev/null 2>&1 && ps `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)'
+ not_if = '! (ls /var/run/storm/restapi.pid
>/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)'
)
self.assertResourceCalled('Execute', 'kill -9 `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
- not_if = 'sleep 2; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1)',
+ not_if = 'sleep 2; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1)',
ignore_failures=True
)
self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid')
@@ -94,7 +94,7 @@ class TestStormRestApi(TestStormBase):
self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -jar
/usr/lib/storm/contrib/storm-rest/`ls /usr/lib/storm/contrib/storm-rest | grep
-wE storm-rest-[0-9.-]+\\.jar` server /etc/storm/conf/config.yaml >
/var/log/storm/restapi.log 2>&1',
wait_for_finish = False,
- not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
+ not_if = 'ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
path = ['/usr/bin'],
user = 'storm',
)
@@ -115,10 +115,10 @@ class TestStormRestApi(TestStormBase):
config_file="secured.json"
)
self.assertResourceCalled('Execute', 'kill `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
- not_if = '! (ls /var/run/storm/restapi.pid
>/dev/null 2>&1 && ps `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)'
+ not_if = '! (ls /var/run/storm/restapi.pid
>/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)'
)
self.assertResourceCalled('Execute', 'kill -9 `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1',
- not_if = 'sleep 2; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1)',
+ not_if = 'sleep 2; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls
/var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat
/var/run/storm/restapi.pid` >/dev/null 2>&1)',
ignore_failures=True
)
self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid')
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9092f99/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
git commit: AMBARI-8183. Install Wizard > Customize Services > Config Groups: the config group names do not show on overridden props (Max Shepel via onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 f12396524 -> 0b930529c
AMBARI-8183. Install Wizard > Customize Services > Config Groups: the config
group names do not show on overridden props (Max Shepel via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b930529
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b930529
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b930529
Branch: refs/heads/branch-1.7.0
Commit: 0b930529c85c71dd388f626827d65886c897ad07
Parents: f123965
Author: Oleg Nechiporenko
Authored: Thu Nov 6 17:54:08 2014 +0200
Committer: Oleg Nechiporenko
Committed: Thu Nov 6 17:54:08 2014 +0200
--
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/data/HDP2/site_properties.js | 1 -
.../common/configs/overriddenProperty_view.js | 15 +++-
.../configs/overriddenProperty_view_test.js | 83
4 files changed, 98 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b930529/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index e25111a..d479952 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -169,6 +169,7 @@ var files = ['test/init_model_test',
'test/views/main/service/info/config_test',
'test/views/main/service/info/summary_test',
'test/views/main/mirroring/edit_dataset_view_test',
+ 'test/views/common/configs/overriddenProperty_view_test',
'test/views/common/configs/services_config_test',
'test/views/wizard/step3/hostLogPopupBody_view_test',
'test/views/wizard/step3/hostWarningPopupBody_view_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b930529/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index d93b247..5dde87c 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2849,7 +2849,6 @@ module.exports =
"radioName": "hive-database",
"isOverridable": false,
"isVisible": true,
- "isObserved": true,
"serviceName": "HIVE",
"filename": "hive-env.xml",
"category": "HIVE_METASTORE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b930529/ambari-web/app/views/common/configs/overriddenProperty_view.js
--
diff --git a/ambari-web/app/views/common/configs/overriddenProperty_view.js
b/ambari-web/app/views/common/configs/overriddenProperty_view.js
index 079084e..8397c88 100644
--- a/ambari-web/app/views/common/configs/overriddenProperty_view.js
+++ b/ambari-web/app/views/common/configs/overriddenProperty_view.js
@@ -24,7 +24,20 @@ App.ServiceConfigView.SCPOverriddenRowsView =
Ember.View.extend({
// we are declaring this from configs.hbs ( we are initializing this from UI
)
categoryConfigs: null, // just declared as viewClass need it
- didInsertElement: function (){
+ init: function () {
+this._super();
+this.addObserver('isDefaultGroupSelected', this, 'setSwitchText');
+ },
+
+ didInsertElement: function () {
+this.setSwitchText();
+ },
+
+ willDestroyElement: function () {
+this.removeObserver('isDefaultGroupSelected', this, 'setSwitchText');
+ },
+
+ setSwitchText: function () {
Em.$('body>.tooltip').remove();
if (this.get('isDefaultGroupSelected')) {
var overrides = this.get('serviceConfigProperty.overrides');
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b930529/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
new file mode 100644
index 000..7520cef
--- /dev/null
+++ b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, so
git commit: AMBARI-8183. Install Wizard > Customize Services > Config Groups: the config group names do not show on overridden props (Max Shepel via onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 264c1c314 -> f003a20bf
AMBARI-8183. Install Wizard > Customize Services > Config Groups: the config
group names do not show on overridden props (Max Shepel via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f003a20b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f003a20b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f003a20b
Branch: refs/heads/trunk
Commit: f003a20bfeff82d7e03ccc2e55858c1c940738bb
Parents: 264c1c3
Author: Oleg Nechiporenko
Authored: Thu Nov 6 17:52:21 2014 +0200
Committer: Oleg Nechiporenko
Committed: Thu Nov 6 17:52:21 2014 +0200
--
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/data/HDP2/site_properties.js | 1 -
.../common/configs/overriddenProperty_view.js | 15 +++-
.../configs/overriddenProperty_view_test.js | 83
4 files changed, 98 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f003a20b/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index b6cc4c0..dea7d1f 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -172,6 +172,7 @@ var files = ['test/init_model_test',
'test/views/main/service/item_test',
'test/views/main/service/info/config_test',
'test/views/main/service/info/summary_test',
+ 'test/views/common/configs/overriddenProperty_view_test',
'test/views/common/configs/services_config_test',
'test/views/wizard/step3/hostLogPopupBody_view_test',
'test/views/wizard/step3/hostWarningPopupBody_view_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f003a20b/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index a81a471..6ed2240 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2848,7 +2848,6 @@ module.exports =
"radioName": "hive-database",
"isOverridable": false,
"isVisible": true,
- "isObserved": true,
"serviceName": "HIVE",
"filename": "hive-env.xml",
"category": "HIVE_METASTORE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/f003a20b/ambari-web/app/views/common/configs/overriddenProperty_view.js
--
diff --git a/ambari-web/app/views/common/configs/overriddenProperty_view.js
b/ambari-web/app/views/common/configs/overriddenProperty_view.js
index 079084e..8397c88 100644
--- a/ambari-web/app/views/common/configs/overriddenProperty_view.js
+++ b/ambari-web/app/views/common/configs/overriddenProperty_view.js
@@ -24,7 +24,20 @@ App.ServiceConfigView.SCPOverriddenRowsView =
Ember.View.extend({
// we are declaring this from configs.hbs ( we are initializing this from UI
)
categoryConfigs: null, // just declared as viewClass need it
- didInsertElement: function (){
+ init: function () {
+this._super();
+this.addObserver('isDefaultGroupSelected', this, 'setSwitchText');
+ },
+
+ didInsertElement: function () {
+this.setSwitchText();
+ },
+
+ willDestroyElement: function () {
+this.removeObserver('isDefaultGroupSelected', this, 'setSwitchText');
+ },
+
+ setSwitchText: function () {
Em.$('body>.tooltip').remove();
if (this.get('isDefaultGroupSelected')) {
var overrides = this.get('serviceConfigProperty.overrides');
http://git-wip-us.apache.org/repos/asf/ambari/blob/f003a20b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
new file mode 100644
index 000..7520cef
--- /dev/null
+++ b/ambari-web/test/views/common/configs/overriddenProperty_view_test.js
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under
[1/2] git commit: AMBARI-8092. Set appropriate configuration settings for Hive (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 f124bf5be -> f12396524 refs/heads/trunk 836541a2f -> 264c1c314 AMBARI-8092. Set appropriate configuration settings for Hive (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1239652 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1239652 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1239652 Branch: refs/heads/branch-1.7.0 Commit: f1239652497e418db9726b4c264cd7bc08daca72 Parents: f124bf5 Author: Lisnichenko Dmitro Authored: Thu Nov 6 17:47:27 2014 +0200 Committer: Lisnichenko Dmitro Committed: Thu Nov 6 17:47:27 2014 +0200 -- .../services/HIVE/configuration/hive-site.xml | 1029 +- ambari-web/app/data/HDP2.2/hive_properties.js | 120 ++ ambari-web/app/data/HDP2.2/site_properties.js | 10 +- ambari-web/app/models/stack_service.js |6 +- 4 files changed, 1132 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f1239652/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index abc17c5..2538823 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -28,59 +28,56 @@ limitations under the License. hive.zookeeper.quorum localhost:2181 -ZooKeeper servers, as comma separated host:port pairs +List of ZooKeeper servers to talk to. This is needed for: 1. + Read/write locks - when hive.lock.manager is set to + org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager, + 2. When HiveServer2 supports service discovery via Zookeeper. hive.metastore.failure.retries 5 -Number of retries of metastore client in case of a failure. +Number of retries upon failure of Thrift metastore calls hive.metastore.client.connect.retry.delay 5s -The delay in seconds between two consecutive metastore client retries + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + Number of seconds for the client to wait between consecutive connection attempts + hive.metastore.client.socket.timeout 1800s -MetaStore Client socket timeout in seconds - - - -hive.cluster.delegation.token.store.class -org.apache.hadoop.hive.thrift.ZooKeeperTokenStore -The delegation token store implementation class. - - - -hive.cluster.delegation.token.store.zookeeper.connectString -localhost:2181 -The ZooKeeper token store connect string. + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + MetaStore Client socket timeout in seconds + hive.mapjoin.bucket.cache.size 1 -true - -Renamed to hive.smbjoin.cache.rows. - + hive.security.authorization.manager org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory -the hive client authorization manager class name. -The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. + + The Hive client authorization manager class name. The user defined authorization class should implement + interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. + hive.cluster.delegation.token.store.class org.apache.hadoop.hive.thrift.ZooKeeperTokenStore -The delegation token store implementation class. +The delegation token store implementation. + Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster. @@ -92,11 +89,10 @@ limitations under the License. hive.server2.support.dynamic.service.discovery true -Whether HiveServer2 supports dynamic service discovery for its - clients. To support this, each instance of HiveServer2 currently uses - ZooKeeper to register itself, when it is brought up. JDBC/ODBC clients - should use the ZooKeeper ensemble: hive.zookeeper.quorum in their - connection string. +Whether HiveServer2 supports dynamic service discovery for its clients. + To support this, each instance of HiveServer2 currently
[2/2] git commit: AMBARI-8092. Set appropriate configuration settings for Hive (dlysnichenko)
AMBARI-8092. Set appropriate configuration settings for Hive (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/264c1c31 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/264c1c31 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/264c1c31 Branch: refs/heads/trunk Commit: 264c1c3149e8e912132e4f5abc219282d0f46c9d Parents: 836541a Author: Lisnichenko Dmitro Authored: Thu Nov 6 17:47:27 2014 +0200 Committer: Lisnichenko Dmitro Committed: Thu Nov 6 17:50:32 2014 +0200 -- .../services/HIVE/configuration/hive-site.xml | 1029 +- ambari-web/app/data/HDP2.2/hive_properties.js | 120 ++ ambari-web/app/data/HDP2.2/site_properties.js | 10 +- ambari-web/app/models/stack_service.js |6 +- 4 files changed, 1132 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/264c1c31/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index abc17c5..2538823 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -28,59 +28,56 @@ limitations under the License. hive.zookeeper.quorum localhost:2181 -ZooKeeper servers, as comma separated host:port pairs +List of ZooKeeper servers to talk to. This is needed for: 1. + Read/write locks - when hive.lock.manager is set to + org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager, + 2. When HiveServer2 supports service discovery via Zookeeper. hive.metastore.failure.retries 5 -Number of retries of metastore client in case of a failure. +Number of retries upon failure of Thrift metastore calls hive.metastore.client.connect.retry.delay 5s -The delay in seconds between two consecutive metastore client retries + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + Number of seconds for the client to wait between consecutive connection attempts + hive.metastore.client.socket.timeout 1800s -MetaStore Client socket timeout in seconds - - - -hive.cluster.delegation.token.store.class -org.apache.hadoop.hive.thrift.ZooKeeperTokenStore -The delegation token store implementation class. - - - -hive.cluster.delegation.token.store.zookeeper.connectString -localhost:2181 -The ZooKeeper token store connect string. + + Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified. + MetaStore Client socket timeout in seconds + hive.mapjoin.bucket.cache.size 1 -true - -Renamed to hive.smbjoin.cache.rows. - + hive.security.authorization.manager org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory -the hive client authorization manager class name. -The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. + + The Hive client authorization manager class name. The user defined authorization class should implement + interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. + hive.cluster.delegation.token.store.class org.apache.hadoop.hive.thrift.ZooKeeperTokenStore -The delegation token store implementation class. +The delegation token store implementation. + Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster. @@ -92,11 +89,10 @@ limitations under the License. hive.server2.support.dynamic.service.discovery true -Whether HiveServer2 supports dynamic service discovery for its - clients. To support this, each instance of HiveServer2 currently uses - ZooKeeper to register itself, when it is brought up. JDBC/ODBC clients - should use the ZooKeeper ensemble: hive.zookeeper.quorum in their - connection string. +Whether HiveServer2 supports dynamic service discovery for its clients. + To support this, each instance of HiveServer2 currently uses ZooKeeper to register itself, + when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.q
git commit: AMBARI-8182. Abort should not be available read-only users. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9089bdc16 -> 836541a2f
AMBARI-8182. Abort should not be available read-only users. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/836541a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/836541a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/836541a2
Branch: refs/heads/trunk
Commit: 836541a2f54eb36afebd46a9396827f7d59e246f
Parents: 9089bdc
Author: Aleksandr Kovalenko
Authored: Thu Nov 6 16:52:34 2014 +0200
Committer: Aleksandr Kovalenko
Committed: Thu Nov 6 16:52:34 2014 +0200
--
ambari-web/app/utils/host_progress_popup.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/836541a2/ambari-web/app/utils/host_progress_popup.js
--
diff --git a/ambari-web/app/utils/host_progress_popup.js
b/ambari-web/app/utils/host_progress_popup.js
index e353fa6..e089f57 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -357,7 +357,7 @@ App.HostPopup = Em.Object.create({
updatedService = this.createService(service);
servicesInfo.insertAt(index, updatedService);
}
-updatedService.set('isAbortable',
this.isAbortableByStatus(service.status));
+updatedService.set('isAbortable', App.get('isManager') &&
this.isAbortableByStatus(service.status));
}, this);
this.removeOldServices(servicesInfo, currentServices);
this.setBackgroundOperationHeader(isServiceListHidden);
git commit: AMBARI-8182. Abort should not be available read-only users. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 52cabf19d -> f124bf5be
AMBARI-8182. Abort should not be available read-only users. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f124bf5b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f124bf5b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f124bf5b
Branch: refs/heads/branch-1.7.0
Commit: f124bf5be3906ad21db3bdc0dffcd87995bc607f
Parents: 52cabf1
Author: Aleksandr Kovalenko
Authored: Thu Nov 6 16:57:58 2014 +0200
Committer: Aleksandr Kovalenko
Committed: Thu Nov 6 16:57:58 2014 +0200
--
ambari-web/app/utils/host_progress_popup.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f124bf5b/ambari-web/app/utils/host_progress_popup.js
--
diff --git a/ambari-web/app/utils/host_progress_popup.js
b/ambari-web/app/utils/host_progress_popup.js
index 1e2c675..66715e6 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -358,7 +358,7 @@ App.HostPopup = Em.Object.create({
servicesInfo.insertAt(index, updatedService);
}
if (App.get('supports.abortRequests')) {
- updatedService.set('isAbortable',
this.isAbortableByStatus(service.status));
+ updatedService.set('isAbortable', App.get('isManager') &&
this.isAbortableByStatus(service.status));
}
}, this);
this.removeOldServices(servicesInfo, currentServices);
git commit: AMBARI-8181. Non-cluster operator can access "Admin" tab content by going to /#/main/admin. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 58e4ef7a1 -> 52cabf19d
AMBARI-8181. Non-cluster operator can access "Admin" tab content by going to
/#/main/admin. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52cabf19
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52cabf19
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52cabf19
Branch: refs/heads/branch-1.7.0
Commit: 52cabf19d96e798918e08d4a49c0478001d7d52c
Parents: 58e4ef7
Author: Oleg Nechiporenko
Authored: Thu Nov 6 15:06:03 2014 +0200
Committer: Oleg Nechiporenko
Committed: Thu Nov 6 15:57:23 2014 +0200
--
ambari-web/app/routes/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/52cabf19/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 25f1714..992f934 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -313,7 +313,7 @@ module.exports = Em.Route.extend({
admin: Em.Route.extend({
route: '/admin',
enter: function (router, transition) {
- if (router.get('loggeIn') && !App.get('isAdmin')) {
+ if (router.get('loggedIn') && !App.get('isAdmin')) {
Em.run.next(function () {
router.transitionTo('main.dashboard.index');
});
git commit: AMBARI-8181. Non-cluster operator can access "Admin" tab content by going to /#/main/admin. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c55e77f2f -> 9089bdc16
AMBARI-8181. Non-cluster operator can access "Admin" tab content by going to
/#/main/admin. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9089bdc1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9089bdc1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9089bdc1
Branch: refs/heads/trunk
Commit: 9089bdc163659b234d52eefc056d1b75dd7812cb
Parents: c55e77f
Author: Oleg Nechiporenko
Authored: Thu Nov 6 15:09:30 2014 +0200
Committer: Oleg Nechiporenko
Committed: Thu Nov 6 15:57:02 2014 +0200
--
ambari-web/app/routes/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9089bdc1/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index a3f7da8..d461812 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -333,7 +333,7 @@ module.exports = Em.Route.extend({
admin: Em.Route.extend({
route: '/admin',
enter: function (router, transition) {
- if (router.get('loggeIn') && !App.get('isAdmin')) {
+ if (router.get('loggedIn') && !App.get('isAdmin')) {
Em.run.next(function () {
router.transitionTo('main.dashboard.index');
});
git commit: AMBARI-8179 HDP 2.2: Oozie + Falcon versions are incorrect (dsen)
Repository: ambari Updated Branches: refs/heads/trunk f159e40bf -> c55e77f2f AMBARI-8179 HDP 2.2: Oozie + Falcon versions are incorrect (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c55e77f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c55e77f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c55e77f2 Branch: refs/heads/trunk Commit: c55e77f2f920d834747834c3cc1b69736ccd44b4 Parents: f159e40 Author: Dmytro Sen Authored: Thu Nov 6 15:55:04 2014 +0200 Committer: Dmytro Sen Committed: Thu Nov 6 15:55:04 2014 +0200 -- .../main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c55e77f2/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml index 906f520..20d9098 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml @@ -21,7 +21,7 @@ FALCON Falcon - 0.6.0.2.2.9.9 + 0.6.0.2.2.0.0 redhat5,redhat6,suse11 http://git-wip-us.apache.org/repos/asf/ambari/blob/c55e77f2/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml index e56afd3..694be1b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml @@ -20,7 +20,7 @@ OOZIE - 4.1.0.2.2.9.9 + 4.1.0.2.2.0.0 any http://git-wip-us.apache.org/repos/asf/ambari/blob/c55e77f2/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml index e4e2286..42be202 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml @@ -21,8 +21,7 @@ ZOOKEEPER ZooKeeper - 3.4.5.2.2.0.0 - + 3.4.6.2.2.0.0 redhat5,redhat6,suse11
git commit: AMBARI-8179 HDP 2.2: Oozie + Falcon versions are incorrect (dsen)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 03d9b19e3 -> 58e4ef7a1 AMBARI-8179 HDP 2.2: Oozie + Falcon versions are incorrect (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/58e4ef7a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58e4ef7a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58e4ef7a Branch: refs/heads/branch-1.7.0 Commit: 58e4ef7a12133f85a151f4d82ac222a3160b6363 Parents: 03d9b19 Author: Dmytro Sen Authored: Thu Nov 6 15:49:54 2014 +0200 Committer: Dmytro Sen Committed: Thu Nov 6 15:49:54 2014 +0200 -- .../main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/58e4ef7a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml index 906f520..20d9098 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml @@ -21,7 +21,7 @@ FALCON Falcon - 0.6.0.2.2.9.9 + 0.6.0.2.2.0.0 redhat5,redhat6,suse11 http://git-wip-us.apache.org/repos/asf/ambari/blob/58e4ef7a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml index e56afd3..694be1b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml @@ -20,7 +20,7 @@ OOZIE - 4.1.0.2.2.9.9 + 4.1.0.2.2.0.0 any http://git-wip-us.apache.org/repos/asf/ambari/blob/58e4ef7a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml index e4e2286..42be202 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml @@ -21,8 +21,7 @@ ZOOKEEPER ZooKeeper - 3.4.5.2.2.0.0 - + 3.4.6.2.2.0.0 redhat5,redhat6,suse11
git commit: AMBARI-8157 Create model and mapper for stack versions. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4d9685f4f -> f159e40bf
AMBARI-8157 Create model and mapper for stack versions. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f159e40b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f159e40b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f159e40b
Branch: refs/heads/trunk
Commit: f159e40bf0f344dc1994548bc82aaa9e1480579b
Parents: 4d9685f
Author: aBabiichuk
Authored: Thu Nov 6 14:48:29 2014 +0200
Committer: aBabiichuk
Committed: Thu Nov 6 14:48:29 2014 +0200
--
.../data/stack_versions/stack_version_all.json | 94 +
ambari-web/app/mappers.js | 3 +-
ambari-web/app/mappers/stack_version_mapper.js | 101 +++
ambari-web/app/models.js| 3 +
ambari-web/app/models/stack_version/os.js | 30 ++
.../app/models/stack_version/repository.js | 30 ++
ambari-web/app/models/stack_version/version.js | 31 ++
ambari-web/app/utils/ajax/ajax.js | 4 +
8 files changed, 295 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f159e40b/ambari-web/app/assets/data/stack_versions/stack_version_all.json
--
diff --git a/ambari-web/app/assets/data/stack_versions/stack_version_all.json
b/ambari-web/app/assets/data/stack_versions/stack_version_all.json
new file mode 100644
index 000..ff8ece0
--- /dev/null
+++ b/ambari-web/app/assets/data/stack_versions/stack_version_all.json
@@ -0,0 +1,94 @@
+{
+ "items": [
+{
+ "StackVersion": {
+"name": "HDP 2.2.0.0",
+"version": "2.2.0.0",
+"installed_hosts": 0,
+"current_hosts": 0,
+"repositories": [
+ {
+"os": "redhat6",
+"baseurls": [
+ {
+"id": "HDP-2.2.0.1-885",
+"type": "HDP",
+"baseurl": "http://host1/hdp";
+ },
+ {
+"id": "HDP-UTILS-1.0.0.20",
+"type": "HDP-UTILS",
+"baseurl": "http://host1/hdp-utils";
+ }
+]
+ },
+ {
+"os": "ubuntu12",
+"baseurls": [
+ {
+"id": "HDP-2.2.0.1-885",
+"type": "HDP",
+"baseurl": "http://host1/hdp";
+ },
+ {
+"id": "HDP-UTILS-1.0.0.20",
+"type": "HDP-UTILS",
+"baseurl": "http://host1/hdp-utils";
+ }
+]
+ }
+]
+ }
+},
+{
+ "StackVersion": {
+"name": "HDP 2.2.0.1",
+"version": "2.2.0.1",
+"installed_hosts": 2,
+"current_hosts": 3,
+"repositories": [
+ {
+"os": "redhat6",
+"baseurls": [
+ {
+"id": "HDP-2.2.0.1-885",
+"type": "HDP",
+"baseurl": "http://host1/hdp";
+ },
+ {
+"id": "HDP-UTILS-1.0.0.20",
+"type": "HDP-UTILS",
+"baseurl": "http://host1/hdp-utils";
+ }
+]
+ }
+]
+ }
+},
+{
+ "StackVersion": {
+"name": "HDP 2.2.0.2",
+"version": "2.2.0.2",
+"installed_hosts": 5,
+"current_hosts": 5,
+"repositories": [
+ {
+"os": "redhat6",
+"baseurls": [
+ {
+"id": "HDP-2.2.0.1-885",
+"type": "HDP",
+"baseurl": "http://host1/hdp";
+ },
+ {
+"id": "HDP-UTILS-1.0.0.20",
+"type": "HDP-UTILS",
+"baseurl": "http://host1/hdp-utils";
+ }
+]
+ }
+]
+ }
+}
+ ]
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f159e40b/ambari-web/app/mappers.js
--
diff --git a/ambari-web/app/mappers.js b/ambari-web/app/mappers.js
index 88c7328..9b72e09 100644
--- a/ambari-web/app/mappers.js
+++ b/ambari-web/app/mappers.js
@@ -20,6 +20,7 @@
require('mappers/server_data_mapper');
require('mappers/stack_service_mapper');
require('mappers/stack_mapper');
+require('mappers/stack_version_mapper');
require('mappers/hosts_mapper');
require('mappers/jobs_mapper');
require('mappers/cluster_mapper');
@@ -33,4 +34,4 @@ require('mappers/dataset_mapper');
require('mappers/component_config_mapper');
require('mappers/components_state_mapper');
require('mappers/service_config_version_mapper');
-require('mappers/alert_def
git commit: AMBARI-8180 Broken Config banner. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 7aed514bb -> 03d9b19e3
AMBARI-8180 Broken Config banner. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03d9b19e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03d9b19e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03d9b19e
Branch: refs/heads/branch-1.7.0
Commit: 03d9b19e31d3a225a9f879a31a2cd04d227e60d6
Parents: 7aed514
Author: Andrii Tkach
Authored: Thu Nov 6 13:37:34 2014 +0200
Committer: Andrii Tkach
Committed: Thu Nov 6 13:37:34 2014 +0200
--
.../controllers/main/service/info/configs.js| 42
ambari-web/app/utils/ajax/ajax.js | 4 +-
ambari-web/app/utils/config.js | 6 +--
.../main/service/info/config_test.js| 12 +-
4 files changed, 50 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/03d9b19e/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 11002c1..bb0cac7 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -35,6 +35,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
items: [],
supportsFinal: []
},
+ requestInProgress: null,
selectedServiceConfigTypes: [],
selectedServiceSupportsFinal: [],
configGroups: [],
@@ -194,9 +195,21 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
+ * register request to view to track his progress
+ * @param request
+ */
+ trackRequest: function (request) {
+this.set('requestInProgress', request);
+ },
+
+ /**
* clear and set properties to default value
*/
clearStep: function () {
+if (this.get('requestInProgress') &&
this.get('requestInProgress').readyState !== 4) {
+ this.get('requestInProgress').abort();
+ this.set('requestInProgress', null);
+}
this.set("isApplyingChanges", false);
this.set('modifiedFileNames', []);
this.set('isInit', true);
@@ -277,15 +290,16 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
self.set('configTypesInfo',
App.config.getConfigTypesInfoFromService(stackService));
}
-App.config.loadAdvancedConfig(serviceName, function (properties) {
+this.trackRequest(App.config.loadAdvancedConfig(serviceName, function
(properties, xhr) {
+ if (xhr.statusText === 'abort') return;
advancedConfigs.pushObjects(properties);
self.set('advancedConfigs', advancedConfigs);
if (App.get('supports.configHistory')) {
-self.loadServiceConfigVersions();
+self.trackRequest(self.loadServiceConfigVersions());
} else {
self.loadServiceTagsAndGroups();
}
-});
+}));
},
/**
@@ -321,6 +335,17 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
+ * error callback of loadServiceConfigVersions()
+ * override defaultCallback
+ * @param request
+ * @param ajaxOptions
+ * @param error
+ * @param opt
+ * @param params
+ */
+ loadServiceConfigVersionsError: Em.K,
+
+ /**
* get selected service config version
* In case selected version is undefined then take currentDefaultVersion
* @param version
@@ -338,7 +363,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
this.set('selectedConfigGroup', switchToGroup);
}
-App.ajax.send({
+this.trackRequest(App.ajax.send({
name: 'service.serviceConfigVersions.get.multiple',
sender: this,
data: {
@@ -346,13 +371,14 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
serviceConfigVersions: versions
},
success: 'loadSelectedVersionSuccess'
-}).complete(function () {
+}).complete(function (xhr) {
+if (xhr.statusText === 'abort') return;
if (self.get('dataIsLoaded')) {
self.onConfigGroupChange();
} else {
self.loadServiceTagsAndGroups();
}
- });
+ }));
},
/**
@@ -401,7 +427,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* load config groups of service
*/
loadServiceTagsAndGroups: function () {
-App.ajax.send({
+this.trackRequest(App.ajax.send({
name: 'config.tags_and_groups',
sender: this,
data: {
@@ -409,7 +435,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.S
git commit: AMBARI-8180 Broken Config banner. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk ec37a765e -> 4d9685f4f
AMBARI-8180 Broken Config banner. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d9685f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d9685f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d9685f4
Branch: refs/heads/trunk
Commit: 4d9685f4f6c033625fd11b61c575103833d6f362
Parents: ec37a76
Author: Andrii Tkach
Authored: Thu Nov 6 13:36:23 2014 +0200
Committer: Andrii Tkach
Committed: Thu Nov 6 13:36:23 2014 +0200
--
.../controllers/main/service/info/configs.js| 42
ambari-web/app/utils/ajax/ajax.js | 4 +-
ambari-web/app/utils/config.js | 6 +--
.../main/service/info/config_test.js| 10 +
4 files changed, 49 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d9685f4/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 1673831..a2465c2 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -35,6 +35,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
items: [],
supportsFinal: []
},
+ requestInProgress: null,
selectedServiceConfigTypes: [],
selectedServiceSupportsFinal: [],
configGroups: [],
@@ -192,9 +193,21 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
+ * register request to view to track his progress
+ * @param request
+ */
+ trackRequest: function (request) {
+this.set('requestInProgress', request);
+ },
+
+ /**
* clear and set properties to default value
*/
clearStep: function () {
+if (this.get('requestInProgress') &&
this.get('requestInProgress').readyState !== 4) {
+ this.get('requestInProgress').abort();
+ this.set('requestInProgress', null);
+}
this.set("isApplyingChanges", false);
this.set('modifiedFileNames', []);
this.set('isInit', true);
@@ -275,11 +288,12 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
self.set('configTypesInfo',
App.config.getConfigTypesInfoFromService(stackService));
}
-App.config.loadAdvancedConfig(serviceName, function (properties) {
+this.trackRequest(App.config.loadAdvancedConfig(serviceName, function
(properties, xhr) {
+ if (xhr.statusText === 'abort') return;
advancedConfigs.pushObjects(properties);
self.set('advancedConfigs', advancedConfigs);
- self.loadServiceConfigVersions();
-});
+ self.trackRequest(self.loadServiceConfigVersions());
+}));
},
/**
@@ -315,6 +329,17 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
+ * error callback of loadServiceConfigVersions()
+ * override defaultCallback
+ * @param request
+ * @param ajaxOptions
+ * @param error
+ * @param opt
+ * @param params
+ */
+ loadServiceConfigVersionsError: Em.K,
+
+ /**
* get selected service config version
* In case selected version is undefined then take currentDefaultVersion
* @param version
@@ -332,7 +357,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
this.set('selectedConfigGroup', switchToGroup);
}
-App.ajax.send({
+this.trackRequest(App.ajax.send({
name: 'service.serviceConfigVersions.get.multiple',
sender: this,
data: {
@@ -340,13 +365,14 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
serviceConfigVersions: versions
},
success: 'loadSelectedVersionSuccess'
-}).complete(function () {
+}).complete(function (xhr) {
+if (xhr.statusText === 'abort') return;
if (self.get('dataIsLoaded')) {
self.onConfigGroupChange();
} else {
self.loadServiceTagsAndGroups();
}
- });
+ }));
},
/**
@@ -395,7 +421,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* load config groups of service
*/
loadServiceTagsAndGroups: function () {
-App.ajax.send({
+this.trackRequest(App.ajax.send({
name: 'config.tags_and_groups',
sender: this,
data: {
@@ -403,7 +429,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
urlParams: "&config_groups/ConfigGroup/tag=" +
this.get('content.serviceName')
},
success: 'lo
