ambari git commit: AMBARI-13307. Agent instance memory footprint likely gradually growing (aonishuk)

2015-10-06 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 00aabde5e -> 32a5c51c9


AMBARI-13307. Agent instance memory footprint likely gradually growing 
(aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 32a5c51c90b0c522be2ea640d34e38b11849550a
Parents: 00aabde
Author: Andrew Onishuk 
Authored: Tue Oct 6 18:01:33 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 18:01:33 2015 +0300

--
 .../src/main/python/resource_management/core/logger.py  | 6 +-
 .../python/resource_management/libraries/script/script.py   | 9 +++--
 2 files changed, 4 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/32a5c51c/ambari-common/src/main/python/resource_management/core/logger.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/logger.py 
b/ambari-common/src/main/python/resource_management/core/logger.py
index 0ea34ff..f126f1e 100644
--- a/ambari-common/src/main/python/resource_management/core/logger.py
+++ b/ambari-common/src/main/python/resource_management/core/logger.py
@@ -36,11 +36,9 @@ class Logger:
   
   @staticmethod
   def initialize_logger(name='resource_management', 
logging_level=logging.INFO, format='%(asctime)s - %(message)s'):
-# set up logging (two separate loggers for stderr and stdout with 
different loglevels)
-
 if Logger.logger:
   return
-
+# set up logging (two separate loggers for stderr and stdout with 
different loglevels)
 logger = logging.getLogger(name)
 logger.setLevel(logging_level)
 formatter = logging.Formatter(format)
@@ -55,8 +53,6 @@ class Logger:
 logger.addHandler(chout)
 
 Logger.logger = logger
-
-return logger, chout, cherr
 
   @staticmethod
   def error(text):

