ambari git commit: AMBARI-14842. ambari agent upstart support (aonishuk)

2016-01-29 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk a2f436a61 -> 6d83195a7


AMBARI-14842. ambari agent upstart support (aonishuk)


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

Branch: refs/heads/trunk
Commit: 6d83195a72a1dc6435ebf29fd470c512a49b7a69
Parents: a2f436a
Author: Andrew Onishuk 
Authored: Fri Jan 29 13:41:28 2016 +0200
Committer: Andrew Onishuk 
Committed: Fri Jan 29 13:41:28 2016 +0200

--
 ambari-agent/conf/unix/ambari-agent | 13 +++
 ambari-agent/etc/init/ambari-agent.conf | 34 
 ambari-agent/pom.xml| 22 ++
 3 files changed, 69 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6d83195a/ambari-agent/conf/unix/ambari-agent
--
diff --git a/ambari-agent/conf/unix/ambari-agent 
b/ambari-agent/conf/unix/ambari-agent
index 4f9e1e5..96ef12b 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -157,7 +157,14 @@ case "$1" in
 change_files_permissions
 
 echo "Starting ambari-agent"
+
+if [ "$AMBARI_AGENT_RUN_IN_FOREGROUND" == true ] ; then
+  $PYTHON $AMBARI_AGENT_PY_SCRIPT "$@" > $OUTFILE 2>&1 
+  exit $?
+fi
+
 nohup $PYTHON $AMBARI_AGENT_PY_SCRIPT "$@" > $OUTFILE 2>&1 &
+
 sleep 2
 PID=$!
 echo "Verifying $AMBARI_AGENT process status..."
@@ -219,6 +226,12 @@ case "$1" in
 echo "Stopping $AMBARI_AGENT"
 change_files_permissions
 $PYTHON $AGENT_SCRIPT stop
+
+status ambari-agent 2>/dev/null | grep start 1>/dev/null
+if [ "$?" -eq 0 ] ; then
+  echo "Stopping $AMBARI_AGENT upstart job"
+  stop ambari-agent > /dev/null
+fi
   fi
   echo "Removing PID file at $PIDFILE"
   ambari-sudo.sh rm -f $PIDFILE

http://git-wip-us.apache.org/repos/asf/ambari/blob/6d83195a/ambari-agent/etc/init/ambari-agent.conf
--
diff --git a/ambari-agent/etc/init/ambari-agent.conf 
b/ambari-agent/etc/init/ambari-agent.conf
new file mode 100644
index 000..021eb3b
--- /dev/null
+++ b/ambari-agent/etc/init/ambari-agent.conf
@@ -0,0 +1,34 @@
+# 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
+
+#ambari-agent
+description "ambari agent"
+
+stop on runlevel [06]
+
+env PIDFILE=/var/run/ambari-agent/ambari-agent.pid
+
+kill signal SIGKILL
+respawn
+
+script
+   . /etc/environment
+
+   export AMBARI_AGENT_RUN_IN_FOREGROUND=true
+   exec /etc/init.d/ambari-agent start
+end script
+
+post-stop script
+  rm -f $PIDFILE
+end script
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6d83195a/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 346ac07..dbbb5ad 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -409,6 +409,17 @@
   root
 
 
+  /etc/init
+  755
+  root
+  root
+  
+
+  etc/init/ambari-agent.conf
+
+  
+
+
   ${init.d.dir}
   755
   root
@@ -620,6 +631,17 @@
   
 
 
+  etc/init/ambari-agent.conf
+  file
+  
+perm
+/etc/init
+root
+root
+755
+  
+
+
   ${basedir}/target/src/version
   file

ambari git commit: AMBARI-14683 .Add Filter in Alert instances table (onechiporenko)

2016-01-29 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 87604be7f -> 492d47278


AMBARI-14683 .Add Filter in Alert instances table (onechiporenko)


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

Branch: refs/heads/branch-2.2
Commit: 492d47278cb1242d061bff39655add67dc4bdfe4
Parents: 87604be
Author: Oleg Nechiporenko 
Authored: Fri Jan 15 12:34:53 2016 +0200
Committer: Oleg Nechiporenko 
Committed: Fri Jan 29 12:28:26 2016 +0200

--
 ambari-web/app/styles/alerts.less   |  14 +-
 .../main/alerts/definition_details.hbs  |  30 ++-
 ambari-web/app/views/common/filter_view.js  | 224 ---
 .../app/views/main/alert_definitions_view.js|  26 +--
 .../main/alerts/definition_details_view.js  | 101 -
 .../test/views/common/filter_view_test.js   |  76 +++
 6 files changed, 310 insertions(+), 161 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/492d4727/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index 727df04..2eabbe2 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -155,24 +155,30 @@
   .col0,
   td:first-child,
   th:first-child {
-width: 30%;
+width: 10%;
   }
 
   .col1,
   td:first-child + td,
   th:first-child + th {
-width: 23%;
+width: 20%;
   }
 
   .col2,
   td:first-child + td + td,
   th:first-child + th + th {
-width: 7%
+width: 23%;
   }
 
   .col3,
   td:first-child + td + td + td,
   th:first-child + th + th + th {
+width: 7%;
+  }
+
+  .col4,
+  td:first-child + td + td + td + td,
+  th:first-child + th + th + th + th {
 width: 40%;
   }
 
@@ -195,7 +201,7 @@
 margin: 5px;
   }
 }