http://git-wip-us.apache.org/repos/asf/ambari/blob/32a5c51c/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 f43c414..efd34e3 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
@@ -171,11 +171,9 @@ class Script(object):
 Sets up logging;
 Parses command parameters and executes method relevant to command type
 """
-logger, chout, cherr = Logger.initialize_logger(__name__)
-
 # parse arguments
 if len(sys.argv) < 7:
- logger.error("Script expects at least 6 arguments")
+ print "Script expects at least 6 arguments"
  print USAGE.format(os.path.basename(sys.argv[0])) # print to stdout
  sys.exit(1)
 
@@ -188,8 +186,7 @@ class Script(object):
 Script.tmp_dir = sys.argv[6]
 
 logging_level_str = logging._levelNames[self.logging_level]
-chout.setLevel(logging_level_str)
-logger.setLevel(logging_level_str)
+Logger.initialize_logger(__name__, logging_level=logging_level_str)
 
 # on windows we need to reload some of env variables manually because 
there is no default paths for configs(like
 # /etc/something/conf on linux. When this env vars created by one of the 
Script execution, they can not be updated
@@ -208,7 +205,7 @@ class Script(object):
 Script.passwords[get_path_from_configuration(k, Script.config)] = 
get_path_from_configuration(v, Script.config)
 
 except IOError:
-  logger.exception("Can not read json file with command parameters: ")
+  Logging.logger.exception("Can not read json file with command 
parameters: ")
   sys.exit(1)
 
 # Run class method depending on a command type

ambari git commit: AMBARI-13317 API call to load Host Component links on Service dashboard should be independent of metrics. (atkach)

2015-10-06 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/trunk e6725016f -> aeebae6eb


AMBARI-13317 API call to load Host Component links on Service dashboard should 
be independent of metrics. (atkach)


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

Branch: refs/heads/trunk
Commit: aeebae6eb7609398c807360985724e1310829681
Parents: e672501
Author: Andrii Tkach 
Authored: Tue Oct 6 11:19:39 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 6 11:19:39 2015 +0300

--
 .../controllers/global/cluster_controller.js|  2 +
 .../app/controllers/global/update_controller.js | 99 
 .../global/wizard_watcher_controller.js |  4 +
 .../global/update_controller_test.js| 57 +++
 .../global/wizard_watcher_controller_test.js| 13 +++
 5 files changed, 117 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aeebae6e/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 b6dba0e..f4c2837 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -249,6 +249,8 @@ App.ClusterController = 
Em.Controller.extend(App.ReloadPopupMixin, {
   // service metrics loading doesn't affect overall progress
   updater.updateServiceMetric(function () {
 self.set('isServiceMetricsLoaded', true);
+// make second call, because first is light since it doesn't 
request host-component metrics
+updater.updateServiceMetric(Em.K);
 // components config loading doesn't affect overall progress
 updater.updateComponentConfig(function () {
   self.set('isComponentsConfigLoaded', true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/aeebae6e/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 69deb74..0d003ca 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -39,6 +39,47 @@ App.UpdateController = Em.Controller.extend({
   paginationKeys: ['page_size', 'from'],
 
   /**
+   * @type {Array}
+   */
+  serviceComponentMetrics: [
+'host_components/metrics/jvm/memHeapUsedM',
+'host_components/metrics/jvm/HeapMemoryMax',
+'host_components/metrics/jvm/HeapMemoryUsed',
+'host_components/metrics/jvm/memHeapCommittedM',
+'host_components/metrics/mapred/jobtracker/trackers_decommissioned',
+'host_components/metrics/cpu/cpu_wio',
+'host_components/metrics/rpc/RpcQueueTime_avg_time',
+'host_components/metrics/dfs/FSNamesystem/*',
+'host_components/metrics/dfs/namenode/Version',
+'host_components/metrics/dfs/namenode/LiveNodes',
+'host_components/metrics/dfs/namenode/DeadNodes',
+'host_components/metrics/dfs/namenode/DecomNodes',
+'host_components/metrics/dfs/namenode/TotalFiles',
+'host_components/metrics/dfs/namenode/UpgradeFinalized',
+'host_components/metrics/dfs/namenode/Safemode',
+'host_components/metrics/runtime/StartTime'
+  ],
+
+  /**
+   * @type {object}
+   */
+  serviceSpecificParams: {
+'FLUME': "host_components/processes/HostComponentProcess",
+'YARN':  "host_components/metrics/yarn/Queue," +
+ "host_components/metrics/yarn/ClusterMetrics/NumActiveNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumLostNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumUnhealthyNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumRebootedNMs," +
+ 
"host_components/metrics/yarn/ClusterMetrics/NumDecommissionedNMs",
+'HBASE': "host_components/metrics/hbase/master/IsActiveMaster," +
+ "host_components/metrics/hbase/master/MasterStartTime," +
+ "host_components/metrics/hbase/master/MasterActiveTime," +
+ "host_components/metrics/hbase/master/AverageLoad," +
+ "host_components/metrics/master/AssignmentManger/ritCount",
+'STORM': 
'metrics/api/v1/cluster/summary,metrics/api/v1/topology/summary,metrics/api/v1/nimbus/summary'
+  },
+
+  /**
* @type {string}
*/
   HOSTS_TEST_URL: '/data/hosts/HDP2/hosts.json',
@@ -409,22 +450,6 @@

ambari git commit: AMBARI-13317 API call to load Host Component links on Service dashboard should be independent of metrics. (atkach)

2015-10-06 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 9b348601d -> b10b1ffee


AMBARI-13317 API call to load Host Component links on Service dashboard should 
be independent of metrics. (atkach)


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

Branch: refs/heads/branch-2.1
Commit: b10b1ffeeafe343c5b5bb94b2c6c9a7459ef9d5d
Parents: 9b34860
Author: Andrii Tkach 
Authored: Tue Oct 6 11:54:57 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 6 11:54:57 2015 +0300

--
 .../controllers/global/cluster_controller.js|  2 +
 .../app/controllers/global/update_controller.js | 99 
 .../global/update_controller_test.js| 57 +++
 3 files changed, 100 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b10b1ffe/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 b098c19..5e69c5c 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -238,6 +238,8 @@ App.ClusterController = Em.Controller.extend({
   // service metrics loading doesn't affect overall progress
   updater.updateServiceMetric(function () {
 self.set('isServiceMetricsLoaded', true);
+// make second call, because first is light since it doesn't 
request host-component metrics
+updater.updateServiceMetric(Em.K);
 // components config loading doesn't affect overall progress
 updater.updateComponentConfig(function () {
   self.set('isComponentsConfigLoaded', true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/b10b1ffe/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 8eb7bd7..af98bec 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -39,6 +39,47 @@ App.UpdateController = Em.Controller.extend({
   paginationKeys: ['page_size', 'from'],
 
   /**
+   * @type {Array}
+   */
+  serviceComponentMetrics: [
+'host_components/metrics/jvm/memHeapUsedM',
+'host_components/metrics/jvm/HeapMemoryMax',
+'host_components/metrics/jvm/HeapMemoryUsed',
+'host_components/metrics/jvm/memHeapCommittedM',
+'host_components/metrics/mapred/jobtracker/trackers_decommissioned',
+'host_components/metrics/cpu/cpu_wio',
+'host_components/metrics/rpc/RpcQueueTime_avg_time',
+'host_components/metrics/dfs/FSNamesystem/*',
+'host_components/metrics/dfs/namenode/Version',
+'host_components/metrics/dfs/namenode/LiveNodes',
+'host_components/metrics/dfs/namenode/DeadNodes',
+'host_components/metrics/dfs/namenode/DecomNodes',
+'host_components/metrics/dfs/namenode/TotalFiles',
+'host_components/metrics/dfs/namenode/UpgradeFinalized',
+'host_components/metrics/dfs/namenode/Safemode',
+'host_components/metrics/runtime/StartTime'
+  ],
+
+  /**
+   * @type {object}
+   */
+  serviceSpecificParams: {
+'FLUME': "host_components/processes/HostComponentProcess",
+'YARN':  "host_components/metrics/yarn/Queue," +
+ "host_components/metrics/yarn/ClusterMetrics/NumActiveNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumLostNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumUnhealthyNMs," +
+ "host_components/metrics/yarn/ClusterMetrics/NumRebootedNMs," +
+ 
"host_components/metrics/yarn/ClusterMetrics/NumDecommissionedNMs",
+'HBASE': "host_components/metrics/hbase/master/IsActiveMaster," +
+ "host_components/metrics/hbase/master/MasterStartTime," +
+ "host_components/metrics/hbase/master/MasterActiveTime," +
+ "host_components/metrics/hbase/master/AverageLoad," +
+ "host_components/metrics/master/AssignmentManger/ritCount",
+'STORM': 
'metrics/api/v1/cluster/summary,metrics/api/v1/topology/summary,metrics/api/v1/nimbus/summary'
+  },
+
+  /**
* @type {string}
*/
   HOSTS_TEST_URL: '/data/hosts/HDP2/hosts.json',
@@ -408,22 +449,6 @@ App.UpdateController = Em.Controller.extend({
 'host_components/HostRoles/stale_configs,' +

ambari git commit: AMBARI-13308. Config Versions list isn't updated while user is on the configs page after adding/removing HiveServer2 (onechiporenko)

2015-10-06 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 329d2b542 -> e6725016f


AMBARI-13308. Config Versions list isn't updated while user is on the configs 
page after adding/removing HiveServer2 (onechiporenko)


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

Branch: refs/heads/trunk
Commit: e6725016f7417b6e90c1d3cde028a33bda41bf23
Parents: 329d2b5
Author: Oleg Nechiporenko 
Authored: Tue Oct 6 10:57:55 2015 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Oct 6 10:57:55 2015 +0300

--
 ambari-web/app/controllers/main/host/details.js | 19 +--
 ambari-web/app/controllers/main/service/item.js |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e6725016/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 507e375..6c2f0e7 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -436,6 +436,9 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 } else if (data.componentName == 'HIVE_METASTORE') {
   this.set('deleteHiveMetaStore', true);
   this.loadConfigs('loadHiveConfigs');
+} else if (data.componentName == 'HIVE_SERVER') {
+  this.set('deleteHiveServer', true);
+  this.loadConfigs('loadHiveConfigs');
 } else if (data.componentName == 'NIMBUS') {
   this.set('deleteNimbusHost', true);
   this.loadConfigs('loadStormConfigs');
@@ -671,7 +674,7 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @param {object} data
* @param {object} opt
* @param {object} params
-   * @method installNewComponentSuccessCallbƒack
+   * @method installNewComponentSuccessCallback
*/
   installNewComponentSuccessCallback: function (data, opt, params) {
 if (!data || !data.Requests || !data.Requests.id) {
@@ -824,13 +827,16 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @method loadHiveConfigs
*/
   loadHiveConfigs: function (data) {
-App.ajax.send({
+return App.ajax.send({
   name: 'admin.get.all_configurations',
   sender: this,
   data: {
-urlParams: '(type=hive-site=' + 
data.Clusters.desired_configs['hive-site'].tag + ')|(type=webhcat-site=' +
-data.Clusters.desired_configs['webhcat-site'].tag + 
')|(type=hive-env=' + data.Clusters.desired_configs['hive-env'].tag +
-')|(type=core-site=' + 
data.Clusters.desired_configs['core-site'].tag + ')'
+urlParams: [
+  '(type=hive-site=' + 
data.Clusters.desired_configs['hive-site'].tag + ')',
+  '(type=webhcat-site=' + 
data.Clusters.desired_configs['webhcat-site'].tag + ')',
+  '(type=hive-env=' + 
data.Clusters.desired_configs['hive-env'].tag + ')',
+  '(type=core-site=' + 
data.Clusters.desired_configs['core-site'].tag + ')'
+].join('|')
   },
   success: 'onLoadHiveConfigs'
 });
@@ -965,8 +971,9 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   this.set('hiveMetastoreHost', '');
 }
 
-if (this.get('fromDeleteHost') || this.get('deleteHiveMetaStore')) {
+if (this.get('fromDeleteHost') || this.get('deleteHiveMetaStore') || 
this.get('deleteHiveServer')) {
   this.set('deleteHiveMetaStore', false);
+  this.set('deleteHiveServer', false);
   this.set('fromDeleteHost', false);
   return hiveHosts.without(this.get('content.hostName'));
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e6725016/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index bd5bcc7..223e610 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -800,7 +800,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 
 // Install
 if(['HIVE_METASTORE', 'RANGER_KMS_SERVER', 
'NIMBUS'].contains(component.get('componentName')) && !!selectedHost){
-  App.router.get('mainHostDetailsController').addComponent(
+  App.router.get('mainHostDetailsController').addComponentWithCheck(
 {
   context: component,
   selectedHost:

ambari git commit: AMBARI-13308. Config Versions list isn't updated while user is on the configs page after adding/removing HiveServer2 (onechiporenko)

2015-10-06 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 453101c7a -> 9b348601d


AMBARI-13308. Config Versions list isn't updated while user is on the configs 
page after adding/removing HiveServer2 (onechiporenko)


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

Branch: refs/heads/branch-2.1
Commit: 9b348601d86c5ca263d1eb4181a8dfb36d738c6c
Parents: 453101c
Author: Oleg Nechiporenko 
Authored: Tue Oct 6 10:57:55 2015 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Oct 6 11:04:19 2015 +0300

--
 ambari-web/app/controllers/main/host/details.js | 19 +--
 ambari-web/app/controllers/main/service/item.js |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b348601/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 3768dde..5a48dfa 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -437,6 +437,9 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 } else if (data.componentName == 'HIVE_METASTORE') {
   this.set('deleteHiveMetaStore', true);
   this.loadConfigs('loadHiveConfigs');
+} else if (data.componentName == 'HIVE_SERVER') {
+  this.set('deleteHiveServer', true);
+  this.loadConfigs('loadHiveConfigs');
 } else if (data.componentName == 'NIMBUS') {
   this.set('deleteNimbusHost', true);
   this.loadConfigs('loadStormConfigs');
@@ -681,7 +684,7 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @param {object} data
* @param {object} opt
* @param {object} params
-   * @method installNewComponentSuccessCallbƒack
+   * @method installNewComponentSuccessCallback
*/
   installNewComponentSuccessCallback: function (data, opt, params) {
 if (!data || !data.Requests || !data.Requests.id) {
@@ -834,13 +837,16 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @method loadHiveConfigs
*/
   loadHiveConfigs: function (data) {
-App.ajax.send({
+return App.ajax.send({
   name: 'admin.get.all_configurations',
   sender: this,
   data: {
-urlParams: '(type=hive-site=' + 
data.Clusters.desired_configs['hive-site'].tag + ')|(type=webhcat-site=' +
-data.Clusters.desired_configs['webhcat-site'].tag + 
')|(type=hive-env=' + data.Clusters.desired_configs['hive-env'].tag +
-')|(type=core-site=' + 
data.Clusters.desired_configs['core-site'].tag + ')'
+urlParams: [
+  '(type=hive-site=' + 
data.Clusters.desired_configs['hive-site'].tag + ')',
+  '(type=webhcat-site=' + 
data.Clusters.desired_configs['webhcat-site'].tag + ')',
+  '(type=hive-env=' + 
data.Clusters.desired_configs['hive-env'].tag + ')',
+  '(type=core-site=' + 
data.Clusters.desired_configs['core-site'].tag + ')'
+].join('|')
   },
   success: 'onLoadHiveConfigs'
 });
@@ -975,8 +981,9 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   this.set('hiveMetastoreHost', '');
 }
 
-if (this.get('fromDeleteHost') || this.get('deleteHiveMetaStore')) {
+if (this.get('fromDeleteHost') || this.get('deleteHiveMetaStore') || 
this.get('deleteHiveServer')) {
   this.set('deleteHiveMetaStore', false);
+  this.set('deleteHiveServer', false);
   this.set('fromDeleteHost', false);
   return hiveHosts.without(this.get('content.hostName'));
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b348601/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 2cd539b..ec807e2 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -800,7 +800,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 
 // Install
 if(['HIVE_METASTORE', 'RANGER_KMS_SERVER', 
'NIMBUS'].contains(component.get('componentName')) && !!selectedHost){
-  App.router.get('mainHostDetailsController').addComponent(
+  App.router.get('mainHostDetailsController').addComponentWithCheck(
 {
   context: component,

ambari git commit: AMBARI-13329. Test connection button for Ranger privileged user should not connect to ranger database. (jaimin)

2015-10-06 Thread jaimin 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 32a5c51c9 -> 4df97f47c


AMBARI-13329. Test connection button for Ranger privileged user should not 
connect to ranger database. (jaimin)


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

Branch: refs/heads/branch-2.1
Commit: 4df97f47cdde68faa0b9ff38528cb7b9dc601532
Parents: 32a5c51
Author: Jaimin Jetly 
Authored: Tue Oct 6 18:11:42 2015 -0700
Committer: Jaimin Jetly 
Committed: Tue Oct 6 18:11:42 2015 -0700

--
 .../RANGER/configuration/ranger-env.xml | 20 ++
 .../HDP/2.3/services/RANGER/themes/theme.json   | 64 +---
 .../stacks/HDP/2.3/services/stack_advisor.py| 21 ++-
 3 files changed, 68 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4df97f47/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
index a8ad1b6..5ed7b22 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
@@ -75,5 +75,25 @@
 
   
 
+  
+ranger_privelege_user_jdbc_url
+JDBC connect string for root user
+JDBC connect string - auto populated based on other values. 
This is to be used by root user
+jdbc:mysql://localhost
+
+  false
+
+
+  
+admin-properties
+DB_FLAVOR
+  
+  
+admin-properties
+db_host
+  
+
+  
+
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4df97f47/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme.json
index c4f7d59..31d5cf7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/themes/theme.json
@@ -18,10 +18,10 @@
   "display-name": "Ranger Admin",
   "row-index": "0",
   "column-index": "0",
-  "row-span": "4",
+  "row-span": "3",
   "column-span": "2",
   "section-columns": "2",
-  "section-rows": "4",
+  "section-rows": "3",
   "subsections": [
 {
   "name": "subsection-ranger-db-row1-col1",
@@ -38,30 +38,15 @@
   "column-span": "1"
 },
 {
-  "name": "subsection-ranger-db-row2-col1",
+  "name": "subsection-ranger-db-row2",
   "row-index": "1",
   "column-index": "0",
   "row-span": "1",
-  "column-span": "1"
-},
-{
-  "name": "subsection-ranger-db-row2-col2",
-  "row-index": "1",
-  "column-index": "1",
-  "row-span": "1",
-  "column-span": "1",
-  "left-vertical-splitter": false
-},
-{
-  "name": "subsection-ranger-db-row3",
-  "row-index": "2",
-  "column-index": "0",
-  "row-span": "1",
   "column-span": "2"
 },
 {
-  "name": "subsection-ranger-db-row4-col1",
-  "row-index": "3",
+  "name": "subsection-ranger-db-row3-col1",
+  "row-index": "2",
   "column-index": "0",
   "row-span": "1",
   "column-span": "1",
@@ -85,8 +70,8 @@
   ]
 },
 {
-  "name": "subsection-ranger-db-row4-col2",
-  "row-index": "3",
+  "name": "subsection-ranger-db-row3-col2",
+  "row-index":

[2/2] ambari git commit: AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" enhanced config (aonishuk)

2015-10-06 Thread aonishuk 
AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" 
enhanced config (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: f922634ffd728e5286a3454b82e2e817d2de6b3f
Parents: b10b1ff
Author: Andrew Onishuk 
Authored: Tue Oct 6 12:39:11 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 12:39:11 2015 +0300

--
 .../internal/BlueprintConfigurationProcessor.java   | 2 ++
 .../internal/BlueprintConfigurationProcessorTest.java   | 9 -
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f922634f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 892cf32..0535c96 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -1916,6 +1916,7 @@ public class BlueprintConfigurationProcessor {
 mPropertyUpdaters.put("hbase-env", hbaseEnvMap);
 mPropertyUpdaters.put("mapred-env", mapredEnvMap);
 mPropertyUpdaters.put("oozie-env", oozieEnvHeapSizeMap);
+mPropertyUpdaters.put("yarn-site", yarnSiteMap);
 
 multiHostTopologyUpdaters.put("webhcat-site", multiWebhcatSiteMap);
 multiHostTopologyUpdaters.put("hbase-site", multiHbaseSiteMap);
@@ -2057,6 +2058,7 @@ public class BlueprintConfigurationProcessor {
 hbaseEnvMap.put("hbase_regionserver_heapsize", new MPropertyUpdater());
 oozieEnvHeapSizeMap.put("oozie_heapsize", new MPropertyUpdater());
 oozieEnvHeapSizeMap.put("oozie_permsize", new MPropertyUpdater());
+yarnSiteMap.put("yarn.nodemanager.resource.memory-mb", new 
MPropertyUpdater());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/f922634f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index a97ca74..43da6c5 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1422,11 +1422,13 @@ public class BlueprintConfigurationProcessorTest {
 Map oozieSiteProperties = new HashMap();
 Map oozieEnvProperties = new HashMap();
 Map coreSiteProperties = new HashMap();
-
+Map yarnSiteProperties = new HashMap();
+
 configProperties.put("oozie-site", oozieSiteProperties);
 configProperties.put("oozie-env", oozieEnvProperties);
 configProperties.put("hive-env", oozieEnvProperties);
 configProperties.put("core-site", coreSiteProperties);
+configProperties.put("yarn-site", yarnSiteProperties);
 
 oozieSiteProperties.put("oozie.base.url", expectedHostName);
 oozieSiteProperties.put("oozie.authentication.kerberos.principal", 
expectedHostName);
@@ -1439,6 +1441,8 @@ public class BlueprintConfigurationProcessorTest {
 oozieEnvProperties.put("oozie_permsize", "2048m");
 
 coreSiteProperties.put("hadoop.proxyuser.oozie.hosts", expectedHostName + 
"," + expectedHostNameTwo);
+
+oozieEnvProperties.put("yarn.nodemanager.resource.memory-mb", "2048m");
 
 Configuration clusterConfig = new Configuration(configProperties,
 Collections.>>emptyMap());
@@ -1492,6 +1496,9 @@ public class BlueprintConfigurationProcessorTest {
   "1024m", oozieEnvProperties.get("oozie_heapsize"));
 assertEquals("oozie_permsize should have been included in exported 
configuration",
   "2048m", oozieEnvProperties.get("oozie_permsize"));
+
+assertEquals("yarn.nodemanager.resource.memory-mb should

[1/2] ambari git commit: AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" enhanced config (aonishuk)

2015-10-06 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b10b1ffee -> f922634ff
  refs/heads/trunk aeebae6eb -> 401161157


AMBARI-13318. Issue with "Memory allocated for all YARN containers on a node" 
enhanced config (aonishuk)


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

Branch: refs/heads/trunk
Commit: 4011611574cf2c1de9517b165ec109feba97c622
Parents: aeebae6
Author: Andrew Onishuk 
Authored: Tue Oct 6 12:39:08 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 12:39:08 2015 +0300

--
 .../internal/BlueprintConfigurationProcessor.java   | 2 ++
 .../internal/BlueprintConfigurationProcessorTest.java   | 9 -
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40116115/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5fd5563..3d13725 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -1937,6 +1937,7 @@ public class BlueprintConfigurationProcessor {
 mPropertyUpdaters.put("hbase-env", hbaseEnvMap);
 mPropertyUpdaters.put("mapred-env", mapredEnvMap);
 mPropertyUpdaters.put("oozie-env", oozieEnvHeapSizeMap);
+mPropertyUpdaters.put("yarn-site", yarnSiteMap);
 
 multiHostTopologyUpdaters.put("webhcat-site", multiWebhcatSiteMap);
 multiHostTopologyUpdaters.put("hbase-site", multiHbaseSiteMap);
@@ -2144,6 +2145,7 @@ public class BlueprintConfigurationProcessor {
 hbaseEnvMap.put("hbase_regionserver_heapsize", new MPropertyUpdater());
 oozieEnvHeapSizeMap.put("oozie_heapsize", new MPropertyUpdater());
 oozieEnvHeapSizeMap.put("oozie_permsize", new MPropertyUpdater());
+yarnSiteMap.put("yarn.nodemanager.resource.memory-mb", new 
MPropertyUpdater());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/40116115/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index ac86668..402c69d 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1427,11 +1427,13 @@ public class BlueprintConfigurationProcessorTest {
 Map oozieSiteProperties = new HashMap();
 Map oozieEnvProperties = new HashMap();
 Map coreSiteProperties = new HashMap();
-
+Map yarnSiteProperties = new HashMap();
+
 configProperties.put("oozie-site", oozieSiteProperties);
 configProperties.put("oozie-env", oozieEnvProperties);
 configProperties.put("hive-env", oozieEnvProperties);
 configProperties.put("core-site", coreSiteProperties);
+configProperties.put("yarn-site", yarnSiteProperties);
 
 oozieSiteProperties.put("oozie.base.url", expectedHostName);
 oozieSiteProperties.put("oozie.authentication.kerberos.principal", 
expectedHostName);
@@ -1444,6 +1446,8 @@ public class BlueprintConfigurationProcessorTest {
 oozieEnvProperties.put("oozie_permsize", "2048m");
 
 coreSiteProperties.put("hadoop.proxyuser.oozie.hosts", expectedHostName + 
"," + expectedHostNameTwo);
+
+oozieEnvProperties.put("yarn.nodemanager.resource.memory-mb", "2048m");
 
 Configuration clusterConfig = new Configuration(configProperties,
 Collections.>>emptyMap());
@@ -1497,6 +1501,9 @@ public class BlueprintConfigurationProcessorTest {
   "1024m", oozieEnvProperties.get("oozie_heapsize"));
 assertEquals("oozie_permsize should have been included in exported 
configuration",

ambari git commit: AMBARI-13319. Flume summary: there are no hosts after page refresh (akovalenko)

2015-10-06 Thread akovalenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f922634ff -> 43155ade0


AMBARI-13319. Flume summary: there are no hosts after page refresh (akovalenko)


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

Branch: refs/heads/branch-2.1
Commit: 43155ade0242e6af86b07badf21d380a120b7e38
Parents: f922634
Author: Aleksandr Kovalenko 
Authored: Tue Oct 6 13:05:59 2015 +0300
Committer: Aleksandr Kovalenko 
Committed: Tue Oct 6 13:06:27 2015 +0300

--
 ambari-web/app/mappers/service_metrics_mapper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/43155ade/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js 
b/ambari-web/app/mappers/service_metrics_mapper.js
index 9fc3d70..5910574 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -283,8 +283,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
 } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == 
"FLUME") {
   finalJson = this.flumeMapper(item);
   finalJson.rand = Math.random();
-  App.store.load(App.FlumeService, finalJson);
   App.store.loadMany(App.FlumeAgent, finalJson.agentJsons);
+  App.store.load(App.FlumeService, finalJson);
 } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == 
"YARN") {
   finalJson = this.yarnMapper(item);
   finalJson.rand = Math.random();

ambari git commit: AMBARI-13319. Flume summary: there are no hosts after page refresh (akovalenko)

2015-10-06 Thread akovalenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 401161157 -> 6b8f69243


AMBARI-13319. Flume summary: there are no hosts after page refresh (akovalenko)


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

Branch: refs/heads/trunk
Commit: 6b8f692437a923510c60b157aceef57e749c271b
Parents: 4011611
Author: Aleksandr Kovalenko 
Authored: Tue Oct 6 13:06:27 2015 +0300
Committer: Aleksandr Kovalenko 
Committed: Tue Oct 6 13:28:03 2015 +0300

--
 ambari-web/app/mappers/service_metrics_mapper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6b8f6924/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js 
b/ambari-web/app/mappers/service_metrics_mapper.js
index 9fc3d70..5910574 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -283,8 +283,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
 } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == 
"FLUME") {
   finalJson = this.flumeMapper(item);
   finalJson.rand = Math.random();
-  App.store.load(App.FlumeService, finalJson);
   App.store.loadMany(App.FlumeAgent, finalJson.agentJsons);
+  App.store.load(App.FlumeService, finalJson);
 } else if (item && item.ServiceInfo && item.ServiceInfo.service_name == 
"YARN") {
   finalJson = this.yarnMapper(item);
   finalJson.rand = Math.random();

[1/2] ambari git commit: AMBARI-13321. Oozie Alert Fails In Kerberized Environment That Is Not SSL (aonishuk)

2015-10-06 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 43155ade0 -> 8692e32aa
  refs/heads/trunk 6b8f69243 -> 815c5caaa


AMBARI-13321. Oozie Alert Fails In Kerberized Environment That Is Not SSL 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: 815c5caaa846a45dbded22da488a0242127ead2e
Parents: 6b8f692
Author: Andrew Onishuk 
Authored: Tue Oct 6 14:12:23 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 14:12:23 2015 +0300

--
 .../package/alerts/alert_check_oozie_server.py  | 72 +---
 1 file changed, 34 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/815c5caa/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
index c3143c6..764473e 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
@@ -43,28 +43,26 @@ KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}
 
 OOZIE_URL_KEY = '{{oozie-site/oozie.base.url}}'
 SECURITY_ENABLED = '{{cluster-env/security_enabled}}'
-OOZIE_PRINCIPAL = '{{cluster-env/smokeuser_principal_name}}'
-OOZIE_KEYTAB = '{{cluster-env/smokeuser_keytab}}'
 OOZIE_USER = '{{oozie-env/oozie_user}}'
 OOZIE_CONF_DIR = '/usr/hdp/current/oozie-server/conf'
 OOZIE_CONF_DIR_LEGACY = '/etc/oozie/conf'
 OOZIE_HTTPS_PORT = '{{oozie-site/oozie.https.port}}'
 OOZIE_ENV_CONTENT = '{{oozie-env/content}}'
 
-SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
-SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
-SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
+USER_KEYTAB_KEY = 
'{{oozie-site/oozie.service.HadoopAccessorService.keytab.file}}'
+USER_PRINCIPAL_KEY = 
'{{oozie-site/oozie.service.HadoopAccessorService.kerberos.principal}}'
+USER_KEY = '{{oozie-env/oozie_user}}'
 
 # default keytab location
-SMOKEUSER_KEYTAB_SCRIPT_PARAM_KEY = 'default.smoke.keytab'
-SMOKEUSER_KEYTAB_DEFAULT = '/etc/security/keytabs/smokeuser.headless.keytab'
+USER_KEYTAB_SCRIPT_PARAM_KEY = 'default.oozie.keytab'
+USER_KEYTAB_DEFAULT = '/etc/security/keytabs/oozie.headless.keytab'
 
-# default smoke principal
-SMOKEUSER_PRINCIPAL_SCRIPT_PARAM_KEY = 'default.smoke.principal'
-SMOKEUSER_PRINCIPAL_DEFAULT = 'ambari...@example.com'
+# default user principal
+USER_PRINCIPAL_SCRIPT_PARAM_KEY = 'default.oozie.principal'
+USER_PRINCIPAL_DEFAULT = 'oo...@example.com'
 
-# default smoke user
-SMOKEUSER_DEFAULT = 'ambari-qa'
+# default user
+USER_DEFAULT = 'oozie'
 
 class KerberosPropertiesNotFound(Exception): pass
 
@@ -82,8 +80,8 @@ def get_tokens():
   Returns a tuple of tokens in the format {{site/property}} that will be used
   to build the dictionary passed into execute
   """