-margin-bottom: 0px;
+margin-bottom: 0;
   }
   .definition-details-block {
 margin-top: 30px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/492d4727/ambari-web/app/templates/main/alerts/definition_details.hbs
--
diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs 
b/ambari-web/app/templates/main/alerts/definition_details.hbs
index 1c2605d..a56890c 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -181,11 +181,19 @@
 
 
   
-  
-{{t alerts.definition.details.serviceHost}}
-{{t common.status}}
+  {{#view view.sortView classNames="label-row" 
contentBinding="view.filteredContent"}}
+{{view view.parentView.serviceSort class="first service-sorting"}}
+{{view view.parentView.hostNameSort class="host-sorting"}}
+{{view view.parentView.stateSort class="state-sorting"}}
 {{t alerts.definition.details.24-hour}}
 {{t alerts.table.header.check.response}}
+  {{/view}}
+  
+{{view view.serviceFilterView}}
+{{view view.hostNameFilterView}}
+{{view view.stateFilterView }}
+{{!}}
+{{!}}
   
   
   
@@ -193,7 +201,21 @@
 {{#each instance in view.pageContent}}
   {{#view view.instanceTableRow}}
 
-  {{view App.AlertInstanceServiceHostView 
instanceBinding="instance"}}
+  {{#if instance.serviceDisplayName}}
+{{#if instance.service.isLoaded}}
+  {{instance.serviceDisplayName}}
+{{else}}
+  {{instance.serviceDisplayName}}
+{{/if}}
+  {{/if}}
+
+
+  {{#if instance.hostName}}
+
+  {{instance.hostName}}
+
+  {{/if}}
 
 {{{instance.status}}}
   http://git-wip-us.apache.org/repos/asf/ambari/blob/492d4727/ambari-web/app/views/common/filter_view.js
--
diff --git a/ambari-web/app/views/common/filter_view.js 
b/ambari-web/app/views/common/filter_view.js
index f1f18d8..21c8c0e 100644
--- a/ambari-web/app/views/common/filter_view.js
+++ b/ambari-web/app/views/common/filter_view.js
@@ -186,7 +186,7 @@ var wrapperView = Ember.View.extend({
 $optionEl.text(triggeredValue.displayAs);
 // the second one

[2/2] ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)

2016-01-29 Thread jonathanhurley 
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log 
directory can not be changed (Jeff Zhang via jonathanhurley)


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

Branch: refs/heads/branch-2.2
Commit: d23f45d53b9e2b431b39faa5c918a1f9c6768063
Parents: 7d2238f
Author: Jonathan Hurley 
Authored: Fri Jan 29 11:27:35 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Jan 29 11:35:35 2016 -0500

--
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |  2 +-
 .../SPARK/configuration/spark-defaults.xml  |  4 +--
 .../configuration/spark-thrift-sparkconf.xml| 31 
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 15 --
 4 files changed, 29 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d23f45d5/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a681a5c..4fd1d6b 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -79,7 +79,7 @@ hive_user = status_params.hive_user
 spark_group = status_params.spark_group
 user_group = status_params.user_group
 spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = 
default('/configurations/spark-defaults/spark.history.fs.logDirectory', 
"hdfs:///spark-history")
 
 spark_history_server_pid_file = status_params.spark_history_server_pid_file
 spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d23f45d5/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
 
 
 spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory for history spark application log.
 
@@ -45,7 +45,7 @@
 
 
 spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d23f45d5/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
   
 spark.history.fs.logDirectory
 {{spark_history_dir}}
+true
 
-  Base directory for history spark application log.
+  Base directory for history spark application log. It is the same value
+  as in spark-defaults.xml.
 
   
 
   
 spark.eventLog.enabled
 true
+true
 
   Whether to log Spark events, useful for reconstructing the Web UI after 
the application has finished.
 
@@ -91,8 +94,10 @@
   
 spark.eventLog.dir
 {{spark_history_dir}}
+true
 
-  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
+  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true. It is the same value
+  as in spark-defaults.xml.
 
   
 
@@ -138,10 +143,26 @@
   
 
   
-spark.executor.instances
-2

[2/2] ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)

2016-01-29 Thread jonathanhurley 
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log 
directory can not be changed (Jeff Zhang via jonathanhurley)


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

Branch: refs/heads/branch-2.2.1
Commit: e10e9d1e81c53d8f006a727a7ace2417430585fd
Parents: cb220fa
Author: Jonathan Hurley 
Authored: Fri Jan 29 11:27:35 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Jan 29 11:36:38 2016 -0500

--
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |  2 +-
 .../SPARK/configuration/spark-defaults.xml  |  4 +--
 .../configuration/spark-thrift-sparkconf.xml| 31 
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 15 --
 4 files changed, 29 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e10e9d1e/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a681a5c..4fd1d6b 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -79,7 +79,7 @@ hive_user = status_params.hive_user
 spark_group = status_params.spark_group
 user_group = status_params.user_group
 spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = 
default('/configurations/spark-defaults/spark.history.fs.logDirectory', 
"hdfs:///spark-history")
 
 spark_history_server_pid_file = status_params.spark_history_server_pid_file
 spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e10e9d1e/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
 
 
 spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory for history spark application log.
 
@@ -45,7 +45,7 @@
 
 
 spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e10e9d1e/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
   
 spark.history.fs.logDirectory
 {{spark_history_dir}}
+true
 
-  Base directory for history spark application log.
+  Base directory for history spark application log. It is the same value
+  as in spark-defaults.xml.
 
   
 
   
 spark.eventLog.enabled
 true
+true
 
   Whether to log Spark events, useful for reconstructing the Web UI after 
the application has finished.
 
@@ -91,8 +94,10 @@
   
 spark.eventLog.dir
 {{spark_history_dir}}
+true
 
-  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
+  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true. It is the same value
+  as in spark-defaults.xml.
 
   
 
@@ -138,10 +143,26 @@
   
 
   
-spark.executor.instances
-

[1/2] ambari git commit: Revert "AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)"

2016-01-29 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk 6d83195a7 -> 6bac8ec15


Revert "AMBARI-14839 - DEA is not enabled due to configuration conflict and 
history log directory can not be changed (Jeff Zhang via jonathanhurley)"

This reverts commit 981ede5455c02ae1bd4aac7495c2c667bc889dbc.


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

Branch: refs/heads/trunk
Commit: 516912bb2fec21688a554401feca18f61ca84c66
Parents: 6d83195
Author: Jonathan Hurley 
Authored: Fri Jan 29 11:26:44 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Jan 29 11:26:44 2016 -0500

--
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |  4 +--
 .../SPARK/configuration/spark-defaults.xml  |  4 +--
 .../configuration/spark-thrift-sparkconf.xml| 31 
 3 files changed, 8 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/516912bb/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index abf9191..935c47e 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -86,9 +86,7 @@ hive_user = status_params.hive_user
 spark_group = status_params.spark_group
 user_group = status_params.user_group
 spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = "hdfs:///spark-history"
-if 'spark-defaults' in config['configurations'] and 
'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']:
-  spark_history_dir = 
config['configurations']['spark-defaults']['spark.history.fs.logDirectory']
+spark_history_dir = 'hdfs:///spark-history'
 
 spark_history_server_pid_file = status_params.spark_history_server_pid_file
 spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/516912bb/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index 1a6552f..d8af790 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
 
 
 spark.history.fs.logDirectory
-hdfs:///spark-history
+{{spark_history_dir}}
 
 Base directory for history spark application log.
 
@@ -45,7 +45,7 @@
 
 
 spark.eventLog.dir
-hdfs:///spark-history
+{{spark_history_dir}}
 
 Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/516912bb/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 2dbfe51..3b13496 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,17 +75,14 @@
   
 spark.history.fs.logDirectory
 {{spark_history_dir}}
-true
 
-  Base directory for history spark application log. It is the same value
-  as in spark-defaults.xml.
+  Base directory for history spark application log.
 
   
 
   
 spark.eventLog.enabled
 true
-true
 
   Whether to log Spark events, useful for reconstructing the Web UI after 
the application has finished.
 
@@ -94,10 +91,8 @@
   
 spark.eventLog.dir
 {{spark_history_dir}}
-true
 
-  Base directory in which Spark events are logged, if

[2/2] ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)

2016-01-29 Thread jonathanhurley 
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log 
directory can not be changed (Jeff Zhang via jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 6bac8ec15e774349d454aa05ec38e23d762b3ce8
Parents: 516912b
Author: Jonathan Hurley 
Authored: Fri Jan 29 11:27:35 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Jan 29 11:34:41 2016 -0500

--
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |  2 +-
 .../SPARK/configuration/spark-defaults.xml  |  4 +--
 .../configuration/spark-thrift-sparkconf.xml| 31 
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 15 --
 4 files changed, 29 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6bac8ec1/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 935c47e..68c4f37 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -86,7 +86,7 @@ hive_user = status_params.hive_user
 spark_group = status_params.spark_group
 user_group = status_params.user_group
 spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = 
default('/configurations/spark-defaults/spark.history.fs.logDirectory', 
"hdfs:///spark-history")
 
 spark_history_server_pid_file = status_params.spark_history_server_pid_file
 spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bac8ec1/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
 
 
 spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory for history spark application log.
 
@@ -45,7 +45,7 @@
 
 
 spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
 
 Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bac8ec1/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
   
 spark.history.fs.logDirectory
 {{spark_history_dir}}
+true
 
-  Base directory for history spark application log.
+  Base directory for history spark application log. It is the same value
+  as in spark-defaults.xml.
 
   
 
   
 spark.eventLog.enabled
 true
+true
 
   Whether to log Spark events, useful for reconstructing the Web UI after 
the application has finished.
 
@@ -91,8 +94,10 @@
   
 spark.eventLog.dir
 {{spark_history_dir}}
+true
 
-  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
+  Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true. It is the same value
+  as in spark-defaults.xml.
 
   
 
@@ -138,10 +143,26 @@
   
 
   
-spark.executor.instances
-2
+

[1/2] ambari git commit: Revert "AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)"

2016-01-29 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 1a448ba48 -> d23f45d53


Revert "AMBARI-14839 - DEA is not enabled due to configuration conflict and 
history log directory can not be changed (Jeff Zhang via jonathanhurley)"

This reverts commit 981ede5455c02ae1bd4aac7495c2c667bc889dbc.


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

Branch: refs/heads/branch-2.2
Commit: 7d2238fc4c180efae466fc828361b97ca65d5534
Parents: 1a448ba
Author: Jonathan Hurley 
Authored: Fri Jan 29 11:26:44 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Jan 29 11:35:30 2016 -0500

--
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |  4 +--
 .../SPARK/configuration/spark-defaults.xml  |  4 +--
 .../configuration/spark-thrift-sparkconf.xml| 31 
 3 files changed, 8 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2238fc/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a25db6f..a681a5c 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -79,9 +79,7 @@ hive_user = status_params.hive_user
 spark_group = status_params.spark_group
 user_group = status_params.user_group
 spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = "hdfs:///spark-history"
-if 'spark-defaults' in config['configurations'] and 
'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']:
-  spark_history_dir = 
config['configurations']['spark-defaults']['spark.history.fs.logDirectory']
+spark_history_dir = 'hdfs:///spark-history'
 
 spark_history_server_pid_file = status_params.spark_history_server_pid_file
 spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2238fc/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index 1a6552f..d8af790 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
 
 
 spark.history.fs.logDirectory
-hdfs:///spark-history
+{{spark_history_dir}}
 
 Base directory for history spark application log.
 
@@ -45,7 +45,7 @@
 
 
 spark.eventLog.dir
-hdfs:///spark-history
+{{spark_history_dir}}
 
 Base directory in which Spark events are logged, if 
spark.eventLog.enabled is true.
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2238fc/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 2dbfe51..3b13496 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,17 +75,14 @@
   
 spark.history.fs.logDirectory
 {{spark_history_dir}}
-true
 
-  Base directory for history spark application log. It is the same value
-  as in spark-defaults.xml.
+  Base directory for history spark application log.
 
   
 
   
 spark.eventLog.enabled
 true
-true
 
   Whether to log Spark events, useful for reconstructing the Web UI after 
the application has finished.
 
@@ -94,10 +91,8 @@
   
 spark.eventLog.dir
 {{spark_history_dir}}
-true
 
-  Base directory in which Spark events are logged, if

ambari git commit: AMBARI-14843. Admin View: add page "Login Message" with full functionality (alexantonenko)

2016-01-29 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 44c98665a -> 5facf9a5e


AMBARI-14843. Admin View: add page "Login Message" with full functionality 
(alexantonenko)


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

Branch: refs/heads/trunk
Commit: 5facf9a5e7fecfbf433a8af274911b527f737fcb
Parents: 44c9866
Author: Alex Antonenko 
Authored: Fri Jan 29 18:19:36 2016 +0200
Committer: Alex Antonenko 
Committed: Sat Jan 30 01:06:32 2016 +0200

--
 .../main/resources/ui/admin-web/app/index.html  |  1 +
 .../loginActivities/LoginMessageMainCtrl.js | 67 
 .../ui/admin-web/app/scripts/i18n.config.js |  5 +-
 .../resources/ui/admin-web/app/styles/main.css  |  6 ++
 .../app/views/loginActivities/loginMessage.html | 50 ++-
 5 files changed, 127 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5facf9a5/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 268e92f..fd2c6b8 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -129,6 +129,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5facf9a5/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/LoginMessageMainCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/LoginMessageMainCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/LoginMessageMainCtrl.js
new file mode 100644
index 000..11fcea5
--- /dev/null
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/LoginMessageMainCtrl.js
@@ -0,0 +1,67 @@
+/**
+ * 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.
+ */
+'use strict';
+
+angular.module('ambariAdminConsole')
+  .controller('LoginMessageMainCtrl',['$scope', 'Alert', '$timeout', '$http', 
'$translate', function($scope, Alert, $timeout, $http, $translate) {
+var $t = $translate.instant;
+$scope.status = false;
+$scope.motdExists = false;
+$scope.text = "";
+$scope.submitDisabled = true;
+
+$http.get('/api/v1/admin-settings/motd').then(function (res) {
+  var respons = JSON.parse(res.data.AdminSettings.content);
+  $scope.text = respons.text ? respons.text : "";
+  $scope.status = respons.status && respons.status == "true" ? true : 
false;
+  $scope.motdExists = true;
+});
+
+$scope.inputChangeEvent = function(){
+  $scope.submitDisabled = false;
+};
+$scope.changeStatus = function(){
+  $scope.status = !$scope.status;
+  $scope.submitDisabled = false;
+};
+
+$scope.saveLoginMsg = function(form) {
+  var method = $scope.motdExists ? 'PUT' : 'POST';
+  var data = {
+'AdminSettings' : {
+  'content' : '{"text":"' + $scope.text + '", "status":"' + 
$scope.status + '"}',
+  'name' : 'motd',
+  'setting_type' : 'ambari-server'
+}
+  };
+  form.submitted = true;
+  if (form.$valid){
+$scope.submitDisabled = true;
+$http({
+  method: method,
+  url: '/api/v1/admin-settings/' + ($scope.motdExists ? 'motd' : ''),
+  data: data
+}).then(function successCallback() {
+  $scope.motdExists = true;
+}, function errorCallback(data) {
+  $scope.submitDisabled = false;
+  Alert.error($t('common.loginActivities.saveError'), 
data.data.message);
+});
+  }
+};
+

ambari git commit: AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. (avijayan)

2016-01-29 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 69c834195 -> 44c98665a


AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. 
(avijayan)


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

Branch: refs/heads/trunk
Commit: 44c98665a4bf9c76434741d1bdae1f1a35145f45
Parents: 69c8341
Author: Aravindan Vijayan 
Authored: Fri Jan 29 14:10:01 2016 -0800
Committer: Aravindan Vijayan 
Committed: Fri Jan 29 14:10:01 2016 -0800

--
 .../server/upgrade/UpgradeCatalog221.java   |  7 
 .../server/upgrade/UpgradeCatalog221Test.java   | 43 
 2 files changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/44c98665/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 13ec345..0f9d0e0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -198,6 +198,13 @@ public class UpgradeCatalog221 extends 
AbstractUpgradeCatalog {
 alertDefinitionDAO.merge(alertDefinition);
   }
 
+  final AlertDefinitionEntity amsZookeeperProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+clusterID, "ams_metrics_collector_zookeeper_server_process");
+
+  if (amsZookeeperProcessAlertDefinitionEntity != null) {
+LOG.info("Removing alert : 
ams_metrics_collector_zookeeper_server_process");
+alertDefinitionDAO.remove(amsZookeeperProcessAlertDefinitionEntity);
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/44c98665/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index c15fbd8..e754a41 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -39,7 +39,9 @@ import org.apache.ambari.server.controller.KerberosHelper;
 import org.apache.ambari.server.controller.MaintenanceStateHelper;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
 import org.apache.ambari.server.orm.dao.StackDAO;
+import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
@@ -560,4 +562,45 @@ public class UpgradeCatalog221Test {
 String result = (String) updateAmsEnvContent.invoke(upgradeCatalog221, 
oldContent);
 Assert.assertEquals(expectedContent, result);
   }
+
+  @Test
+  public void testUpdateAlertDefinitions() {
+EasyMockSupport easyMockSupport = new EasyMockSupport();
+long clusterId = 1;
+
+final AmbariManagementController mockAmbariManagementController = 
easyMockSupport.createNiceMock(AmbariManagementController.class);
+final AlertDefinitionDAO mockAlertDefinitionDAO = 
easyMockSupport.createNiceMock(AlertDefinitionDAO.class);
+final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
+final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
+final AlertDefinitionEntity mockAmsZookeeperProcessAlertDefinitionEntity = 
easyMockSupport.createNiceMock(AlertDefinitionEntity.class);
+
+final Injector mockInjector = Guice.createInjector(new AbstractModule() {
+  @Override
+  protected void configure() {
+
bind(AmbariManagementController.class).toInstance(mockAmbariManagementController);
+bind(Clusters.class).toInstance(mockClusters);
+bind(EntityManager.class).toInstance(entityManager);
+bind(AlertDefinitionDAO.class).toInstance(mockAlertDefinitionDAO);
+bind(DBAccessor.class).toInstance(createNiceMock(DBAccessor.class));
+bind(OsFamily.class).toInstance(createNiceMock(OsFamily.class));
+  }
+});
+
+

ambari git commit: AMBARI-14844. Ambari Admin: incorrect 'users' text on the Roles page (akovalenko)

2016-01-29 Thread akovalenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 5facf9a5e -> 1be4a2d3b


AMBARI-14844. Ambari Admin: incorrect 'users' text on the Roles page 
(akovalenko)


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

Branch: refs/heads/trunk
Commit: 1be4a2d3bd4899270c1c52c33fbc4dd5fb701814
Parents: 5facf9a
Author: Aleksandr Kovalenko 
Authored: Fri Jan 29 18:33:46 2016 +0200
Committer: Aleksandr Kovalenko 
Committed: Sat Jan 30 03:06:17 2016 +0200

--
 .../app/scripts/controllers/clusters/UserAccessListCtrl.js   | 2 +-
 .../src/main/resources/ui/admin-web/app/scripts/i18n.config.js   | 1 +
 .../ui/admin-web/app/views/clusters/userAccessList.html  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index eed71d5..17dac40 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -22,7 +22,7 @@ angular.module('ambariAdminConsole')
 function($scope, $location, Cluster, $modal, $rootScope, $routeParams, 
PermissionSaver, Alert, $translate) {
   var $t = $translate.instant;
   $scope.constants = {
-users: $t('common.users').toLowerCase()
+usersGroups: $t('common.usersGroups').toLowerCase()
   };
   $scope.users = [];
   $scope.usersPerPage = 10;

http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index b274965..c83d627 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -74,6 +74,7 @@ angular.module('ambariAdminConsole')
   'jwt': 'JWT',
   'warning': 'Warning',
   'filterInfo': '{{showed}} of {{total}} {{term}} showing',
+  'usersGroups': 'Users/Groups',
 
   'clusterNameChangeConfirmation': {
 'title': 'Confirm Cluster Name Change',

http://git-wip-us.apache.org/repos/asf/ambari/blob/1be4a2d3/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
index 0f3da0e..8c12a25 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
@@ -73,11 +73,11 @@
 
   
   
-{{'common.alerts.nothingToDisplay' | translate: '{term: constants.users}'}}
+{{'common.alerts.nothingToDisplay' | translate: '{term: 
constants.usersGroups}'}}
   
   
 
-  {{'common.filterInfo' | translate: '{showed: tableInfo.showed, 
total: tableInfo.total, term: constants.users}'}}
+  {{'common.filterInfo' | translate: '{showed: tableInfo.showed, 
total: tableInfo.total, term: constants.usersGroups}'}}
   - {{'common.controls.clearFilters' | 
translate}}

ambari git commit: AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. (avijayan)

2016-01-29 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 6460f686c -> 8aa512448


AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. 
(avijayan)


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

Branch: refs/heads/branch-2.2
Commit: 8aa512448d0d9ecd916faa704288351f1a5510e7
Parents: 6460f68
Author: Aravindan Vijayan 
Authored: Fri Jan 29 14:08:18 2016 -0800
Committer: Aravindan Vijayan 
Committed: Fri Jan 29 14:08:18 2016 -0800

--
 .../server/upgrade/UpgradeCatalog221.java   |  7 
 .../server/upgrade/UpgradeCatalog221Test.java   | 43 
 2 files changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8aa51244/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 2adc8b9..82c56ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -198,6 +198,13 @@ public class UpgradeCatalog221 extends 
AbstractUpgradeCatalog {
 alertDefinitionDAO.merge(alertDefinition);
   }
 
+  final AlertDefinitionEntity amsZookeeperProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+clusterID, "ams_metrics_collector_zookeeper_server_process");
+
+  if (amsZookeeperProcessAlertDefinitionEntity != null) {
+LOG.info("Removing alert : 
ams_metrics_collector_zookeeper_server_process");
+alertDefinitionDAO.remove(amsZookeeperProcessAlertDefinitionEntity);
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8aa51244/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index 906167e..3dab200 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -41,7 +41,9 @@ import 
org.apache.ambari.server.controller.MaintenanceStateHelper;
 import org.apache.ambari.server.orm.DBAccessor;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
 import org.apache.ambari.server.orm.dao.StackDAO;
+import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
@@ -572,4 +574,45 @@ public class UpgradeCatalog221Test {
 String result = (String) updateAmsEnvContent.invoke(upgradeCatalog221, 
oldContent);
 Assert.assertEquals(expectedContent, result);
   }
+
+  @Test
+  public void testUpdateAlertDefinitions() {
+EasyMockSupport easyMockSupport = new EasyMockSupport();
+long clusterId = 1;
+
+final AmbariManagementController mockAmbariManagementController = 
easyMockSupport.createNiceMock(AmbariManagementController.class);
+final AlertDefinitionDAO mockAlertDefinitionDAO = 
easyMockSupport.createNiceMock(AlertDefinitionDAO.class);
+final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
+final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
+final AlertDefinitionEntity mockAmsZookeeperProcessAlertDefinitionEntity = 
easyMockSupport.createNiceMock(AlertDefinitionEntity.class);
+
+final Injector mockInjector = Guice.createInjector(new AbstractModule() {
+  @Override
+  protected void configure() {
+
bind(AmbariManagementController.class).toInstance(mockAmbariManagementController);
+bind(Clusters.class).toInstance(mockClusters);
+bind(EntityManager.class).toInstance(entityManager);
+bind(AlertDefinitionDAO.class).toInstance(mockAlertDefinitionDAO);
+bind(DBAccessor.class).toInstance(createNiceMock(DBAccessor.class));
+bind(OsFamily.class).toInstance(createNiceMock(OsFamily.class));
+  }
+});
+
+

ambari git commit: AMBARI-14763: Expose PXF principal parameter on UI (goutamtadi via jaoki)

2016-01-29 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 8aa512448 -> 2bf9469d2


AMBARI-14763: Expose PXF principal parameter on UI (goutamtadi via jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 2bf9469d212b455626e4a1885addb6b2fbcf3e7b
Parents: 8aa5124
Author: Jun Aoki 
Authored: Fri Jan 29 16:08:31 2016 -0800
Committer: Jun Aoki 
Committed: Fri Jan 29 16:08:31 2016 -0800

--
 .../resources/common-services/PXF/3.0.0/kerberos.json |  6 ++
 .../common-services/PXF/3.0.0/package/scripts/pxf.py  | 10 ++
 2 files changed, 4 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2bf9469d/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
index 0a3c3c7..026336c 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
@@ -6,10 +6,9 @@
 "identities": [
 {
 "keytab": {
-"configuration": null,
+"configuration": 
"pxf-site/pxf.service.kerberos.keytab",
 "file": "${keytab_dir}/pxf.service.keytab",
 "group": {
-"access": "",
 "name": "${cluster-env/user_group}"
 },
 "owner": {
@@ -19,8 +18,7 @@
 },
 "name": "pxf_client_pxf",
 "principal": {
-"configuration": null,
-"local_username": null,
+"configuration": 
"pxf-site/pxf.service.kerberos.principal",
 "type": "service",
 "value": "pxf/_HOST@${realm}"
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2bf9469d/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
index e9e8256..a282bec 100644
--- 
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
+++ 
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
@@ -106,16 +106,10 @@ class Pxf(Script):
 File('{0}/pxf-profiles.xml'.format(params.pxf_conf_dir),
  content = 
params.config['configurations']['pxf-profiles']['content'].lstrip())
 
-if params.security_enabled:
-  pxf_site_dict = dict(params.config['configurations']['pxf-site'])
-  pxf_site_dict['pxf.service.kerberos.principal'] = 
"{0}/_HOST@{1}".format(params.pxf_user, params.realm_name)
-  pxf_site = ConfigDictionary(pxf_site_dict)
-else:
-  pxf_site = params.config['configurations']['pxf-site']
-
+# Default_value of principal => pxf/_HOST@{realm}
 XmlConfig("pxf-site.xml",
   conf_dir=params.pxf_conf_dir,
-  configurations=pxf_site,
+  configurations=params.config['configurations']['pxf-site'],
   
configuration_attributes=params.config['configuration_attributes']['pxf-site'])

ambari git commit: AMBARI-14835: Return 409 instead of 500 for duplicate setting creation (Ajit Kumar via smnaha)

2016-01-29 Thread smnaha 
Repository: ambari
Updated Branches:
  refs/heads/trunk 1be4a2d3b -> 528e8ea5e


AMBARI-14835: Return 409 instead of 500 for duplicate setting creation (Ajit 
Kumar via smnaha)


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

Branch: refs/heads/trunk
Commit: 528e8ea5e05d98866e14dcfbe2d2becf6b7ceb7e
Parents: 1be4a2d
Author: Nahappan Somasundaram 
Authored: Fri Jan 29 15:50:00 2016 -0800
Committer: Nahappan Somasundaram 
Committed: Fri Jan 29 17:16:42 2016 -0800

--
 .../internal/AdminSettingResourceProvider.java   |  5 +
 .../internal/AdminSettingResourceProviderTest.java   | 15 +--
 .../ambari/server/orm/dao/AdminSettingDAOTest.java   |  4 
 3 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/528e8ea5/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProvider.java
index f62958f..e8d5b5e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProvider.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.controller.internal;
 
 import com.google.inject.Inject;
 import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.DuplicateResourceException;
 import org.apache.ambari.server.StaticallyInject;
 import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
 import org.apache.ambari.server.controller.spi.NoSuchResourceException;
@@ -171,6 +172,10 @@ public class AdminSettingResourceProvider extends 
AbstractAuthorizedResourceProv
   @Override
   public AdminSettingEntity invoke() throws AmbariException, 
AuthorizationException {
 AdminSettingEntity entity = toEntity(properties);
+if (dao.findByName(entity.getName()) != null) {
+  throw new DuplicateResourceException(
+  String.format("Setting already exists. setting name :%s ", 
entity.getName()));
+}
 dao.create(entity);
 notifyCreate(Resource.Type.AdminSetting, request);
 return entity;

http://git-wip-us.apache.org/repos/asf/ambari/blob/528e8ea5/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProviderTest.java
index 68eaf28..e95449c 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AdminSettingResourceProviderTest.java
@@ -18,10 +18,12 @@
 package org.apache.ambari.server.controller.internal;
 
 import com.google.common.collect.Lists;
+import org.apache.ambari.server.DuplicateResourceException;
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.RequestStatus;
 import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
 import org.apache.ambari.server.controller.utilities.PredicateBuilder;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.orm.dao.AdminSettingDAO;
@@ -190,6 +192,7 @@ public class AdminSettingResourceProviderTest {
 Capture entityCapture = Capture.newInstance();
 Request request = createRequest(entity);
 
+expect(dao.findByName(entity.getName())).andReturn(null);
 dao.create(capture(entityCapture));
 mockControl.replay();
 
@@ -204,6 +207,16 @@ public class AdminSettingResourceProviderTest {
 assertEquals(AuthorizationHelper.getAuthenticatedName(), 
capturedEntity.getUpdatedBy());
   }
 
+  @Test(expected = ResourceAlreadyExistsException.class)
+  public void testCreateDuplicateResource() throws Exception {
+setupAuthenticationForAdmin();
+AdminSettingEntity entity

ambari git commit: AMBARI-14838. UI - cannot "Pause Downgrade" during RU (Joe Wang via rzang)

2016-01-29 Thread rzang 
Repository: ambari
Updated Branches:
  refs/heads/trunk 528e8ea5e -> 7444981ff


AMBARI-14838. UI - cannot "Pause Downgrade" during RU (Joe Wang via rzang)


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

Branch: refs/heads/trunk
Commit: 7444981ff63694c8851064c4f7e346a480855de5
Parents: 528e8ea
Author: Richard Zang 
Authored: Sat Jan 30 12:27:20 2016 +0800
Committer: Richard Zang 
Committed: Sat Jan 30 12:27:20 2016 +0800

--
 .../main/admin/stack_and_upgrade_controller.js  | 22 ++--
 ambari-web/app/messages.js  |  2 ++
 .../stack_upgrade/stack_upgrade_wizard.hbs  |  8 +++
 ambari-web/app/utils/ajax/ajax.js   |  3 +++
 4 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7444981f/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index f80c5ea..16a58d6 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -553,13 +553,15 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
* abort upgrade (in order to start Downgrade)
*/
   abortUpgrade: function () {
+var errorCallback = this.get('isDowngrade') ? 
'abortDowngradeErrorCallback' : 'abortUpgradeErrorCallback';
 return App.ajax.send({
   name: 'admin.upgrade.abort',
   sender: this,
   data: {
-upgradeId: this.get('upgradeId')
+upgradeId: this.get('upgradeId'),
+isDowngrade: this.get('isDowngrade')
   },
-  error: 'abortUpgradeErrorCallback'
+  error: errorCallback
 });
   },
 
@@ -579,6 +581,22 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 App.showAlertPopup(header, body);
   },
 
+  /**
+   * error callback of abortDowngrade()
+   * @param {object} data
+   */
+  abortDowngradeErrorCallback: function (data) {
+var header = Em.I18n.t('admin.stackDowngrade.state.paused.fail.header');
+var body = Em.I18n.t('admin.stackDowngrade.state.paused.fail.body');
+if(data && data.responseText){
+  try {
+var json = $.parseJSON(data.responseText);
+body = body + ' ' + json.message;
+  } catch (err) {}
+}
+App.showAlertPopup(header, body);
+  },
+
   retryUpgrade: function () {
 this.setProperties({
   requestInProgress: true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/7444981f/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d6ecbf3..916ca2a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1497,6 +1497,8 @@ Em.I18n.translations = {
   'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
   'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
   'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused. 
Try again later.",
+  'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
+  'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be 
paused. Try again later.",
 
   'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade 
Options",
   'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You 
are about to perform an upgrade to {0}.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/7444981f/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index a13e2c2..02022cf 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -81,7 +81,7 @@
 {{t common.downgrade}}
   {{/if}}
   {{#if isDowngrade}}
-{{t admin.stackUpgrade.pauseDowngrade}}
+{{t admin.stackUpgrade.pauseDowngrade}}
   {{else}}
 {{t admin.stackUpgrade.pauseUpgrade}}
   {{/if}}
@@ -108,7 +108,7 @@

ambari git commit: AMBARI-14838. UI - cannot "Pause Downgrade" during RU (Joe Wang via rzang)

2016-01-29 Thread rzang 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2bf9469d2 -> 1e6a0c1d0


AMBARI-14838. UI - cannot "Pause Downgrade" during RU (Joe Wang via rzang)


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

Branch: refs/heads/branch-2.2
Commit: 1e6a0c1d0af8db81a6f6cbaeac91b9e7fada1a11
Parents: 2bf9469
Author: Richard Zang 
Authored: Sat Jan 30 12:33:35 2016 +0800
Committer: Richard Zang 
Committed: Sat Jan 30 12:33:35 2016 +0800

--
 .../main/admin/stack_and_upgrade_controller.js  | 22 ++--
 ambari-web/app/messages.js  |  2 ++
 .../stack_upgrade/stack_upgrade_wizard.hbs  | 10 -
 ambari-web/app/utils/ajax/ajax.js   |  3 +++
 4 files changed, 30 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e6a0c1d/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 29b996f..93a4f58 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -560,13 +560,15 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
* abort upgrade (in order to start Downgrade)
*/
   abortUpgrade: function () {
+var errorCallback = this.get('isDowngrade') ? 
'abortDowngradeErrorCallback' : 'abortUpgradeErrorCallback';
 return App.ajax.send({
   name: 'admin.upgrade.abort',
   sender: this,
   data: {
-upgradeId: this.get('upgradeId')
+upgradeId: this.get('upgradeId'),
+isDowngrade: this.get('isDowngrade')
   },
-  error: 'abortUpgradeErrorCallback'
+  error: 'errorCallback'
 });
   },
 
@@ -586,6 +588,22 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 App.showAlertPopup(header, body);
   },
 
+  /**
+   * error callback of abortDowngrade()
+   * @param {object} data
+  */
+  abortDowngradeErrorCallback: function (data) {
+var header = Em.I18n.t('admin.stackDowngrade.state.paused.fail.header');
+var body = Em.I18n.t('admin.stackDowngrade.state.paused.fail.body');
+if(data && data.responseText){
+  try {
+var json = $.parseJSON(data.responseText);
+body = body + ' ' + json.message;
+  } catch (err) {}
+}
+App.showAlertPopup(header, body);
+  },
+
   retryUpgrade: function () {
 this.setProperties({
   requestInProgress: true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e6a0c1d/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5663687..ac35051 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1500,6 +1500,8 @@ Em.I18n.translations = {
   'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
   'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
   'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused. 
Try again later.",
+  'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
+  'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be 
paused. Try again later.",
 
   'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade 
Options",
   'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You 
are about to perform an upgrade to {0}.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e6a0c1d/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index fbeb670..35c3617 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -81,7 +81,7 @@
 {{t common.downgrade}}
   {{/if}}
   {{#if isDowngrade}}
-{{t admin.stackUpgrade.pauseDowngrade}}
+{{t admin.stackUpgrade.pauseDowngrade}}
   {{else}}
 {{t admin.stackUpgrade.pauseUpgrade}}
   {{/if}}
@@

ambari git commit: AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. (avijayan)

2016-01-29 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2.1 e10e9d1e8 -> 9a9ecca78


AMBARI-14848 : AMS service has critical alert after upgrade to 2.2.1.0. 
(avijayan)


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

Branch: refs/heads/branch-2.2.1
Commit: 9a9ecca7809c57e16cfe273c3e7b6df7f63a47c7
Parents: e10e9d1
Author: Aravindan Vijayan 
Authored: Fri Jan 29 14:05:51 2016 -0800
Committer: Aravindan Vijayan 
Committed: Fri Jan 29 14:05:51 2016 -0800

--
 .../server/upgrade/UpgradeCatalog221.java   |  7 
 .../server/upgrade/UpgradeCatalog221Test.java   | 43 
 2 files changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a9ecca7/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 2adc8b9..82c56ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -198,6 +198,13 @@ public class UpgradeCatalog221 extends 
AbstractUpgradeCatalog {
 alertDefinitionDAO.merge(alertDefinition);
   }
 
+  final AlertDefinitionEntity amsZookeeperProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+clusterID, "ams_metrics_collector_zookeeper_server_process");
+
+  if (amsZookeeperProcessAlertDefinitionEntity != null) {
+LOG.info("Removing alert : 
ams_metrics_collector_zookeeper_server_process");
+alertDefinitionDAO.remove(amsZookeeperProcessAlertDefinitionEntity);
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a9ecca7/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index 906167e..3dab200 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -41,7 +41,9 @@ import 
org.apache.ambari.server.controller.MaintenanceStateHelper;
 import org.apache.ambari.server.orm.DBAccessor;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
 import org.apache.ambari.server.orm.dao.StackDAO;
+import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
@@ -572,4 +574,45 @@ public class UpgradeCatalog221Test {
 String result = (String) updateAmsEnvContent.invoke(upgradeCatalog221, 
oldContent);
 Assert.assertEquals(expectedContent, result);
   }
+
+  @Test
+  public void testUpdateAlertDefinitions() {
+EasyMockSupport easyMockSupport = new EasyMockSupport();
+long clusterId = 1;
+
+final AmbariManagementController mockAmbariManagementController = 
easyMockSupport.createNiceMock(AmbariManagementController.class);
+final AlertDefinitionDAO mockAlertDefinitionDAO = 
easyMockSupport.createNiceMock(AlertDefinitionDAO.class);
+final Clusters mockClusters = 
easyMockSupport.createStrictMock(Clusters.class);
+final Cluster mockClusterExpected = 
easyMockSupport.createNiceMock(Cluster.class);
+final AlertDefinitionEntity mockAmsZookeeperProcessAlertDefinitionEntity = 
easyMockSupport.createNiceMock(AlertDefinitionEntity.class);
+
+final Injector mockInjector = Guice.createInjector(new AbstractModule() {
+  @Override
+  protected void configure() {
+
bind(AmbariManagementController.class).toInstance(mockAmbariManagementController);
+bind(Clusters.class).toInstance(mockClusters);
+bind(EntityManager.class).toInstance(entityManager);
+bind(AlertDefinitionDAO.class).toInstance(mockAlertDefinitionDAO);
+bind(DBAccessor.class).toInstance(createNiceMock(DBAccessor.class));
+bind(OsFamily.class).toInstance(createNiceMock(OsFamily.class));
+  }
+});
+
+

ambari git commit: AMBARI-14840: Expose default_segment_num property for HAWQ (adenissov via jaoki)

2016-01-29 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/trunk ea60d2980 -> 69c834195


AMBARI-14840: Expose default_segment_num property for HAWQ (adenissov via jaoki)


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

Branch: refs/heads/trunk
Commit: 69c83419517a5d87f9c460fc2b1bb8f41e50961a
Parents: ea60d29
Author: Jun Aoki 
Authored: Fri Jan 29 13:31:46 2016 -0800
Committer: Jun Aoki 
Committed: Fri Jan 29 13:31:46 2016 -0800

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  | 14 
 .../stacks/HDP/2.3/services/stack_advisor.py|  9 +-
 .../common/services-normal-hawq-3-hosts.json| 11 +++
 .../stacks/2.3/common/test_stack_advisor.py | 34 
 4 files changed, 67 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/69c83419/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 90982e9..f034749 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -205,4 +205,18 @@
 
   
 
+  
+default_segment_num
+Default Number of Virtual Segments
+24
+
+  The default number of virtual segments to use when executing a query 
statement. When the query is actually executed,
+  the number of virtual segments may differ from this number depending on 
the query's needs.
+  When expanding the cluster, you should adjust this number to reflect the 
number of nodes in the new cluster times the number of virtual segments per 
node.
+
+
+  int
+
+  
+
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/69c83419/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 0544f5a..3e60f05 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -671,7 +671,14 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 if self.isHawqMasterComponentOnAmbariServer(services):
   if "hawq-site" in services["configurations"] and 
"hawq_master_address_port" in 
services["configurations"]["hawq-site"]["properties"]:
 putHawqSiteProperty('hawq_master_address_port', '')
-  
+# calculate optimal number of virtual segments
+componentsListList = [service["components"] for service in 
services["services"]]
+componentsList = [item["StackServiceComponents"] for sublist in 
componentsListList for item in sublist]
+numSegments = len(self.__getHosts(componentsList, "HAWQSEGMENT"))
+# update default if segments are deployed
+if numSegments and "hawq-site" in services["configurations"] and 
"default_segment_num" in services["configurations"]["hawq-site"]["properties"]:
+  factor = 6 if numSegments < 50 else 4
+  putHawqSiteProperty('default_segment_num', numSegments * factor)
   
   def getServiceConfigurationValidators(self):
 parentValidators = super(HDP23StackAdvisor, 
self).getServiceConfigurationValidators()

http://git-wip-us.apache.org/repos/asf/ambari/blob/69c83419/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
 
b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
index a16ab32..d10a976 100644
--- 
a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
+++ 
b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
@@ -358,6 +358,17 @@
 "type" : "hawq-site.xml"
   },
   "dependencies" : [ ]
+}, {
+  "href" : 
"/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/default_segment_num",
+  "StackConfigurations" : {
+"property_depends_on" : [ ],
+"property_name" : "default_segment_num",
+"service_name" : "HAWQ",
+

ambari git commit: AMBARI-14840: Expose default_segment_num property for HAWQ (adenissov via jaoki)

2016-01-29 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 801e00c2c -> 6460f686c


AMBARI-14840: Expose default_segment_num property for HAWQ (adenissov via jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 6460f686c54bb3d784d1dbbd2d692a1ec3dbfa20
Parents: 801e00c
Author: Jun Aoki 
Authored: Fri Jan 29 13:35:07 2016 -0800
Committer: Jun Aoki 
Committed: Fri Jan 29 13:35:07 2016 -0800

--
 .../HAWQ/2.0.0/configuration/hawq-site.xml  | 14 
 .../stacks/HDP/2.3/services/stack_advisor.py|  9 +-
 .../common/services-normal-hawq-3-hosts.json| 11 +++
 .../stacks/2.3/common/test_stack_advisor.py | 34 
 4 files changed, 67 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6460f686/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 90982e9..f034749 100644
--- 
a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -205,4 +205,18 @@
 
   
 
+  
+default_segment_num
+Default Number of Virtual Segments
+24
+
+  The default number of virtual segments to use when executing a query 
statement. When the query is actually executed,
+  the number of virtual segments may differ from this number depending on 
the query's needs.
+  When expanding the cluster, you should adjust this number to reflect the 
number of nodes in the new cluster times the number of virtual segments per 
node.
+
+
+  int
+
+  
+
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6460f686/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 0efed8e..b9bb8af 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -672,7 +672,14 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 if self.isHawqMasterComponentOnAmbariServer(services):
   if "hawq-site" in services["configurations"] and 
"hawq_master_address_port" in 
services["configurations"]["hawq-site"]["properties"]:
 putHawqSiteProperty('hawq_master_address_port', '')
-  
+# calculate optimal number of virtual segments
+componentsListList = [service["components"] for service in 
services["services"]]
+componentsList = [item["StackServiceComponents"] for sublist in 
componentsListList for item in sublist]
+numSegments = len(self.__getHosts(componentsList, "HAWQSEGMENT"))
+# update default if segments are deployed
+if numSegments and "hawq-site" in services["configurations"] and 
"default_segment_num" in services["configurations"]["hawq-site"]["properties"]:
+  factor = 6 if numSegments < 50 else 4
+  putHawqSiteProperty('default_segment_num', numSegments * factor)
   
   def getServiceConfigurationValidators(self):
 parentValidators = super(HDP23StackAdvisor, 
self).getServiceConfigurationValidators()

http://git-wip-us.apache.org/repos/asf/ambari/blob/6460f686/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
 
b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
index 9fab56d..7a5a7b7 100644
--- 
a/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
+++ 
b/ambari-server/src/test/python/stacks/2.3/common/services-normal-hawq-3-hosts.json
@@ -358,6 +358,17 @@
 "type" : "hawq-site.xml"
   },
   "dependencies" : [ ]
+}, {
+  "href" : 
"/api/v1/stacks/HDP/versions/2.3/services/HAWQ/configurations/default_segment_num",
+  "StackConfigurations" : {
+"property_depends_on" : [ ],
+"property_name" : "default_segment_num",
+"service_name" : "HAWQ",
+

ambari git commit: AMBARI-14845. Kerberized cluster with RM HA contain incrorrect proxyuser yarn properties.(vbrodetskyi)

2016-01-29 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/trunk 6bac8ec15 -> ea60d2980


AMBARI-14845. Kerberized cluster with RM HA contain incrorrect proxyuser yarn 
properties.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: ea60d2980beb0bfe78fb312c583b3af928661d6e
Parents: 6bac8ec
Author: Vitaly Brodetskyi 
Authored: Fri Jan 29 16:29:16 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Jan 29 16:29:16 2016 +0200

--
 .../main/resources/common-services/YARN/2.1.0.2.0/kerberos.json  | 4 ++--
 .../main/resources/stacks/HDP/2.2/services/YARN/kerberos.json| 4 ++--
 .../main/resources/stacks/HDP/2.3/services/YARN/kerberos.json| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea60d298/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index ff2f484..9afe668 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -36,8 +36,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 }
   ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea60d298/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index 2f74aba..240f61e 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -37,8 +37,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 }
   ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea60d298/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
index 70d12b4..22fed42 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
@@ -37,8 +37,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 },
 {

ambari git commit: AMBARI-14845. Kerberized cluster with RM HA contain incrorrect proxyuser yarn properties.(vbrodetskyi)

2016-01-29 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 d23f45d53 -> 801e00c2c


AMBARI-14845. Kerberized cluster with RM HA contain incrorrect proxyuser yarn 
properties.(vbrodetskyi)


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

Branch: refs/heads/branch-2.2
Commit: 801e00c2c17a929730495ff5efad514503b8ae84
Parents: d23f45d
Author: Vitaly Brodetskyi 
Authored: Fri Jan 29 16:27:46 2016 +0200
Committer: Vitaly Brodetskyi 
Committed: Fri Jan 29 16:27:46 2016 +0200

--
 .../main/resources/common-services/YARN/2.1.0.2.0/kerberos.json  | 4 ++--
 .../main/resources/stacks/HDP/2.2/services/YARN/kerberos.json| 4 ++--
 .../main/resources/stacks/HDP/2.3/services/YARN/kerberos.json| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/801e00c2/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index ff2f484..9afe668 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -36,8 +36,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 }
   ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/801e00c2/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index 2f74aba..240f61e 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -37,8 +37,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 }
   ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/801e00c2/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
index 70d12b4..22fed42 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
@@ -37,8 +37,8 @@
 },
 {
   "core-site": {
-"hadoop.proxyuser.yarn.groups": "*",
-"hadoop.proxyuser.yarn.hosts": 
"${yarn-site/yarn.resourcemanager.hostname}"
+"hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+"hadoop.proxyuser.${yarn-env/yarn_user}.hosts": 
"${clusterHostInfo/rm_host}"
   }
 },
 {