-  return (OOZIE_URL_KEY, SMOKEUSER_PRINCIPAL_KEY, SECURITY_ENABLED, 
SMOKEUSER_KEYTAB_KEY, KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY,
-  SMOKEUSER_KEY, OOZIE_HTTPS_PORT, OOZIE_ENV_CONTENT)
+  return (OOZIE_URL_KEY, USER_PRINCIPAL_KEY, SECURITY_ENABLED, 
USER_KEYTAB_KEY, KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY,
+  USER_KEY, OOZIE_HTTPS_PORT, OOZIE_ENV_CONTENT)
 
 @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
 def get_check_command(oozie_url, host_name, configurations):
@@ -98,9 +96,9 @@ def get_check_command(oozie_url, host_name, configurations):
 def get_check_command(oozie_url, host_name, configurations, parameters):
   kerberos_env = None
 
-  smokeuser = SMOKEUSER_DEFAULT
-  if SMOKEUSER_KEY in configurations:
-smokeuser = configurations[SMOKEUSER_KEY]
+  user = USER_DEFAULT
+  if USER_KEY in configurations:
+user = configurations[USER_KEY]
 
   security_enabled = False
   if SECURITY_ENABLED in configurations:
@@ -108,20 +106,22 @@ def get_check_command(oozie_url, host_name, 
configurations, parameters):
 
   if security_enabled:
 # defaults
-smokeuser_keytab = SMOKEUSER_KEYTAB_DEFAULT
-smokeuser_principal = SMOKEUSER_PRINCIPAL_DEFAULT
+user_keytab = USER_KEYTAB_DEFAULT
+user_principal = USER_PRINCIPAL_DEFAULT
 
 # check script params
-if SMOKEUSER_PRINCIPAL_SCRIPT_PARAM_KEY in parameters:
-  smokeuser_principal

[2/2] ambari git commit: AMBARI-13322. Should not log "unable to get latest URL" as ERROR (aonishuk)

2015-10-06 Thread aonishuk 
AMBARI-13322. Should not log "unable to get latest URL" as ERROR (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 9b3955b74de6af9cb56d087d0db4583414e1be47
Parents: 8692e32
Author: Andrew Onishuk 
Authored: Tue Oct 6 15:16:15 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 15:16:15 2015 +0300

--
 .../core/providers/system.py| 24 +---
 .../core/resources/system.py|  1 -
 .../server/state/stack/LatestRepoCallable.java  |  5 ++--
 3 files changed, 4 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b3955b7/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/system.py 
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index d53779c..a3b01f0 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -149,11 +149,7 @@ class DirectoryProvider(Provider):
   Logger.info("Following the link {0} to {1} to create the 
directory".format(self.resource.path, path))
 
   if self.resource.recursive:
-if self.resource.recursive_permission:
-  DirectoryProvider.makedirs_and_set_permission_recursively(path, 
self.resource.owner,
-
self.resource.group, self.resource.mode)
-else:
-  sudo.makedirs(path, self.resource.mode or 0755)
+sudo.makedirs(path, self.resource.mode or 0755)
   else:
 dirname = os.path.dirname(path)
 if not sudo.path_isdir(dirname):
@@ -167,24 +163,6 @@ class DirectoryProvider(Provider):
 _ensure_metadata(path, self.resource.owner, self.resource.group,
 mode=self.resource.mode, 
cd_access=self.resource.cd_access)
 
-  @staticmethod
-  def makedirs_and_set_permission_recursively(path, owner, group, mode):
-folders = []
-path, folder = os.path.split(path)
-while folder != "":
-  folders.append(folder)
-  path, folder = os.path.split(path)
-if path != "":
-  folders.append(path)
-
-folders.reverse()
-dir_prefix = ""
-for folder in folders:
-  dir_prefix = os.path.join(dir_prefix, folder)
-  if not sudo.path_exists(dir_prefix):
-sudo.makedir(dir_prefix, mode or 0755)
-_ensure_metadata(dir_prefix, None, None, mode)
-
   def action_delete(self):
 path = self.resource.path
 if sudo.path_exists(path):

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b3955b7/ambari-common/src/main/python/resource_management/core/resources/system.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/resources/system.py 
b/ambari-common/src/main/python/resource_management/core/resources/system.py
index f74e258..83abc64 100644
--- a/ambari-common/src/main/python/resource_management/core/resources/system.py
+++ b/ambari-common/src/main/python/resource_management/core/resources/system.py
@@ -60,7 +60,6 @@ class Directory(Resource):
   group = ResourceArgument()
   follow = BooleanArgument(default=True) # follow links?
   recursive = BooleanArgument(default=False) # this work for 'create', 
'delete' is anyway recursive
-  recursive_permission = BooleanArgument(default=False) # sets given perms to 
all non-existent folders which are created recursively
   """
   Grants x-bit for all the folders up-to the directory
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b3955b7/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index cd7d229..0ad24fe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -90,8 +90,9 @@ public class LatestRepoCallable implements Callable {
 }
   }
 } catch (Exception e) {
-  LOG.error("Could not load the URI for stack " + stack.getName() + "-" +
-

[1/2] ambari git commit: AMBARI-13322. Should not log "unable to get latest URL" as ERROR (aonishuk)

2015-10-06 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 8692e32aa -> 9b3955b74
  refs/heads/trunk 815c5caaa -> ebccd7224


AMBARI-13322. Should not log "unable to get latest URL" as ERROR (aonishuk)


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

Branch: refs/heads/trunk
Commit: ebccd7224d53ce4178c57cb0fa6379d6a6470c3b
Parents: 815c5ca
Author: Andrew Onishuk 
Authored: Tue Oct 6 15:16:13 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 15:16:13 2015 +0300

--
 .../core/providers/system.py| 24 +---
 .../core/resources/system.py|  1 -
 .../server/state/stack/LatestRepoCallable.java  |  5 ++--
 3 files changed, 4 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ebccd722/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/system.py 
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index d53779c..a3b01f0 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -149,11 +149,7 @@ class DirectoryProvider(Provider):
   Logger.info("Following the link {0} to {1} to create the 
directory".format(self.resource.path, path))
 
   if self.resource.recursive:
-if self.resource.recursive_permission:
-  DirectoryProvider.makedirs_and_set_permission_recursively(path, 
self.resource.owner,
-
self.resource.group, self.resource.mode)
-else:
-  sudo.makedirs(path, self.resource.mode or 0755)
+sudo.makedirs(path, self.resource.mode or 0755)
   else:
 dirname = os.path.dirname(path)
 if not sudo.path_isdir(dirname):
@@ -167,24 +163,6 @@ class DirectoryProvider(Provider):
 _ensure_metadata(path, self.resource.owner, self.resource.group,
 mode=self.resource.mode, 
cd_access=self.resource.cd_access)
 
-  @staticmethod
-  def makedirs_and_set_permission_recursively(path, owner, group, mode):
-folders = []
-path, folder = os.path.split(path)
-while folder != "":
-  folders.append(folder)
-  path, folder = os.path.split(path)
-if path != "":
-  folders.append(path)
-
-folders.reverse()
-dir_prefix = ""
-for folder in folders:
-  dir_prefix = os.path.join(dir_prefix, folder)
-  if not sudo.path_exists(dir_prefix):
-sudo.makedir(dir_prefix, mode or 0755)
-_ensure_metadata(dir_prefix, None, None, mode)
-
   def action_delete(self):
 path = self.resource.path
 if sudo.path_exists(path):

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebccd722/ambari-common/src/main/python/resource_management/core/resources/system.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/resources/system.py 
b/ambari-common/src/main/python/resource_management/core/resources/system.py
index f74e258..83abc64 100644
--- a/ambari-common/src/main/python/resource_management/core/resources/system.py
+++ b/ambari-common/src/main/python/resource_management/core/resources/system.py
@@ -60,7 +60,6 @@ class Directory(Resource):
   group = ResourceArgument()
   follow = BooleanArgument(default=True) # follow links?
   recursive = BooleanArgument(default=False) # this work for 'create', 
'delete' is anyway recursive
-  recursive_permission = BooleanArgument(default=False) # sets given perms to 
all non-existent folders which are created recursively
   """
   Grants x-bit for all the folders up-to the directory
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/ebccd722/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index cd7d229..0ad24fe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -90,8 +90,9 @@ public class LatestRepoCallable implements Callable {
 }
   }

ambari git commit: AMBARI-13323 JDBC connection string for Ranger does not update when changing database option. (ababiichuk)

2015-10-06 Thread ababiichuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk ebccd7224 -> 7ffa43ef5


AMBARI-13323 JDBC connection string for Ranger does not update when changing 
database option. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 7ffa43ef5aafa716f8e4d0f7647d85e4675c9371
Parents: ebccd72
Author: aBabiichuk 
Authored: Tue Oct 6 16:30:44 2015 +0300
Committer: aBabiichuk 
Committed: Tue Oct 6 16:30:44 2015 +0300

--
 ambari-web/app/views/common/controls_view.js | 39 +++
 1 file changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ffa43ef/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 28d3090..085ae11 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -74,13 +74,6 @@ App.ServiceConfigPopoverSupport = Ember.Mixin.create({
 App.SupportsDependentConfigs = Ember.Mixin.create({
 
   /**
-   * do not apply recommended value if user change value by himself.
-   */
-  keyUp: function() {
-
this.get('controller').removeCurrentFromDependentList(this.get('serviceConfig') 
|| this.get('config'));
-  },
-
-  /**
* method send request to check if some of dependent configs was changes
* and in case there was changes shows popup with info about changed configs
*
@@ -91,7 +84,7 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
 if (!config || !config.get('isValid')) return 
$.Deferred().resolve().promise();
 if 
(['mainServiceInfoConfigsController','wizardStep7Controller'].contains(this.get('controller.name')))
 {
   var name = config.get('name');
-  var saveRecommended = (this.get('config.value') === 
this.get('config.recommendedValue'));
+  var saveRecommended = (config.get('value') === 
config.get('recommendedValue'));
   var controller = this.get('controller');
   var type = App.config.getConfigTagFromFileName(config.get('filename'));
   var p = App.StackConfigProperty.find(App.config.configId(name, type));
@@ -172,10 +165,12 @@ App.ServiceConfigTextField = 
Ember.TextField.extend(App.ServiceConfigPopoverSupp
   placeholderBinding: 'serviceConfig.savedValue',
 
   onValueUpdate: function () {
-var self = this;
-delay(function(){
-  self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
-}, 500);
+if ($(this.get('element')).is(':focus')) {
+  var self = this;
+  delay(function(){
+self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
+  }, 500);
+}
   }.observes('serviceConfig.value'),
 
   //Set editDone true for last edited config text field parameter
@@ -213,10 +208,12 @@ App.ServiceConfigTextFieldWithUnit = 
Ember.View.extend(App.ServiceConfigPopoverS
   placeholderBinding: 'serviceConfig.savedValue',
 
   onValueUpdate: function () {
-var self = this;
-delay(function(){
-  self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
-}, 500);
+if ($(this.get('element')).is(':focus')) {
+  var self = this;
+  delay(function(){
+self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
+  }, 500);
+}
   }.observes('serviceConfig.value'),
 
   templateName: 
require('templates/wizard/controls_service_config_textfield_with_unit')
@@ -273,10 +270,12 @@ App.ServiceConfigTextArea = 
Ember.TextArea.extend(App.ServiceConfigPopoverSuppor
 
 
   onValueUpdate: function () {
-var self = this;
-delay(function(){
-  self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
-}, 500);
+if ($(this.get('element')).is(':focus')) {
+  var self = this;
+  delay(function(){
+self.sendRequestRorDependentConfigs(self.get('serviceConfig'));
+  }, 500);
+}
   }.observes('serviceConfig.value'),
 
   valueBinding: 'serviceConfig.value',

[2/2] ambari git commit: AMBARI-13321. Oozie Alert Fails In Kerberized Environment That Is Not SSL (aonishuk)

2015-10-06 Thread aonishuk 
AMBARI-13321. Oozie Alert Fails In Kerberized Environment That Is Not SSL 
(aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 8692e32aa403c0435e120b663ed3f02f050d2ceb
Parents: 43155ad
Author: Andrew Onishuk 
Authored: Tue Oct 6 14:12:26 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 6 14:12:26 2015 +0300

--
 .../package/alerts/alert_check_oozie_server.py  | 72 +---
 1 file changed, 34 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8692e32a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
index c3143c6..764473e 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
@@ -43,28 +43,26 @@ KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}
 
 OOZIE_URL_KEY = '{{oozie-site/oozie.base.url}}'
 SECURITY_ENABLED = '{{cluster-env/security_enabled}}'
-OOZIE_PRINCIPAL = '{{cluster-env/smokeuser_principal_name}}'
-OOZIE_KEYTAB = '{{cluster-env/smokeuser_keytab}}'
 OOZIE_USER = '{{oozie-env/oozie_user}}'
 OOZIE_CONF_DIR = '/usr/hdp/current/oozie-server/conf'
 OOZIE_CONF_DIR_LEGACY = '/etc/oozie/conf'
 OOZIE_HTTPS_PORT = '{{oozie-site/oozie.https.port}}'
 OOZIE_ENV_CONTENT = '{{oozie-env/content}}'
 
-SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
-SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
-SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
+USER_KEYTAB_KEY = 
'{{oozie-site/oozie.service.HadoopAccessorService.keytab.file}}'
+USER_PRINCIPAL_KEY = 
'{{oozie-site/oozie.service.HadoopAccessorService.kerberos.principal}}'
+USER_KEY = '{{oozie-env/oozie_user}}'
 
 # default keytab location
-SMOKEUSER_KEYTAB_SCRIPT_PARAM_KEY = 'default.smoke.keytab'
-SMOKEUSER_KEYTAB_DEFAULT = '/etc/security/keytabs/smokeuser.headless.keytab'
+USER_KEYTAB_SCRIPT_PARAM_KEY = 'default.oozie.keytab'
+USER_KEYTAB_DEFAULT = '/etc/security/keytabs/oozie.headless.keytab'
 
-# default smoke principal
-SMOKEUSER_PRINCIPAL_SCRIPT_PARAM_KEY = 'default.smoke.principal'
-SMOKEUSER_PRINCIPAL_DEFAULT = 'ambari...@example.com'
+# default user principal
+USER_PRINCIPAL_SCRIPT_PARAM_KEY = 'default.oozie.principal'
+USER_PRINCIPAL_DEFAULT = 'oo...@example.com'
 
-# default smoke user
-SMOKEUSER_DEFAULT = 'ambari-qa'
+# default user
+USER_DEFAULT = 'oozie'
 
 class KerberosPropertiesNotFound(Exception): pass
 
@@ -82,8 +80,8 @@ def get_tokens():
   Returns a tuple of tokens in the format {{site/property}} that will be used
   to build the dictionary passed into execute
   """
-  return (OOZIE_URL_KEY, SMOKEUSER_PRINCIPAL_KEY, SECURITY_ENABLED, 
SMOKEUSER_KEYTAB_KEY, KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY,
-  SMOKEUSER_KEY, OOZIE_HTTPS_PORT, OOZIE_ENV_CONTENT)
+  return (OOZIE_URL_KEY, USER_PRINCIPAL_KEY, SECURITY_ENABLED, 
USER_KEYTAB_KEY, KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY,
+  USER_KEY, OOZIE_HTTPS_PORT, OOZIE_ENV_CONTENT)
 
 @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
 def get_check_command(oozie_url, host_name, configurations):
@@ -98,9 +96,9 @@ def get_check_command(oozie_url, host_name, configurations):
 def get_check_command(oozie_url, host_name, configurations, parameters):
   kerberos_env = None
 
-  smokeuser = SMOKEUSER_DEFAULT
-  if SMOKEUSER_KEY in configurations:
-smokeuser = configurations[SMOKEUSER_KEY]
+  user = USER_DEFAULT
+  if USER_KEY in configurations:
+user = configurations[USER_KEY]
 
   security_enabled = False
   if SECURITY_ENABLED in configurations:
@@ -108,20 +106,22 @@ def get_check_command(oozie_url, host_name, 
configurations, parameters):
 
   if security_enabled:
 # defaults
-smokeuser_keytab = SMOKEUSER_KEYTAB_DEFAULT
-smokeuser_principal = SMOKEUSER_PRINCIPAL_DEFAULT
+user_keytab = USER_KEYTAB_DEFAULT
+user_principal = USER_PRINCIPAL_DEFAULT
 
 # check script params
-if SMOKEUSER_PRINCIPAL_SCRIPT_PARAM_KEY in parameters:
-  smokeuser_principal = parameters[SMOKEUSER_PRINCIPAL_SCRIPT_PARAM_KEY]
-if SMOKEUSER_KEYTAB_SCRIPT_PARAM_KEY in parameters:
-

ambari git commit: AMBARI-13211. Host checks does not report all errors in the very first check after Ambari Agent gets installed/registered.

2015-10-06 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk 7ffa43ef5 -> 0d676b323


AMBARI-13211. Host checks does not report all errors in the very first check 
after Ambari Agent gets installed/registered.


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

Branch: refs/heads/trunk
Commit: 0d676b3234a5f31c5b11d6b52e6648e44b39e09d
Parents: 7ffa43e
Author: Alex Antonenko 
Authored: Tue Oct 6 20:17:20 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Oct 6 20:17:29 2015 +0300

--
 .../custom_actions/scripts/check_host.py|   2 +-
 .../app/controllers/wizard/step3_controller.js  | 303 +++-
 .../test/controllers/wizard/step3_test.js   | 488 +++
 3 files changed, 790 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d676b32/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 6f9a66c..8b49725 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -448,7 +448,7 @@ class CheckHost(Script):
 print "Last Agent Env check started."
 hostInfo = HostInfo()
 last_agent_env_check_structured_output = { }
-hostInfo.register(last_agent_env_check_structured_output)
+hostInfo.register(last_agent_env_check_structured_output, False, False)
 print "Last Agent Env check completed successfully."
 
 return last_agent_env_check_structured_output

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d676b32/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js 
b/ambari-web/app/controllers/wizard/step3_controller.js
index 054a364..b3645e9 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -71,6 +71,8 @@ App.WizardStep3Controller = 
Em.Controller.extend(App.ReloadPopupMixin, {
 
   registrationStartedAt: null,
 
+  hostCheckResult: null,
+
   requestId: 0,
 
   /**
@@ -1081,6 +1083,13 @@ App.WizardStep3Controller = 
Em.Controller.extend(App.ReloadPopupMixin, {
 installedPackages: installed_packages ? installed_packages : []
   };
 }));
+
+console.log("Host check result available");
+this.set("hostCheckResult", data); //store the data so that it can be 
used later on in the getHostInfo handling logic.
+/**
+ * Still need to get host info for checks that the host check does not 
perform currently
+ * Such as the OS type check and the disk space check
+ * */
 this.getHostInfo();
   } else if (data.Requests.inputs.indexOf("host_resolution_check") != -1) {
 this.parseHostNameResolution(data);
@@ -1091,6 +1100,288 @@ App.WizardStep3Controller = 
Em.Controller.extend(App.ReloadPopupMixin, {
 }
   },
 
+  parseHostCheckWarnings: function (data) {
+data = App.get('testMode') ? data : this.filterHostsData(data);
+var warnings = [];
+var warning;
+var hosts = [];
+var warningCategories = {
+  fileFoldersWarnings: {},
+  packagesWarnings: {},
+  processesWarnings: {},
+  servicesWarnings: {},
+  usersWarnings: {},
+  alternativeWarnings: {}
+};
+
+var hostsPackagesData = this.get('hostsPackagesData');
+data.tasks.sortPropertyLight('Tasks.host_name').forEach(function (_task) {
+  var hostName = _task.Tasks.host_name;
+  var host = {
+name: hostName,
+warnings: []
+  };
+
+  if (!_task.Tasks.structured_out || 
!_task.Tasks.structured_out.last_agent_env_check) {
+console.log("last_agent_env is missing for " + hostName + ".  Skipping 
host check.");
+return;
+  }
+
+  var lastAgentEnvCheck = _task.Tasks.structured_out.last_agent_env_check;
+
+  //parse all directories and files warnings for host
+  var stackFoldersAndFiles = lastAgentEnvCheck.stackFoldersAndFiles || [];
+  stackFoldersAndFiles.forEach(function (path) {
+warning = warningCategories.fileFoldersWarnings[path.name];
+if (warning) {
+  warning.hosts.push(hostName);
+  warning.hostsLong.push(hostName);
+  warning.onSingleHost = false;
+} else {
+