[ambari] branch trunk updated: [AMBARI-25202] recoverHost operation fails if public hostname is different from actual hostname (apappu)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 1b3fa75  [AMBARI-25202] recoverHost operation fails if public hostname 
is different from actual hostname (apappu)
1b3fa75 is described below

commit 1b3fa75130c8a85a652ca69c5df4a850f0ca65b4
Author: AMARNATH REDDY 
AuthorDate: Tue Mar 19 13:26:50 2019 -0700

[AMBARI-25202] recoverHost operation fails if public hostname is different 
from actual hostname (apappu)
---
 ambari-web/app/controllers/main/host/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 46d9229..45cd669 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -3107,7 +3107,7 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   
   recoverHost: function() {
 var components = this.get('content.hostComponents');
-var hostName = this.get('content.publicHostName');
+var hostName = this.get('content.hostName');
 var self = this;
 var batches = [
   {

[ambari] branch branch-2.7 updated: [AMBARI-25202] recoverHost operation fails if public hostname is different from actual hostname (apappu)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 79177a7  [AMBARI-25202] recoverHost operation fails if public hostname 
is different from actual hostname (apappu)
79177a7 is described below

commit 79177a763d3f5798fc709fd466a16aa134dddeea
Author: AMARNATH REDDY 
AuthorDate: Tue Mar 19 13:32:40 2019 -0700

[AMBARI-25202] recoverHost operation fails if public hostname is different 
from actual hostname (apappu)
---
 ambari-web/app/controllers/main/host/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 0c02add..5f99ceb 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -3098,7 +3098,7 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   
   recoverHost: function() {
 var components = this.get('content.hostComponents');
-var hostName = this.get('content.publicHostName');
+var hostName = this.get('content.hostName');
 var self = this;
 var batches = [
   {

[ambari-metrics] 01/01: Merge pull request #11 from ishanbha/AMBARI-24910-master

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git

commit c7dcf2b25241e2cfe6931d6261a43be97e0deaba
Merge: c8cb5d8 7001858
Author: Ishan Bhatt 
AuthorDate: Fri Nov 16 10:47:49 2018 -0800

Merge pull request #11 from ishanbha/AMBARI-24910-master

[AMBARI-24910] Grafana: Fix for Storm Components and Storm Kafka Offse…

 ambari-metrics-grafana/ambari-metrics/datasource.js | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[ambari-metrics] branch master updated (c8cb5d8 -> c7dcf2b)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git.


from c8cb5d8  Merge pull request #10 from ishanbha/AMBARI-24898-master
 add 7001858  [AMBARI-2491] Grafana: Fix for Storm Components and Storm 
Kafka Offset dashboards.
 new c7dcf2b  Merge pull request #11 from ishanbha/AMBARI-24910-master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-metrics-grafana/ambari-metrics/datasource.js | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[ambari-metrics] branch master updated (edddf54 -> c8cb5d8)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git.


from edddf54  Merge pull request #9 from ishanbha/AMBARI-24884-master
 add 881d4d1  [AMBARI-24898] Add cluster drop down to Grafana aggregate 
dashboards.
 new c8cb5d8  Merge pull request #10 from ishanbha/AMBARI-24898-master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari-metrics/datasource.js   | 23 +-
 1 file changed, 9 insertions(+), 14 deletions(-)

[ambari-metrics] 01/01: Merge pull request #10 from ishanbha/AMBARI-24898-master

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git

commit c8cb5d813e4c3dcd952dcf8cc9d6d186ca7a200d
Merge: edddf54 881d4d1
Author: Ishan Bhatt 
AuthorDate: Wed Nov 14 15:26:41 2018 -0800

Merge pull request #10 from ishanbha/AMBARI-24898-master

[AMBARI-24898] Add cluster drop down to Grafana aggregate dashboards.

 .../ambari-metrics/datasource.js   | 23 +-
 1 file changed, 9 insertions(+), 14 deletions(-)

[ambari-metrics] branch master updated (7b39d55 -> edddf54)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git.


from 7b39d55  Merge pull request #6 from ishanbha/AMBARI-24738-master
 add 63eb69f  [AMBARI-24884] Grafana New dashboard edit errors.
 add ff1141a  some code cleaning
 new edddf54  Merge pull request #9 from ishanbha/AMBARI-24884-master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari-metrics/query_ctrl.js   | 144 +++--
 .../ambari-metrics/query_ctrl.ts   | 100 +++---
 2 files changed, 126 insertions(+), 118 deletions(-)

[ambari-metrics] 01/01: Merge pull request #9 from ishanbha/AMBARI-24884-master

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git

commit edddf54553077c8b69236035453756684ea3fb84
Merge: 7b39d55 ff1141a
Author: Ishan Bhatt 
AuthorDate: Wed Nov 14 11:07:39 2018 -0800

Merge pull request #9 from ishanbha/AMBARI-24884-master

[AMBARI-24884] AMS Grafana query editor panel does not work in upgraded 
version.

 .../ambari-metrics/query_ctrl.js   | 144 +++--
 .../ambari-metrics/query_ctrl.ts   | 100 +++---
 2 files changed, 126 insertions(+), 118 deletions(-)

[ambari] branch trunk updated: [AMBARI-24836] Service Auto start is enabled after page refresh

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new ad36582  [AMBARI-24836] Service Auto start is enabled after page 
refresh
ad36582 is described below

commit ad3658288c795a49bef612059e7fa8b5bcd1245f
Author: Ishan Bhatt 
AuthorDate: Wed Nov 7 13:42:17 2018 -0800

[AMBARI-24836] Service Auto start is enabled after page refresh
---
 .../app/controllers/main/admin/service_auto_start.js| 17 +++--
 .../controllers/main/admin/service_auto_start_test.js   |  4 
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js 
b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 4338f4c..1eb4cc7 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -116,14 +116,19 @@ App.MainAdminServiceAutoStartController = 
Em.Controller.extend({
   },
 
   load: function() {
-
App.router.get('configurationController').getCurrentConfigsBySites(['cluster-env']).done((data)
 => {
-  this.set('clusterConfigs', data[0].properties);
-  this.set('isGeneralRecoveryEnabled', data[0].properties.recovery_enabled 
=== 'true');
-  this.set('isGeneralRecoveryEnabledCached', 
this.get('isGeneralRecoveryEnabled'));
-  this.loadComponentsConfigs().then(() => {
-this.set('isLoaded', true);
+const self = this;
+const clusterConfigController = App.router.get('configurationController');
+clusterConfigController.updateConfigTags().always(function () {
+  
clusterConfigController.getCurrentConfigsBySites(['cluster-env']).done((data) 
=> {
+self.set('clusterConfigs', data[0].properties);
+self.set('isGeneralRecoveryEnabled', 
data[0].properties.recovery_enabled === 'true');
+self.set('isGeneralRecoveryEnabledCached', 
self.get('isGeneralRecoveryEnabled'));
+self.loadComponentsConfigs().then(() => {
+  self.set('isLoaded', true);
+});
   });
 });
+
   },
 
   loadComponentsConfigs: function () {
diff --git a/ambari-web/test/controllers/main/admin/service_auto_start_test.js 
b/ambari-web/test/controllers/main/admin/service_auto_start_test.js
index e79271d..5e8983e 100644
--- a/ambari-web/test/controllers/main/admin/service_auto_start_test.js
+++ b/ambari-web/test/controllers/main/admin/service_auto_start_test.js
@@ -92,6 +92,9 @@ describe('App.MainAdminServiceAutoStartController', 
function() {
   ]);
 }
   });
+  sinon.stub(App.router.get('configurationController'), 
'updateConfigTags').returns({
+always: Em.clb
+  });
   sinon.stub(controller, 'loadComponentsConfigs').returns({
 then: Em.clb
   });
@@ -99,6 +102,7 @@ describe('App.MainAdminServiceAutoStartController', 
function() {
 });
 afterEach(function() {
   
App.router.get('configurationController').getCurrentConfigsBySites.restore();
+  App.router.get('configurationController').updateConfigTags.restore();
   controller.loadComponentsConfigs.restore();
 });
 

[ambari] branch branch-2.7 updated: [AMBARI-24836] Service Auto start is enabled after page refresh

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 6354fb8  [AMBARI-24836] Service Auto start is enabled after page 
refresh
6354fb8 is described below

commit 6354fb8fdf6fb424a9ca1e1ae37aff26d2eaf508
Author: Ishan Bhatt 
AuthorDate: Wed Nov 7 13:42:17 2018 -0800

[AMBARI-24836] Service Auto start is enabled after page refresh
---
 .../app/controllers/main/admin/service_auto_start.js| 17 +++--
 .../controllers/main/admin/service_auto_start_test.js   |  4 
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js 
b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 82b9258..6809cd7 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -113,14 +113,19 @@ App.MainAdminServiceAutoStartController = 
Em.Controller.extend({
   },
 
   load: function() {
-
App.router.get('configurationController').getCurrentConfigsBySites(['cluster-env']).done((data)
 => {
-  this.set('clusterConfigs', data[0].properties);
-  this.set('isGeneralRecoveryEnabled', data[0].properties.recovery_enabled 
=== 'true');
-  this.set('isGeneralRecoveryEnabledCached', 
this.get('isGeneralRecoveryEnabled'));
-  this.loadComponentsConfigs().then(() => {
-this.set('isLoaded', true);
+const self = this;
+const clusterConfigController = App.router.get('configurationController');
+clusterConfigController.updateConfigTags().always(function () {
+  
clusterConfigController.getCurrentConfigsBySites(['cluster-env']).done((data) 
=> {
+self.set('clusterConfigs', data[0].properties);
+self.set('isGeneralRecoveryEnabled', 
data[0].properties.recovery_enabled === 'true');
+self.set('isGeneralRecoveryEnabledCached', 
self.get('isGeneralRecoveryEnabled'));
+self.loadComponentsConfigs().then(() => {
+  self.set('isLoaded', true);
+});
   });
 });
+
   },
 
   loadComponentsConfigs: function () {
diff --git a/ambari-web/test/controllers/main/admin/service_auto_start_test.js 
b/ambari-web/test/controllers/main/admin/service_auto_start_test.js
index 248bf44..6965cd3 100644
--- a/ambari-web/test/controllers/main/admin/service_auto_start_test.js
+++ b/ambari-web/test/controllers/main/admin/service_auto_start_test.js
@@ -80,6 +80,9 @@ describe('App.MainAdminServiceAutoStartController', 
function() {
   ]);
 }
   });
+  sinon.stub(App.router.get('configurationController'), 
'updateConfigTags').returns({
+always: Em.clb
+  });
   sinon.stub(controller, 'loadComponentsConfigs').returns({
 then: Em.clb
   });
@@ -87,6 +90,7 @@ describe('App.MainAdminServiceAutoStartController', 
function() {
 });
 afterEach(function() {
   
App.router.get('configurationController').getCurrentConfigsBySites.restore();
+  App.router.get('configurationController').updateConfigTags.restore();
   controller.loadComponentsConfigs.restore();
 });
 

[ambari] branch trunk updated: [AMBARI-24857] UI Changes for supporting Ozone deployment. (#2570)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 7e39765  [AMBARI-24857] UI Changes for supporting Ozone deployment. 
(#2570)
7e39765 is described below

commit 7e39765aec2df9030d3a970f58b0d53c6c2d0254
Author: Ishan Bhatt 
AuthorDate: Mon Nov 5 07:56:43 2018 -0800

[AMBARI-24857] UI Changes for supporting Ozone deployment. (#2570)

* [AMBARI-24857] UI Changes for supporting Ozone deployment.

* minor code fix

* Minor code fix

* Minor code fix

* Minor code fix
---
 .../app/controllers/wizard/step4_controller.js | 41 +-
 .../app/controllers/wizard/step6_controller.js |  5 ++-
 ambari-web/app/models/stack_service.js | 17 -
 ambari-web/app/views/main/host/summary.js  |  3 ++
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index 767147d..e2fc90b 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -59,11 +59,27 @@ App.WizardStep4Controller = Em.ArrayController.extend({
*/
   errorStack: [],
 
+  isAddServiceWizard: Em.computed.equal('content.controllerName', 
'addServiceController'),
+
+  isOzoneInstalled: function() {
+let isOzone = this.findProperty('serviceName', 'OZONE');
+return isOzone && isOzone.get('isInstalled');
+  }.property('@each.isInstalled'),
+
   /**
* Services which are HDFS compatible
*/
   fileSystems: function() {
-var fileSystems = this.filterProperty('isDFS', true);;
+let fileSystems = [];
+const self = this;
+this.filterProperty('isDFS', true).forEach((fs) => {
+  if (self.get('isAddServiceWizard') && self.get('isOzoneInstalled') &&
+fs.get('serviceName') === 'HDFS') {
+return;
+  }
+  fileSystems.push(fs);
+});
+
 return fileSystems.map(function(fs) {
   return App.FileSystem.create({content: fs, services: fileSystems});
 });
@@ -318,7 +334,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
*/
   isDFSStack: function () {
  var bDFSStack = false;
-var dfsServices = ['HDFS', 'GLUSTERFS'];
+var dfsServices = ['HDFS', 'GLUSTERFS', 'OZONE'];
 var availableServices = this.filterProperty('isInstalled',false);
 availableServices.forEach(function(service){
   if (dfsServices.contains(service.get('serviceName')) || 
service.get('serviceType') == 'HCFS' ) {
@@ -335,12 +351,26 @@ App.WizardStep4Controller = Em.ArrayController.extend({
*/
   fileSystemServiceValidation: function(callback) {
 if(this.isDFSStack()){
+  const self = this;
   var primaryDFS = this.findProperty('isPrimaryDFS',true);
   if (primaryDFS) {
 var primaryDfsDisplayName = 
primaryDFS.get('displayNameOnSelectServicePage');
 var primaryDfsServiceName = primaryDFS.get('serviceName');
+//if multiple DFS are not selected, remove the related error from the 
error array
+let removeFsError = function () {
+  let fsError = 
self.get('errorStack').findProperty('id',"multipleDFS");
+  if(fsError)
+  {
+self.get('errorStack').removeObject(fsError);
+  }
+};
 if (this.multipleDFSs()) {
   var dfsServices = 
this.filterProperty('isDFS',true).filterProperty('isSelected',true).mapProperty('serviceName');
+  //special case for HDFS and OZONE
+  if (dfsServices.length === 2 && dfsServices.includes('HDFS') && 
dfsServices.includes('OZONE')) {
+removeFsError();
+return;
+  }
   var services = dfsServices.map(function (item){
 return {
   serviceName: item,
@@ -355,12 +385,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
 }
 else
 {
-  //if multiple DFS are not selected, remove the related error from 
the error array
-  var fsError = 
this.get('errorStack').filterProperty('id',"multipleDFS");
-  if(fsError)
-  {
- this.get('errorStack').removeObject(fsError[0]);
-  }
+  removeFsError();
 }
   }
 }
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js 
b/ambari-web/app/controllers/wizard/step6_controller.js
index eb3e2cf..5952ed7 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -302,9 +302,11 @@ App.WizardStep6Controller = 
Em.Controller.extend(App.HostComponentValidationMixi
 else if (this.get('isAddServiceWizard')) services = 
installedServices.co

[ambari-metrics] 01/01: Merge pull request #6 from ishanbha/AMBARI-24738-master

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git

commit 7b39d559930e19bac900936ccdef3ee4f7732d39
Merge: d9b7935 759d25b
Author: Ishan Bhatt 
AuthorDate: Thu Nov 1 13:15:22 2018 -0700

Merge pull request #6 from ishanbha/AMBARI-24738-master

[AMBARI-24738] Update grafana datasource to get values from new object.

 .../ambari-metrics/datasource.js   | 99 +-
 .../ambari-metrics/query_ctrl.js   |  2 +-
 2 files changed, 59 insertions(+), 42 deletions(-)

[ambari-metrics] branch master updated (d9b7935 -> 7b39d55)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git.


from d9b7935  [AMBARI-24797] Support regex based metric inclusion in 
KafkaTimelineMetricsReporter. (#8)
 add 4d0a0d0  [AMBARI-24738] Update grafana datasource to get values from 
new object.
 add 759d25b  Minor fix for new dashbboard column errors
 new 7b39d55  Merge pull request #6 from ishanbha/AMBARI-24738-master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari-metrics/datasource.js   | 99 +-
 .../ambari-metrics/query_ctrl.js   |  2 +-
 2 files changed, 59 insertions(+), 42 deletions(-)

[ambari] branch trunk updated: [AMBARI-24834] UI: Configure Rolling Restart Batch Options for service rolling restart.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 99e14e9  [AMBARI-24834] UI: Configure Rolling Restart Batch Options 
for service rolling restart.
99e14e9 is described below

commit 99e14e98ec5d3744f6ea8dba6a4ba2a9f7d26d63
Author: Ishan Bhatt 
AuthorDate: Fri Oct 26 06:40:58 2018 -0700

[AMBARI-24834] UI: Configure Rolling Restart Batch Options for service 
rolling restart.
---
 ambari-web/app/controllers/main/service/item.js|   4 +-
 ambari-web/app/utils/batch_scheduled_requests.js   | 123 +++--
 .../app/views/common/service_restart_view.js   |  21 +++-
 3 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index a900edb..dec779d 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -970,7 +970,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 batchUtils.showServiceRestartPopup(this.get('content.serviceName'), 
this.getMastersForRestart.bind(this), this.getSlavesForRestart.bind(this));
   },
   restartServiceMastersOnly: function () {
-batchUtils.showServiceRestartPopup(this.get('content.serviceName'), 
this.getMastersForRestart.bind(this));
+batchUtils.showServiceRestartPopup(this.get('content.serviceName'), 
this.getMastersForRestart.bind(this), null);
   },
 
   restartServiceSlavesOnly: function () {
@@ -1058,7 +1058,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   if (sNameNode) hostCompOrdered.push(sNameNode);
 
   //Add NameNode
-  const namenode = hdfsService.get('namenode') || 
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE');
+  const namenode = hdfsService.get('namenode') || 
App.HostComponent.find().findProperty('componentName', 'NAMENODE');
   if (namenode) hostCompOrdered.push(namenode);
 }
 return hostCompOrdered;
diff --git a/ambari-web/app/utils/batch_scheduled_requests.js 
b/ambari-web/app/utils/batch_scheduled_requests.js
index f9948eb..a9ffaa9 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -351,14 +351,14 @@ module.exports = {
* @param {Number} batchSize size of each batch
* @returns {Array} list of batches
*/
-  getBatchesForRollingRestartRequest: function(restartHostComponents, 
batchSize) {
+  getBatchesForRollingRestartRequest: function(restartHostComponents, 
batchSize, previousOrderId) {
 var hostIndex = 0,
 batches = [],
 batchCount = Math.ceil(restartHostComponents.length / batchSize),
 sampleHostComponent = restartHostComponents.objectAt(0),
 componentName = sampleHostComponent.get('componentName'),
-serviceName = sampleHostComponent.get('serviceName');
-
+serviceName = sampleHostComponent.get('serviceName') || 
sampleHostComponent.get('service.serviceName');
+previousOrderId = previousOrderId || 0;
 for ( var count = 0; count < batchCount; count++) {
   var hostNames = [];
   for ( var hc = 0; hc < batchSize && hostIndex < 
restartHostComponents.length; hc++) {
@@ -366,7 +366,7 @@ module.exports = {
   }
   if (hostNames.length) {
 batches.push({
-  "order_id" : count + 1,
+  "order_id" : previousOrderId + count + 1,
   "type" : "POST",
   "uri" : "/clusters/" + App.get('clusterName') + "/requests",
   "RequestBodyInfo" : {
@@ -508,25 +508,75 @@ module.exports = {
   showServiceRestartPopup: function (serviceName, mastersForRestart, 
workersForRestart) {
 
 let self = this;
-const isRestartAll = !!(mastersForRestart && workersForRestart);
-const isMastersOnly = !!(mastersForRestart && !workersForRestart);
-const isSlavesOnly = !!(!mastersForRestart && workersForRestart);
+
+let viewExtend = {
+
+  masterComponents: undefined,
+
+  slaveComponents: undefined,
+
+  didInsertElement: function() {
+this.set('parentView.innerView', this);
+if (mastersForRestart) this.set('masterComponents', 
mastersForRestart(serviceName));
+if (workersForRestart) {
+  this.set('slaveComponents', workersForRestart(serviceName));
+  this.set('componentHostRackInfoMap', this.componentHostRackInfo());
+}
+this.initDefaultConfigs();
+  },
+
+  componentHostRackInfo: function () {
+const slaveComponents = this.get('slaveComponents');
+const componentNames = 
slaveComponents.mapProperty('componentName').uniq();
+ 

[ambari] branch trunk updated: [AMBARI-24803] Separating Restart All, Masters and Slaves.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 6ea9747  [AMBARI-24803] Separating Restart All, Masters and Slaves.
6ea9747 is described below

commit 6ea9747908c20d9fcdbacbc7151fbbf4d1788683
Author: Ishan Bhatt 
AuthorDate: Thu Oct 18 05:59:46 2018 -0700

[AMBARI-24803] Separating Restart All, Masters and Slaves.
---
 ambari-web/app/controllers/main/service/item.js|  58 +---
 ambari-web/app/messages.js |   2 +-
 ambari-web/app/models/host_component.js|   6 +-
 .../app/templates/common/service_restart.hbs   |  60 ++--
 ambari-web/app/utils/batch_scheduled_requests.js   | 101 ++---
 .../app/views/common/service_restart_view.js   |   2 +
 6 files changed, 151 insertions(+), 78 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index d615548..a900edb 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -966,16 +966,49 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 }
   },
 
-  chooseAndRestartHostComponents: function () {
-let serviceName = this.get('content.serviceName');
-const mastersForRestart = serviceName === 'HDFS' ? 
this.getMastersForHdfsRestart(): this.getMastersForRestart(serviceName);
-batchUtils.showServiceRestartPopup(serviceName, mastersForRestart);
+  restartServiceAllComponents: function () {
+batchUtils.showServiceRestartPopup(this.get('content.serviceName'), 
this.getMastersForRestart.bind(this), this.getSlavesForRestart.bind(this));
   },
+  restartServiceMastersOnly: function () {
+batchUtils.showServiceRestartPopup(this.get('content.serviceName'), 
this.getMastersForRestart.bind(this));
+  },
+
+  restartServiceSlavesOnly: function () {
+batchUtils.showServiceRestartPopup(this.get('content.serviceName'), null, 
this.getSlavesForRestart.bind(this));
+  },
+
+  restartOptions: [
+Em.Object.create({
+  action: 'restartServiceAllComponents',
+  context: {
+label: 'Restart All',
+name: 'RESTART_ALL'
+  }
+}),
+Em.Object.create({
+  action: 'restartServiceMastersOnly',
+  context: {
+label: 'Restart Masters',
+name: 'RESTART_MASTERS'
+  }
+}),
+Em.Object.create({
+  action: 'restartServiceSlavesOnly',
+  context: {
+label: 'Restart Slaves',
+name: 'RESTART_SLAVES'
+  }
+}),
+  ],
 
   getMastersForRestart: function (serviceName) {
-return this.get('content.hostComponents').filter((component) =>{
-  return component.get('service.serviceName') === serviceName && 
component.get('isMaster');
-});
+if (serviceName === 'HDFS') {
+  return this.getMastersForHdfsRestart();
+} else {
+  return this.get('content.hostComponents').filter((component) => {
+return component.get('service.serviceName') === serviceName && 
component.get('isMaster');
+  });
+}
   },
 
   getMastersForHdfsRestart: function () {
@@ -1020,11 +1053,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 });
   }
 } else {
-
   //Add SNamenode
-  if (!standbyNameNodes.length > 0 && hdfsService.get('snameNode')) {
-hostCompOrdered.push(hdfsService.get('snameNode'));
-  }
   const sNameNode = hdfsService.get('snameNode') || 
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE')
   if (sNameNode) hostCompOrdered.push(sNameNode);
 
@@ -1035,6 +1064,13 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 return hostCompOrdered;
   },
 
+  getSlavesForRestart: function (serviceName) {
+return this.get('content.hostComponents').filter((component) => {
+  return component.get('service.serviceName') === serviceName && 
component.get('isSlave');
+});
+  },
+
+
   restartCertainHostComponents: function (context) {
 const serviceDisplayName = this.get('content.displayName'),
   {components, hosts, label, serviceName} = context;
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 67c45f3..e93c508 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3284,7 +3284,7 @@ Em.I18n.translations = {
   'service.rolling.restart.choose.info': 'Critical services remain running 
while the upgrade is performed. Minimized disruption, but is a slower 
upgrade.',
   'service.express.restart.choose.info': 'Services are stopped when this 
upgrade is performed. Incurs downtime, but is a faster upgrade.',
   'service.restart.show.advanced.info': 'Show advanced configurations options 

[ambari] branch branch-2.7 updated: [AMBARI-24791] Node Managers fail to start after RM is moved to a different host as 'resource-tracker.address' config is not updated.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new c69aa74  [AMBARI-24791] Node Managers fail to start after RM is moved 
to a different host as 'resource-tracker.address' config is not updated.
c69aa74 is described below

commit c69aa741611bfb5bd23bbf4391f6ad75932750a7
Author: Ishan Bhatt 
AuthorDate: Tue Oct 16 15:01:31 2018 -0700

[AMBARI-24791] Node Managers fail to start after RM is moved to a different 
host as 'resource-tracker.address' config is not updated.
---
 .../resourceManager/step3_controller.js|  2 ++
 .../app/data/configs/wizards/rm_ha_properties.js   | 23 +-
 .../utils/configs/move_rm_config_initializer.js|  1 +
 .../app/utils/configs/rm_ha_config_initializer.js  |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
index 179193f..7d6a34a 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
@@ -126,9 +126,11 @@ App.RMHighAvailabilityWizardStep3Controller = 
Em.Controller.extend(App.Blueprint
 var portValue = zooCfg && Em.get(zooCfg, 'properties.clientPort');
 var webAddressPort = yarnSite && yarnSite.properties ? 
yarnSite.properties['yarn.resourcemanager.webapp.address'] : '';
 var httpsWebAddressPort = yarnSite && yarnSite.properties ? yarnSite. 
properties['yarn.resourcemanager.webapp.https.address'] : '';
+const trackerAddressPort = yarnSite && yarnSite.properties ? 
yarnSite.properties['yarn.resourcemanager.resource-tracker.address'] : '';
 
 ret.webAddressPort = webAddressPort && webAddressPort.contains(':') ? 
webAddressPort.split(':')[1] : '8088';
 ret.httpsWebAddressPort = httpsWebAddressPort && 
httpsWebAddressPort.contains(':') ? httpsWebAddressPort.split(':')[1] : '8090';
+ret.trackerAddressPort = trackerAddressPort && 
trackerAddressPort.contains(':') ? trackerAddressPort.split(':')[1]: '8025';
 ret.zkClientPort = portValue ? portValue : '2181';
 return ret;
   },
diff --git a/ambari-web/app/data/configs/wizards/rm_ha_properties.js 
b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
index fb1bd13..a6fc73f 100644
--- a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
+++ b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
@@ -63,7 +63,28 @@ module.exports =
 "filename": "yarn-site",
 serviceName: 'MISC'
   },
-
+  {
+"name": "yarn.resourcemanager.resource-tracker.address.rm1",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm1",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+  },
+  {
+"name": "yarn.resourcemanager.resource-tracker.address.rm2",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm2",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+  },
   {
 "name": "yarn.resourcemanager.webapp.address.rm1",
 "displayName": "yarn.resourcemanager.webapp.address.rm1",
diff --git a/ambari-web/app/utils/configs/move_rm_config_initializer.js 
b/ambari-web/app/utils/configs/move_rm_config_initializer.js
index 5388224..120185e 100644
--- a/ambari-web/app/utils/configs/move_rm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_rm_config_initializer.js
@@ -57,6 +57,7 @@ App.MoveRmConfigInitializer = 
App.MoveComponentConfigInitializerClass.create({
 'yarn.resourcemanager.hostname.{{suffix}}': getRmHaDependedConfig(true),
 'yarn.resourcemanager.webapp.address.{{suffix}}': 
getRmHaDependedConfig(true),
 'yarn.resourcemanager.webapp.https.address.{{suffix}}': 
getRmHaDependedConfig(true),
+'yarn.resourcemanager.resource-tracker.address.{{suffix}}': 
getRmHaDependedConfig(true),
 'yarn.resourcemanager.ha': getRmHaHawqConfig(true),
 'yarn.resourcemanager.scheduler.ha': ge

[ambari] branch trunk updated: [AMBARI-24791] Node Managers fail to start after RM is moved to a different host as 'resource-tracker.address' config is not updated.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 7110d4d  [AMBARI-24791] Node Managers fail to start after RM is moved 
to a different host as 'resource-tracker.address' config is not updated.
7110d4d is described below

commit 7110d4d965767e1bc98eb79bb12d1d42f65676d4
Author: Ishan Bhatt 
AuthorDate: Tue Oct 16 15:01:31 2018 -0700

[AMBARI-24791] Node Managers fail to start after RM is moved to a different 
host as 'resource-tracker.address' config is not updated.
---
 .../resourceManager/step3_controller.js|  2 ++
 .../app/data/configs/wizards/rm_ha_properties.js   | 23 +-
 .../utils/configs/move_rm_config_initializer.js|  1 +
 .../app/utils/configs/rm_ha_config_initializer.js  |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
index 179193f..7d6a34a 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
@@ -126,9 +126,11 @@ App.RMHighAvailabilityWizardStep3Controller = 
Em.Controller.extend(App.Blueprint
 var portValue = zooCfg && Em.get(zooCfg, 'properties.clientPort');
 var webAddressPort = yarnSite && yarnSite.properties ? 
yarnSite.properties['yarn.resourcemanager.webapp.address'] : '';
 var httpsWebAddressPort = yarnSite && yarnSite.properties ? yarnSite. 
properties['yarn.resourcemanager.webapp.https.address'] : '';
+const trackerAddressPort = yarnSite && yarnSite.properties ? 
yarnSite.properties['yarn.resourcemanager.resource-tracker.address'] : '';
 
 ret.webAddressPort = webAddressPort && webAddressPort.contains(':') ? 
webAddressPort.split(':')[1] : '8088';
 ret.httpsWebAddressPort = httpsWebAddressPort && 
httpsWebAddressPort.contains(':') ? httpsWebAddressPort.split(':')[1] : '8090';
+ret.trackerAddressPort = trackerAddressPort && 
trackerAddressPort.contains(':') ? trackerAddressPort.split(':')[1]: '8025';
 ret.zkClientPort = portValue ? portValue : '2181';
 return ret;
   },
diff --git a/ambari-web/app/data/configs/wizards/rm_ha_properties.js 
b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
index fb1bd13..a6fc73f 100644
--- a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
+++ b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
@@ -63,7 +63,28 @@ module.exports =
 "filename": "yarn-site",
 serviceName: 'MISC'
   },
-
+  {
+"name": "yarn.resourcemanager.resource-tracker.address.rm1",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm1",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+  },
+  {
+"name": "yarn.resourcemanager.resource-tracker.address.rm2",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm2",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+  },
   {
 "name": "yarn.resourcemanager.webapp.address.rm1",
 "displayName": "yarn.resourcemanager.webapp.address.rm1",
diff --git a/ambari-web/app/utils/configs/move_rm_config_initializer.js 
b/ambari-web/app/utils/configs/move_rm_config_initializer.js
index 5388224..120185e 100644
--- a/ambari-web/app/utils/configs/move_rm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_rm_config_initializer.js
@@ -57,6 +57,7 @@ App.MoveRmConfigInitializer = 
App.MoveComponentConfigInitializerClass.create({
 'yarn.resourcemanager.hostname.{{suffix}}': getRmHaDependedConfig(true),
 'yarn.resourcemanager.webapp.address.{{suffix}}': 
getRmHaDependedConfig(true),
 'yarn.resourcemanager.webapp.https.address.{{suffix}}': 
getRmHaDependedConfig(true),
+'yarn.resourcemanager.resource-tracker.address.{{suffix}}': 
getRmHaDependedConfig(true),
 'yarn.resourcemanager.ha': getRmHaHawqConfig(true),
 'yarn.resourcemanager.scheduler.ha': ge

[ambari] branch trunk updated: [AMBARI-24790] Restart Masters for Service Restart.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new b2bbc85  [AMBARI-24790] Restart Masters for Service Restart.
b2bbc85 is described below

commit b2bbc8536b2fd5f3f8a211c53f42b46467810229
Author: Ishan Bhatt 
AuthorDate: Tue Oct 16 09:23:56 2018 -0700

[AMBARI-24790] Restart Masters for Service Restart.
---
 ambari-web/app/controllers/main/service/item.js| 68 +-
 ambari-web/app/utils/batch_scheduled_requests.js   | 58 +-
 .../app/views/common/service_restart_view.js   |  1 -
 3 files changed, 122 insertions(+), 5 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 6fb0522..d615548 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -967,8 +967,72 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   },
 
   chooseAndRestartHostComponents: function () {
-let serviceName = this.get('serviceName');
-batchUtils.showServicRestartPopup(serviceName);
+let serviceName = this.get('content.serviceName');
+const mastersForRestart = serviceName === 'HDFS' ? 
this.getMastersForHdfsRestart(): this.getMastersForRestart(serviceName);
+batchUtils.showServiceRestartPopup(serviceName, mastersForRestart);
+  },
+
+  getMastersForRestart: function (serviceName) {
+return this.get('content.hostComponents').filter((component) =>{
+  return component.get('service.serviceName') === serviceName && 
component.get('isMaster');
+});
+  },
+
+  getMastersForHdfsRestart: function () {
+const self = this;
+let hostCompOrdered = [];
+const hdfsService = App.HDFSService.find().toArray()[0];
+
+if (App.get('isHAEnabled')) {
+  let journalNodes = 
this.get('content.hostComponents').filterProperty('componentName', 
'JOURNALNODE');
+  //Restart journal nodes one by one
+  if (journalNodes && journalNodes.length) {
+journalNodes.forEach((journalNode) => 
hostCompOrdered.push(journalNode));
+  }
+
+  //Restart Standby NN and then Standby ZKFC
+  const standbyNameNodes = hdfsService.get('standbyNameNodes').toArray();
+  if (standbyNameNodes.length > 0) {
+hdfsService.get('standbyNameNodes').forEach(function (snn) {
+  hostCompOrdered.push(snn);
+  const snnHostName = snn.get('hostName');
+  const zkfcForSnn = 
self.get('content.hostComponents').filter((component) => {
+return component.get('componentName') === 'ZKFC' && 
component.get('hostName') === snnHostName;
+  });
+  if (zkfcForSnn) {
+hostCompOrdered.push(zkfcForSnn[0]);
+  }
+});
+  }
+
+  //Restart Active NN and then Active ZKFC
+  const activeNameNodes = hdfsService.get('activeNameNodes').toArray();
+  if (activeNameNodes.length > 0) {
+hdfsService.get('activeNameNodes').forEach(function (ann) {
+  hostCompOrdered.push(ann);
+  const annHostName = ann.get('hostName');
+  const zkfcForAnn = 
self.get('content.hostComponents').filter((component) => {
+return component.get('componentName') === 'ZKFC' && 
component.get('hostName') === annHostName;
+  });
+  if (zkfcForAnn) {
+hostCompOrdered.push(zkfcForAnn[0]);
+  }
+});
+  }
+} else {
+
+  //Add SNamenode
+  if (!standbyNameNodes.length > 0 && hdfsService.get('snameNode')) {
+hostCompOrdered.push(hdfsService.get('snameNode'));
+  }
+  const sNameNode = hdfsService.get('snameNode') || 
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE')
+  if (sNameNode) hostCompOrdered.push(sNameNode);
+
+  //Add NameNode
+  const namenode = hdfsService.get('namenode') || 
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE');
+  if (namenode) hostCompOrdered.push(namenode);
+}
+return hostCompOrdered;
   },
 
   restartCertainHostComponents: function (context) {
diff --git a/ambari-web/app/utils/batch_scheduled_requests.js 
b/ambari-web/app/utils/batch_scheduled_requests.js
index 33173cc..1ab73df 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -500,7 +500,9 @@ module.exports = {
   },
 
 
-  showServicRestartPopup: function (serviceName) {
+  showServiceRestartPopup: function (serviceName, masterComponents, 
slaveComponents) {
+
+let self = this;
 
 App.ModalPopup.show({
   header: Em.I18n.t('common.configure.restart'),
@@ -510,11 +512,63 @@ module.exports = {
   primary: Em.I18n.t('common.restart'),
   p

[ambari] branch branch-2.7 updated: [AMBARI-24779] Move Namenode operation fails as it tries to install and start ZKFailoverController on non-HA cluster.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 6cf4028  [AMBARI-24779] Move Namenode operation fails as it tries to 
install and start ZKFailoverController on non-HA cluster.
6cf4028 is described below

commit 6cf4028dd3cfda495798334b100c9064e2c52f18
Author: Ishan Bhatt 
AuthorDate: Mon Oct 15 10:17:01 2018 -0700

[AMBARI-24779] Move Namenode operation fails as it tries to install and 
start ZKFailoverController on non-HA cluster.
---
 ambari-web/app/controllers/main/service/reassign/step4_controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 21e4f0f..b95e206 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -121,7 +121,8 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 var dependenciesToInstall = App.StackServiceComponent.find(componentName)
 .get('dependencies')
 .filter(function (component) {
-  return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName));
+  return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName))
+&& (componentName === 'NAMENODE' ? App.get('isHaEnabled'): true);
 })
 .mapProperty('componentName');
 this.set('dependentHostComponents', dependenciesToInstall);

[ambari] branch trunk updated: [AMBARI-24779] Move Namenode operation fails as it tries to install and start ZKFailoverController on non-HA cluster.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 343ccdb  [AMBARI-24779] Move Namenode operation fails as it tries to 
install and start ZKFailoverController on non-HA cluster.
343ccdb is described below

commit 343ccdb7bd1c4afa721bc9d0f1634e91ed47c5a3
Author: Ishan Bhatt 
AuthorDate: Mon Oct 15 10:17:01 2018 -0700

[AMBARI-24779] Move Namenode operation fails as it tries to install and 
start ZKFailoverController on non-HA cluster.
---
 ambari-web/app/controllers/main/service/reassign/step4_controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 21e4f0f..b95e206 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -121,7 +121,8 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 var dependenciesToInstall = App.StackServiceComponent.find(componentName)
 .get('dependencies')
 .filter(function (component) {
-  return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName));
+  return !(component.scope == 'host' ? hostInstalledComponents : 
clusterInstalledComponents).contains(component.componentName) && 
(installedServices.contains(component.serviceName))
+&& (componentName === 'NAMENODE' ? App.get('isHaEnabled'): true);
 })
 .mapProperty('componentName');
 this.set('dependentHostComponents', dependenciesToInstall);

[ambari] branch trunk updated: [AMBARI-24720] UI: Configure Rolling Restart Advanced Options.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 2c18ebe  [AMBARI-24720] UI: Configure Rolling Restart Advanced Options.
2c18ebe is described below

commit 2c18ebe5b45910cadb76ab4f6eae75d7067f7eda
Author: Ishan Bhatt 
AuthorDate: Mon Oct 1 14:24:02 2018 -0700

[AMBARI-24720] UI: Configure Rolling Restart Advanced Options.
---
 ambari-web/app/messages.js | 15 +++-
 ambari-web/app/styles/application.less | 44 +-
 .../app/templates/common/service_restart.hbs   | 96 ++
 .../app/views/common/service_restart_view.js   | 53 +---
 4 files changed, 178 insertions(+), 30 deletions(-)

diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bbcece5..67c45f3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3284,7 +3284,20 @@ Em.I18n.translations = {
   'service.rolling.restart.choose.info': 'Critical services remain running 
while the upgrade is performed. Minimized disruption, but is a slower 
upgrade.',
   'service.express.restart.choose.info': 'Services are stopped when this 
upgrade is performed. Incurs downtime, but is a faster upgrade.',
   'service.restart.show.advanced.info': 'Show advanced configurations options 
(Restart by 
batches/hosts, interval between restarts, etc.)',
-
+  'service.restart.rolling.title.info': 'RESTART HOSTS BY',
+  'service.restart.rolling.batchesOfHosts': 'Batches of Hosts',
+  'service.restart.rolling.rackByRack': 'Rack by Rack',
+  'service.restart.rolling.advanced.noOfHosts': 'NUMBER OF HOSTS IN A BATCH',
+  'service.restart.rolling.advanced.batchIntervalHosts': 'INTERVAL BETWEEN 
BATCHES (SEC)',
+  'service.restart.rolling.advanced.percentRacks': '% OF RACKS STARTED AT A 
TIME',
+  'service.restart.rolling.advanced.batchIntervalRacks': 'INTERVAL BETWEEN 
RACKS (SEC)',
+  'service.restart.rolling.advanced.automatic.retry': 'Automatically retry on 
failed hosts',
+  'service.restart.rolling.advanced.noOfRetries': 'NUMBER OF RETRIES PER HOST',
+  'service.restart.rolling.advanced.max.failures.tolerated': 'MAXIMUM FAILURES 
TOLERATED(Restart process is suspended after 
threshold is reached)',
+  'service.restart.rolling.advanced.max.failures.batch': 'MAXIMUM FAILURES 
TOLERATED/BATCH',
+  'service.restart.rolling.advanced.max.failures.rack': 'MAXIMUM FAILURES 
TOLERATED/RACK',
+  'service.restart.rolling.advanced.suppress.alerts': 'Suppress alerts during 
rolling restart',
+  'service.restart.rolling.advanced.pause.after.first': 'Pause after first 
batch',
 
   'rolling.command.context': 'Rolling set {0} to state "{1}" - batch {2} of 
{3}',
   'rolling.nothingToDo.header': 'Nothing to do',
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 56986e5..546aea4 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -3018,6 +3018,11 @@ a.abort-icon:hover {
 }
 
 .service-rolling-restart {
+
+  .radio + .radio, .checkbox + .checkbox {
+margin-top: 0;
+  }
+
   .restart-header-info {
 margin-bottom: 30px; margin-left: 10px;
   }
@@ -3026,7 +3031,7 @@ a.abort-icon:hover {
 margin-bottom: 15px;
 display: flex;
   }
-  .rolling-block, .express-block {
+  .option-rolling-block, .option-express-block {
 label {
   font-size: 16px;
   left: -20px;
@@ -3037,9 +3042,6 @@ a.abort-icon:hover {
   padding-bottom: 5px;
 }
   }
-  .express-block {
-margin-top: 0px;
-  }
   .fa-caret-right {
 color: #1491C1;
   }
@@ -3048,5 +3050,39 @@ a.abort-icon:hover {
 float: left;
 clear: both;
 margin-left: 40px;
+margin-bottom: 10px;
+a {
+  color: inherit;
+  text-decoration: none;
+  cursor: default;
+}
+  }
+  .rolling-restart-advanced {
+display: inline-block;
+margin-top: 10px;
+margin-left: 60px;
+.rolling-restart-by {
+  display: flex;
+  margin-bottom: 20px;
+  input[type="radio"] {
+padding-left: 15px;
+  }
+  .checkbox.radio {
+display: inline-block;
+  }
+  .radio.big-radio {
+padding-right: 20px;
+  }
+}
+.input-option {
+  padding-bottom: 10px;
+  margin: 0;
+}
+.num-retries {
+  padding-left: 10px;
+}
+.separator {
+  width: 40em;
+}
   }
 }
diff --git a/ambari-web/app/templates/common/service_restart.hbs 
b/ambari-web/app/templates/common/service_restart.hbs
index e183169..226b9df 100644
--- a/ambari-web/app/templates/common/service_restart.hbs
+++ b/ambari-web/app/templates/common/service_restart.hbs
@@ -18,22 +18,90 @@
 
 
 
-{{t service.restart.choose.text}}
-
-
-
-{{view view.rollingRestartCheckBox 
labelIdentifier=

[ambari] branch trunk updated: [AMBARI-24696] UI: Options Page to choose Rolling or Express Restart. (#2389)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 0a271d4  [AMBARI-24696] UI: Options Page to choose Rolling or Express 
Restart. (#2389)
0a271d4 is described below

commit 0a271d4a6ed22120b3a841b5c2ca800fcd8952cc
Author: Ishan Bhatt 
AuthorDate: Thu Sep 27 09:54:43 2018 -0700

[AMBARI-24696] UI: Options Page to choose Rolling or Express Restart. 
(#2389)

* [AMBARI-24696] UI: Options Page to choose Rolling or Express Restart.

* Small tweaks

* Added new files to git.
---
 ambari-web/app/config.js   |3 +-
 ambari-web/app/controllers/main/service/item.js|5 +
 ambari-web/app/messages.js |7 +
 ambari-web/app/models/host_component.js|8 +
 ambari-web/app/styles/application.less |   34 +
 .../app/templates/common/service_restart.hbs   |   39 +
 ambari-web/app/utils/batch_scheduled_requests.js   |   16 +
 ambari-web/app/views.js|1 +
 .../app/views/common/service_restart_view.js   |   51 +
 ambari-web/app/views/main/service/item.js  |4 +
 ambari-web/brunch-config.js|1 +
 ambari-web/vendor/styles/font-awesome-4.css| 2337 
 12 files changed, 2505 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 807b841..f368a63 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -92,7 +92,8 @@ App.supports = {
   manageJournalNode: true,
   enableToggleKerberos: true,
   enableAddDeleteServices: true,
-  regenerateKeytabsOnSingleHost: false
+  regenerateKeytabsOnSingleHost: false,
+  enableNewServiceRestartOptions: false
 };
 
 if (App.enableExperimental) {
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index b4d059c..6fb0522 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -966,6 +966,11 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 }
   },
 
+  chooseAndRestartHostComponents: function () {
+let serviceName = this.get('serviceName');
+batchUtils.showServicRestartPopup(serviceName);
+  },
+
   restartCertainHostComponents: function (context) {
 const serviceDisplayName = this.get('content.displayName'),
   {components, hosts, label, serviceName} = context;
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4b8deb5..bbcece5 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -370,6 +370,7 @@ Em.I18n.translations = {
   'common.critical.error': 'Critical',
   'common.with': 'with',
   'common.propertyName': 'Property Name',
+  'common.configure.restart': 'Configure Restart',
 
   'models.alert_instance.tiggered.verbose': "Occurred on {0}  Checked on 
{1}",
   'models.alert_definition.triggered.verbose': "Occurred on {0}",
@@ -3279,6 +3280,12 @@ Em.I18n.translations = {
   'rollingrestart.context.selectedComponentOnSelectedHost':'Restart {0}',
   'rollingrestart.context.default':'Restart components',
 
+  'service.restart.choose.text': 'Please choose which type of restart should 
be performed.',
+  'service.rolling.restart.choose.info': 'Critical services remain running 
while the upgrade is performed. Minimized disruption, but is a slower 
upgrade.',
+  'service.express.restart.choose.info': 'Services are stopped when this 
upgrade is performed. Incurs downtime, but is a faster upgrade.',
+  'service.restart.show.advanced.info': 'Show advanced configurations options 
(Restart by 
batches/hosts, interval between restarts, etc.)',
+
+
   'rolling.command.context': 'Rolling set {0} to state "{1}" - batch {2} of 
{3}',
   'rolling.nothingToDo.header': 'Nothing to do',
   'rolling.nothingToDo.body': '{0} on selected hosts are already in selected 
state or in Maintenance Mode.',
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index cc054a3..c5d3090 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -356,6 +356,14 @@ App.HostComponentActionMap = {
 hasSubmenu: hasMultipleMasterComponentGroups,
 submenuOptions: hasMultipleMasterComponentGroups ? 
this.getMastersSubmenu(ctx, 'restartCertainHostComponents') : []
   },
+  //Ongoing feature. Will later replace RESTART_ALL
+  RESTART_SERVICE: {
+action: 'chooseAndRestartHostComponents',
+context: ctx.get('serviceName'),
+label: 
Em.I18n.t('restart.service.rest.context').format(ctx.get('displayName')),
+cssClass: 'glyphicon glyphicon-time',
+disabled: false
+   

[ambari] branch branch-feature-AMBARI-23466 updated (4dc1c06 -> b04fa97)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch branch-feature-AMBARI-23466
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 4dc1c06  [AMBARI-24665] Migrating grafana plugin for 5.x use.
 new c11e713  Revert "[AMBARI-24665] Migrating grafana plugin for 5.x use."
 new b04fa97  [AMBARI-24665] Migrating grafana plugin for 5.x use. (Prajwal 
Rao, Ishan Bhatt via Ishan Bhatt)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari-metrics-grafana/ambari-metrics/config_ctrl.ts| 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)
 copy ambari-logsearch/ambari-logsearch-web/src/app/classes/models/filter.ts => 
ambari-metrics/ambari-metrics-grafana/ambari-metrics/config_ctrl.ts (79%)

[ambari] branch branch-feature-AMBARI-23466 created (now 4dc1c06)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch branch-feature-AMBARI-23466
in repository https://gitbox.apache.org/repos/asf/ambari.git.


  at 4dc1c06  [AMBARI-24665] Migrating grafana plugin for 5.x use.

This branch includes the following new commits:

 new 4dc1c06  [AMBARI-24665] Migrating grafana plugin for 5.x use.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[ambari] branch trunk updated: [AMBARI-24636] Add Service wizard fails if a service without configs is installed.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 443a473  [AMBARI-24636] Add Service wizard fails if a service without 
configs is installed.
443a473 is described below

commit 443a473fec9f30bcfa9ecd0f52d8b1d86b487cb2
Author: Ishan Bhatt 
AuthorDate: Thu Sep 13 11:38:44 2018 -0700

[AMBARI-24636] Add Service wizard fails if a service without configs is 
installed.
---
 ambari-web/app/controllers/main/service/item.js|  2 +-
 .../app/mixins/common/configs/enhanced_configs.js  | 33 --
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index ea99c54..b4d059c 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -576,7 +576,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   sender: this,
   data: {
 context,
-serviceName: serviceName.toUpperCase(),
+serviceName: serviceName,
 state: serviceHealth,
 query: requestQuery
   },
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 750ab4d..bf091fb 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -649,22 +649,25 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 
   updateAttributesFromTheme: function (serviceName) {
 this.prepareSectionsConfigProperties(serviceName);
-const serviceConfigs = this.get('stepConfigs').findProperty('serviceName', 
serviceName).get('configs'),
-  configConditions = App.ThemeCondition.find().filter(condition => {
-const dependentConfigName = condition.get('configName'),
-  dependentConfigFileName = condition.get('fileName'),
-  configsToDependOn = condition.getWithDefault('configs', []);
-return serviceConfigs.some(serviceConfig => {
-  const serviceConfigName = Em.get(serviceConfig, 'name'),
-serviceConfigFileName = Em.get(serviceConfig, 'filename');
-  return (serviceConfigName === dependentConfigName && 
serviceConfigFileName === dependentConfigFileName)
-|| configsToDependOn.some(config => {
-  const {configName, fileName} = config;
-  return serviceConfigName === configName && serviceConfigFileName 
=== fileName;
-});
+const service = this.get('stepConfigs').findProperty('serviceName', 
serviceName);
+if (service) {
+  const serviceConfigs = service.get('configs'),
+configConditions = App.ThemeCondition.find().filter(condition => {
+  const dependentConfigName = condition.get('configName'),
+dependentConfigFileName = condition.get('fileName'),
+configsToDependOn = condition.getWithDefault('configs', []);
+  return serviceConfigs.some(serviceConfig => {
+const serviceConfigName = Em.get(serviceConfig, 'name'),
+  serviceConfigFileName = Em.get(serviceConfig, 'filename');
+return (serviceConfigName === dependentConfigName && 
serviceConfigFileName === dependentConfigFileName)
+  || configsToDependOn.some(config => {
+const {configName, fileName} = config;
+return serviceConfigName === configName && 
serviceConfigFileName === fileName;
+  });
+  });
 });
-  });
-this.updateAttributesFromConditions(configConditions, serviceConfigs, 
serviceName);
+  this.updateAttributesFromConditions(configConditions, serviceConfigs, 
serviceName);
+}
   },
 
   prepareSectionsConfigProperties: function (serviceName) {

[ambari] branch branch-2.7 updated: [AMBARI-24636] Add Service wizard fails if a service without configs is installed.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 2f9e7f5  [AMBARI-24636] Add Service wizard fails if a service without 
configs is installed.
2f9e7f5 is described below

commit 2f9e7f5730dfa989034d5afd60279c616398f175
Author: Ishan Bhatt 
AuthorDate: Thu Sep 13 11:18:16 2018 -0700

[AMBARI-24636] Add Service wizard fails if a service without configs is 
installed.
---
 ambari-web/app/controllers/main/service/item.js|  2 +-
 .../app/mixins/common/configs/enhanced_configs.js  | 33 --
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index d52cc3f..94e37a3 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -576,7 +576,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   sender: this,
   data: {
 context,
-serviceName: serviceName.toUpperCase(),
+serviceName: serviceName,
 state: serviceHealth,
 query: requestQuery
   },
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 750ab4d..bf091fb 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -649,22 +649,25 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 
   updateAttributesFromTheme: function (serviceName) {
 this.prepareSectionsConfigProperties(serviceName);
-const serviceConfigs = this.get('stepConfigs').findProperty('serviceName', 
serviceName).get('configs'),
-  configConditions = App.ThemeCondition.find().filter(condition => {
-const dependentConfigName = condition.get('configName'),
-  dependentConfigFileName = condition.get('fileName'),
-  configsToDependOn = condition.getWithDefault('configs', []);
-return serviceConfigs.some(serviceConfig => {
-  const serviceConfigName = Em.get(serviceConfig, 'name'),
-serviceConfigFileName = Em.get(serviceConfig, 'filename');
-  return (serviceConfigName === dependentConfigName && 
serviceConfigFileName === dependentConfigFileName)
-|| configsToDependOn.some(config => {
-  const {configName, fileName} = config;
-  return serviceConfigName === configName && serviceConfigFileName 
=== fileName;
-});
+const service = this.get('stepConfigs').findProperty('serviceName', 
serviceName);
+if (service) {
+  const serviceConfigs = service.get('configs'),
+configConditions = App.ThemeCondition.find().filter(condition => {
+  const dependentConfigName = condition.get('configName'),
+dependentConfigFileName = condition.get('fileName'),
+configsToDependOn = condition.getWithDefault('configs', []);
+  return serviceConfigs.some(serviceConfig => {
+const serviceConfigName = Em.get(serviceConfig, 'name'),
+  serviceConfigFileName = Em.get(serviceConfig, 'filename');
+return (serviceConfigName === dependentConfigName && 
serviceConfigFileName === dependentConfigFileName)
+  || configsToDependOn.some(config => {
+const {configName, fileName} = config;
+return serviceConfigName === configName && 
serviceConfigFileName === fileName;
+  });
+  });
 });
-  });
-this.updateAttributesFromConditions(configConditions, serviceConfigs, 
serviceName);
+  this.updateAttributesFromConditions(configConditions, serviceConfigs, 
serviceName);
+}
   },
 
   prepareSectionsConfigProperties: function (serviceName) {

[ambari] branch branch-2.7 updated: [AMBARI-24577] Services should display the Stop button if any of their components are started.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new be87ee5  [AMBARI-24577] Services should display the Stop button if any 
of their components are started.
be87ee5 is described below

commit be87ee58c3bbd4f315d65836dc5d996211ba3463
Author: Ishan Bhatt 
AuthorDate: Thu Aug 30 15:34:02 2018 -0700

[AMBARI-24577] Services should display the Stop button if any of their 
components are started.
---
 ambari-web/app/controllers/main/service/item.js|  21 +++-
 .../test/controllers/main/service/item_test.js | 107 +++--
 2 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 6560666..d52cc3f 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1176,10 +1176,21 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 return 
App.MasterComponent.find().toArray().concat(App.SlaveComponent.find().toArray()).filterProperty('service.serviceName',
 this.get('content.serviceName'));
   }.property('content.serviceName'),
 
-  isStartDisabled: Em.computed.or('isPending', 'content.isStarted'),
+  isStartDisabled: function () {
+let allComponentsStarted = true;
+if (this.get('isPending')) return true;
+this.get('nonClientServiceComponents').forEach(function (component) {
+  if (component.get('installedCount') > 0)
+allComponentsStarted = false;
+});
+return allComponentsStarted && this.get('content.isStarted');
+  }.property('content.isStarted', 'isPending'),
+
 
   isStopDisabled: function () {
+let allComponentsStopped = true;
 if(this.get('isPending')) return true;
+
 if (App.get('isHaEnabled') && this.get('content.serviceName') == 'HDFS' && 
this.get('content.hostComponents').filterProperty('componentName', 
'NAMENODE').someProperty('workStatus', App.HostComponentStatus.started)) {
   return false;
 }
@@ -1189,7 +1200,13 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 if (this.get('content.serviceName') == 'PXF' && 
App.HostComponent.find().filterProperty('componentName', 
'PXF').someProperty('workStatus', App.HostComponentStatus.started)) {
   return false;
 }
-return !this.get('content.isStarted');
+
+this.get('nonClientServiceComponents').forEach(function (component) {
+  if (component.get('startedCount') > 0)
+allComponentsStopped = false;
+});
+
+return allComponentsStopped && !this.get('content.isStarted');
   }.property('content.isStarted','isPending', 'App.isHaEnabled'),
 
   isSmokeTestDisabled: function () {
diff --git a/ambari-web/test/controllers/main/service/item_test.js 
b/ambari-web/test/controllers/main/service/item_test.js
index 35d31a8..e6abebe 100644
--- a/ambari-web/test/controllers/main/service/item_test.js
+++ b/ambari-web/test/controllers/main/service/item_test.js
@@ -53,10 +53,6 @@ var stackServiceModel = {
 
 describe('App.MainServiceItemController', function () {
 
-  App.TestAliases.testAsComputedOr(App.MainServiceItemController.create({
-content: Em.Object.create({serviceName: 'S1'})
-  }), 'isStartDisabled', ['isPending', 'content.isStarted']);
-
   describe('#setStartStopState', function () {
 var tests = [
   {
@@ -891,12 +887,86 @@ describe('App.MainServiceItemController', function () {
   });
 
 
+  describe("#isStartDisabled", function () {
+var tests = [
+  {
+content: {
+  isStarted: true
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  })
+],
+isPending: false,
+disabled: true,
+m: "disabled since service state is started and no component is 
stopped"
+  },
+  {
+content: {
+  isStarted: true
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  }),
+  Em.Object.create({
+installedCount: 2
+  })
+],
+isPending: false,
+disabled: false,
+m: "enabled although service state is started, 2 components are 
stopped"
+  },
+  {
+content: {
+  isStarted: false
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  }),
+  Em.Object.create({
+installedCount: 0
+  })
+],
+isPending: false,
+disabled: false,
+m: "enabled although all components are stopped service state i

[ambari] branch trunk updated: [AMBARI-24577] Services should display the Stop button if any of their components are started.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new dd5c769  [AMBARI-24577] Services should display the Stop button if any 
of their components are started.
dd5c769 is described below

commit dd5c769e516b9bd25c6c40db6bef16ca8ee16df7
Author: Ishan Bhatt 
AuthorDate: Thu Aug 30 15:22:37 2018 -0700

[AMBARI-24577] Services should display the Stop button if any of their 
components are started.
---
 ambari-web/app/controllers/main/service/item.js|  21 +++-
 .../test/controllers/main/service/item_test.js | 107 +++--
 2 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 55ae995..ea99c54 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1176,10 +1176,21 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 return 
App.MasterComponent.find().toArray().concat(App.SlaveComponent.find().toArray()).filterProperty('service.serviceName',
 this.get('content.serviceName'));
   }.property('content.serviceName'),
 
-  isStartDisabled: Em.computed.or('isPending', 'content.isStarted'),
+  isStartDisabled: function () {
+let allComponentsStarted = true;
+if (this.get('isPending')) return true;
+this.get('nonClientServiceComponents').forEach(function (component) {
+  if (component.get('installedCount') > 0)
+allComponentsStarted = false;
+});
+return allComponentsStarted && this.get('content.isStarted');
+  }.property('content.isStarted', 'isPending'),
+
 
   isStopDisabled: function () {
+let allComponentsStopped = true;
 if(this.get('isPending')) return true;
+
 if (App.get('isHaEnabled') && this.get('content.serviceName') == 'HDFS' && 
this.get('content.hostComponents').filterProperty('componentName', 
'NAMENODE').someProperty('workStatus', App.HostComponentStatus.started)) {
   return false;
 }
@@ -1189,7 +1200,13 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
 if (this.get('content.serviceName') == 'PXF' && 
App.HostComponent.find().filterProperty('componentName', 
'PXF').someProperty('workStatus', App.HostComponentStatus.started)) {
   return false;
 }
-return !this.get('content.isStarted');
+
+this.get('nonClientServiceComponents').forEach(function (component) {
+  if (component.get('startedCount') > 0)
+allComponentsStopped = false;
+});
+
+return allComponentsStopped && !this.get('content.isStarted');
   }.property('content.isStarted','isPending', 'App.isHaEnabled'),
 
   isSmokeTestDisabled: function () {
diff --git a/ambari-web/test/controllers/main/service/item_test.js 
b/ambari-web/test/controllers/main/service/item_test.js
index 35d31a8..e6abebe 100644
--- a/ambari-web/test/controllers/main/service/item_test.js
+++ b/ambari-web/test/controllers/main/service/item_test.js
@@ -53,10 +53,6 @@ var stackServiceModel = {
 
 describe('App.MainServiceItemController', function () {
 
-  App.TestAliases.testAsComputedOr(App.MainServiceItemController.create({
-content: Em.Object.create({serviceName: 'S1'})
-  }), 'isStartDisabled', ['isPending', 'content.isStarted']);
-
   describe('#setStartStopState', function () {
 var tests = [
   {
@@ -891,12 +887,86 @@ describe('App.MainServiceItemController', function () {
   });
 
 
+  describe("#isStartDisabled", function () {
+var tests = [
+  {
+content: {
+  isStarted: true
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  })
+],
+isPending: false,
+disabled: true,
+m: "disabled since service state is started and no component is 
stopped"
+  },
+  {
+content: {
+  isStarted: true
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  }),
+  Em.Object.create({
+installedCount: 2
+  })
+],
+isPending: false,
+disabled: false,
+m: "enabled although service state is started, 2 components are 
stopped"
+  },
+  {
+content: {
+  isStarted: false
+},
+nonClientServiceComponents: [
+  Em.Object.create({
+installedCount: 0
+  }),
+  Em.Object.create({
+installedCount: 0
+  })
+],
+isPending: false,
+disabled: false,
+m: "enabled although all components are stopped service state is not 
started"
+  },
+  {
+   

[ambari] branch branch-feature-AMBARI-14714 updated: fixing 1 failing test

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 22e89b9  fixing 1 failing test
22e89b9 is described below

commit 22e89b9f8d536cb2aecf4eb69b9b8231cc91b067
Author: Ishan Bhatt 
AuthorDate: Mon Aug 27 15:50:15 2018 -0700

fixing 1 failing test
---
 .../test/controllers/wizard/step7/assign_master_controller_test.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js 
b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
index 3a66b9e..8790469 100644
--- a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
+++ b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
@@ -300,7 +300,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
 beforeEach(function() {
   sinon.stub(App.StackServiceComponent, 'find').returns(Em.Object.create({
 stackService: App.StackService.createRecord({
-  requiredServices: ['S1', 'S2']
+  requiredServices: ['S2']
 })
   }));
   sinon.stub(App.Service, 'find').returns([

[ambari] branch branch-2.7 updated: [AMBARI-24523] Hive and Oozie JDBC url reset after set manually.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 322459e  [AMBARI-24523] Hive and Oozie JDBC url reset after set 
manually.
322459e is described below

commit 322459ec6d0eba3eaa7db37b1836511e88906c67
Author: Ishan Bhatt 
AuthorDate: Tue Aug 21 13:43:34 2018 -0700

[AMBARI-24523] Hive and Oozie JDBC url reset after set manually.
---
 .../mixins/common/configs/config_recommendation_parser.js | 11 ---
 ambari-web/app/mixins/common/configs/enhanced_configs.js  | 15 ---
 ambari-web/app/views/common/controls_view.js  |  2 ++
 .../common/configs/config_recommendation_parser_test.js   |  2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 6bcd322..49b86a1 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -158,7 +158,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 fileName = Em.get(config, 'filename'),
 group = Em.get(config, 'group.name'),
 value = Em.get(config, 'value'),
-prevRecommeneded = Em.get(config, 'recommendedValue');
+isUserOverriden = Em.get(config, 'didUserOverrideValue');;
 Em.set(config, 'recommendedValue', recommendedValue);
 if (this.allowUpdateProperty(parentProperties, name, fileName, group, 
value)) {
   var allowConfigUpdate = true;
@@ -170,7 +170,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 }
   }
 
-  if (prevRecommeneded !== value && name !== "capacity-scheduler") {
+  if (isUserOverriden && name !== "capacity-scheduler") {
 allowConfigUpdate = false;
   }
 
@@ -184,7 +184,12 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   if (!Em.isNone(recommendedValue) && !Em.get(config, 'hiddenBySection')) {
 Em.set(config, 'isVisible', true);
   }
-  this.applyRecommendation(name, fileName, group, recommendedValue, 
this._getInitialValue(config), parentProperties, Em.get(config, 'isEditable'));
+  let recommendationExists = this.getRecommendation(name, fileName, group);
+  if (recommendationExists && isUserOverriden) {
+this.removeRecommendation(name, fileName, group);
+  } else if (!isUserOverriden) {
+this.applyRecommendation(name, fileName, group, recommendedValue, 
this._getInitialValue(config), parentProperties, Em.get(config, 'isEditable'));
+  }
 }
 if (this.updateInitialOnRecommendations(Em.get(config, 'serviceName'))) {
   Em.set(config, 'initialValue', recommendedValue);
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index e8b0864..750ab4d 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -628,14 +628,23 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
   },
 
   /**
-   * disable saving recommended value for current config
+   * disable saving recommended value for current config. Remove 
recommendation for useroverriden values
* @param config
* @param {boolean} saveRecommended
* @method removeCurrentFromDependentList
*/
   removeCurrentFromDependentList: function (config, saveRecommended) {
-var recommendation = this.getRecommendation(config.get('name'), 
config.get('filename'), config.get('group.name'));
-if (recommendation) this.saveRecommendation(recommendation, 
saveRecommended);
+let name = config.get('name'),
+  fileName = config.get('filename'),
+  group = config.get('group.name');
+var recommendation = this.getRecommendation(name, fileName, group);
+if (recommendation) {
+  if (config.get('didUserOverrideValue')) {
+this.removeRecommendation(name, fileName, group);
+  } else {
+this.saveRecommendation(recommendation, saveRecommended);
+  }
+}
   },
 
   updateAttributesFromTheme: function (serviceName) {
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 2c3c4d8..387dbca 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -170,6 +170,7 @@ App.ValueObserver = 
Em.Mixin.create(App.SupportsDependentConfigs, {
 if (this.get('selected') || this.get('serviceConfig.changedViaUndoValue')) 
{
   var self = this, config = this.get('serviceConfig'),
 contr

[ambari] branch trunk updated: [AMBARI-24523] Hive and Oozie JDBC url reset after set manually.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 79ed221  [AMBARI-24523] Hive and Oozie JDBC url reset after set 
manually.
79ed221 is described below

commit 79ed22126f1ae203d70375bd17088f7c0a2e9645
Author: Ishan Bhatt 
AuthorDate: Wed Aug 22 14:34:09 2018 -0700

[AMBARI-24523] Hive and Oozie JDBC url reset after set manually.
---
 .../mixins/common/configs/config_recommendation_parser.js | 11 ---
 ambari-web/app/mixins/common/configs/enhanced_configs.js  | 15 ---
 ambari-web/app/views/common/controls_view.js  |  2 ++
 .../common/configs/config_recommendation_parser_test.js   |  2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 6bcd322..49b86a1 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -158,7 +158,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 fileName = Em.get(config, 'filename'),
 group = Em.get(config, 'group.name'),
 value = Em.get(config, 'value'),
-prevRecommeneded = Em.get(config, 'recommendedValue');
+isUserOverriden = Em.get(config, 'didUserOverrideValue');;
 Em.set(config, 'recommendedValue', recommendedValue);
 if (this.allowUpdateProperty(parentProperties, name, fileName, group, 
value)) {
   var allowConfigUpdate = true;
@@ -170,7 +170,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 }
   }
 
-  if (prevRecommeneded !== value && name !== "capacity-scheduler") {
+  if (isUserOverriden && name !== "capacity-scheduler") {
 allowConfigUpdate = false;
   }
 
@@ -184,7 +184,12 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   if (!Em.isNone(recommendedValue) && !Em.get(config, 'hiddenBySection')) {
 Em.set(config, 'isVisible', true);
   }
-  this.applyRecommendation(name, fileName, group, recommendedValue, 
this._getInitialValue(config), parentProperties, Em.get(config, 'isEditable'));
+  let recommendationExists = this.getRecommendation(name, fileName, group);
+  if (recommendationExists && isUserOverriden) {
+this.removeRecommendation(name, fileName, group);
+  } else if (!isUserOverriden) {
+this.applyRecommendation(name, fileName, group, recommendedValue, 
this._getInitialValue(config), parentProperties, Em.get(config, 'isEditable'));
+  }
 }
 if (this.updateInitialOnRecommendations(Em.get(config, 'serviceName'))) {
   Em.set(config, 'initialValue', recommendedValue);
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index e8b0864..750ab4d 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -628,14 +628,23 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
   },
 
   /**
-   * disable saving recommended value for current config
+   * disable saving recommended value for current config. Remove 
recommendation for useroverriden values
* @param config
* @param {boolean} saveRecommended
* @method removeCurrentFromDependentList
*/
   removeCurrentFromDependentList: function (config, saveRecommended) {
-var recommendation = this.getRecommendation(config.get('name'), 
config.get('filename'), config.get('group.name'));
-if (recommendation) this.saveRecommendation(recommendation, 
saveRecommended);
+let name = config.get('name'),
+  fileName = config.get('filename'),
+  group = config.get('group.name');
+var recommendation = this.getRecommendation(name, fileName, group);
+if (recommendation) {
+  if (config.get('didUserOverrideValue')) {
+this.removeRecommendation(name, fileName, group);
+  } else {
+this.saveRecommendation(recommendation, saveRecommended);
+  }
+}
   },
 
   updateAttributesFromTheme: function (serviceName) {
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 2c3c4d8..387dbca 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -170,6 +170,7 @@ App.ValueObserver = 
Em.Mixin.create(App.SupportsDependentConfigs, {
 if (this.get('selected') || this.get('serviceConfig.changedViaUndoValue')) 
{
   var self = this, config = this.get('serviceConfig'),
 contr

[ambari] branch branch-2.7 updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new b5ceae4  [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in 
YARN configs while enabling HSI.
b5ceae4 is described below

commit b5ceae4f84691a9b838da720371e67b81e6adbce
Author: Ishan Bhatt 
AuthorDate: Thu Aug 16 09:23:14 2018 -0700

[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs 
while enabling HSI.
---
 .../common/configs/config_recommendation_parser.js | 47 +-
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 19ea8a5..6bcd322 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,14 +170,10 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 }
   }
 
-  if (prevRecommeneded !== value) {
+  if (prevRecommeneded !== value && name !== "capacity-scheduler") {
 allowConfigUpdate = false;
   }
 
-  if (name === "capacity-scheduler") {
-allowConfigUpdate = 
this.compareCapacitySchedulerValues(prevRecommeneded, value);
-  }
-
   if (allowConfigUpdate) {
 Em.setProperties(config, {
   value: recommendedValue,
@@ -196,46 +192,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 Em.tryInvoke(config, 'validate');
 return config;
   },
-
-  /**
-   * Configs with value across multiple lines could have them in a different 
order
-   * Eg: capacity-scheduler
-   *
-   * @param {String} prevRec
-   * @param {String} value
-   * @returns {Boolean}
-   * @method isPrevRecAndValueEqual
-   */
-
-  compareCapacitySchedulerValues: function (prevRec, value) {
-
-
-let prevRecArr = prevRec.split("\n");
-let valueArr = value.split("\n");
-
-//first value being added is capacity-scheduler=null. Remove that for 
comparison
-if (valueArr[0].includes("capacity-scheduler")) {
-  valueArr = valueArr.splice(1);
-}
-
-if (prevRecArr.length !== valueArr.length) {
-  return false;
-}
-if (prevRecArr.length < 2 || valueArr.length < 2) {
-  return prevRec === value;
-}
-let strMap = {};
-for (var i=0; i 

[ambari] branch trunk updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 9d525af  [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in 
YARN configs while enabling HSI.
9d525af is described below

commit 9d525af84f38d0791e32fe1f04c747c284785932
Author: Ishan Bhatt 
AuthorDate: Thu Aug 16 09:23:14 2018 -0700

[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs 
while enabling HSI.
---
 .../common/configs/config_recommendation_parser.js | 47 +-
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 19ea8a5..6bcd322 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,14 +170,10 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 }
   }
 
-  if (prevRecommeneded !== value) {
+  if (prevRecommeneded !== value && name !== "capacity-scheduler") {
 allowConfigUpdate = false;
   }
 
-  if (name === "capacity-scheduler") {
-allowConfigUpdate = 
this.compareCapacitySchedulerValues(prevRecommeneded, value);
-  }
-
   if (allowConfigUpdate) {
 Em.setProperties(config, {
   value: recommendedValue,
@@ -196,46 +192,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 Em.tryInvoke(config, 'validate');
 return config;
   },
-
-  /**
-   * Configs with value across multiple lines could have them in a different 
order
-   * Eg: capacity-scheduler
-   *
-   * @param {String} prevRec
-   * @param {String} value
-   * @returns {Boolean}
-   * @method isPrevRecAndValueEqual
-   */
-
-  compareCapacitySchedulerValues: function (prevRec, value) {
-
-
-let prevRecArr = prevRec.split("\n");
-let valueArr = value.split("\n");
-
-//first value being added is capacity-scheduler=null. Remove that for 
comparison
-if (valueArr[0].includes("capacity-scheduler")) {
-  valueArr = valueArr.splice(1);
-}
-
-if (prevRecArr.length !== valueArr.length) {
-  return false;
-}
-if (prevRecArr.length < 2 || valueArr.length < 2) {
-  return prevRec === value;
-}
-let strMap = {};
-for (var i=0; i 

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24417] HDFS Service page Datanode does not show count. (#1991)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 6342b70  [AMBARI-24417] HDFS Service page Datanode does not show 
count. (#1991)
6342b70 is described below

commit 6342b700af7df22a849dac1e6a1f91a1889a2f02
Author: Ishan Bhatt 
AuthorDate: Wed Aug 15 10:40:46 2018 -0700

[AMBARI-24417] HDFS Service page Datanode does not show count. (#1991)

* [AMBARI-24417] HDFS Service page Datanode does not show count.

* Changed check condition
---
 ambari-web/app/controllers/global/update_controller.js |  1 +
 .../main/service/info/summary/hdfs/slaves.hbs  |  2 +-
 .../app/views/main/service/info/summary/hdfs/slaves.js | 18 ++
 .../test/controllers/global/update_controller_test.js  |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index c7a3e47..d20664f 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -196,6 +196,7 @@ App.UpdateController = Em.Controller.extend({
 if (this.get('isWorking') && !App.get('isOnlyViewUser')) {
   App.updater.run(this, 'updateHostsMetrics', 'isWorking', 
App.contentUpdateInterval, '\/main\/(hosts).*');
   App.updater.run(this, 'updateServiceMetric', 'isWorking', 
App.componentsUpdateInterval, '\/main\/(dashboard|services).*');
+  App.updater.run(this, 'updateComponentsState', 'isWorking', 
App.componentsUpdateInterval);
   App.updater.run(this, 'graphsUpdate', 'isWorking');
 
   if (!App.get('router.mainAlertInstancesController.isUpdating')) {
diff --git a/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs 
b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
index 7ac47f2..37a6b1f 100644
--- a/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
@@ -29,7 +29,7 @@
 
   {{#if App.router.clusterController.isServiceContentFullyLoaded}}
 
-  {{#view App.ComponentLiveTextView 
liveComponentsBinding="view.service.dataNodesStarted" 
totalComponentsBinding="view.service.dataNodesTotal"}}
+  {{#view App.ComponentLiveTextView 
liveComponentsBinding="view.dataNodesStarted" 
totalComponentsBinding="view.dataNodesTotal"}}
 {{view.liveComponents}}/{{view.totalComponents}}
   {{/view}}
 
diff --git a/ambari-web/app/views/main/service/info/summary/hdfs/slaves.js 
b/ambari-web/app/views/main/service/info/summary/hdfs/slaves.js
index 176a624..c13648a 100644
--- a/ambari-web/app/views/main/service/info/summary/hdfs/slaves.js
+++ b/ambari-web/app/views/main/service/info/summary/hdfs/slaves.js
@@ -52,6 +52,24 @@ App.HDFSSlaveComponentsView = Em.View.extend({
 
   journalNodesTotal: Em.computed.alias('service.journalNodes.length'),
 
+  dataNodesStarted: function () {
+var startedNum = this.get('service.dataNodesStarted');
+if (!startedNum) {
+  let dataNodeComponent = 
App.SlaveComponent.find().findProperty('componentName', 'DATANODE');
+  startedNum = dataNodeComponent ? dataNodeComponent.get('startedCount') : 
0;
+}
+return startedNum;
+  }.property('service.dataNodesStarted'),
+
+  dataNodesTotal: function () {
+var totalNum = this.get('service.dataNodesTotal');
+if (!totalNum) {
+  let dataNodeComponent = 
App.SlaveComponent.find().findProperty('componentName', 'DATANODE');
+  totalNum = dataNodeComponent ? dataNodeComponent.get('totalCount') : 0;
+}
+return totalNum;
+  }.property('service.dataNodesTotal'),
+
   /**
* Define if NFS_GATEWAY is present in the installed stack
* @type {Boolean}
diff --git a/ambari-web/test/controllers/global/update_controller_test.js 
b/ambari-web/test/controllers/global/update_controller_test.js
index 18abd53..cb6c881 100644
--- a/ambari-web/test/controllers/global/update_controller_test.js
+++ b/ambari-web/test/controllers/global/update_controller_test.js
@@ -65,7 +65,7 @@ describe('App.UpdateController', function () {
 
 it('isWorking = true', function () {
   controller.set('isWorking', true);
-  expect(App.updater.run.callCount).to.equal(6);
+  expect(App.updater.run.callCount).to.equal(7);
 });
   });
 

[ambari] 05/06: AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 5c9c386565ffd8a4b96c6c2ea0a56a47be19f86d
Author: Alex Antonenko 
AuthorDate: Thu Jul 12 15:05:49 2018 +0300

AMBARI-24246. Ambari does not pick the existing hive database from the jdbc 
url set
---
 ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 7d18574..74aeacd 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -158,7 +158,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 fileName = Em.get(config, 'filename'),
 group = Em.get(config, 'group.name'),
 value = Em.get(config, 'value'),
-prevRecommeneded = config.get('recommendedValue');
+prevRecommeneded = Em.get(config, 'recommendedValue');
 Em.set(config, 'recommendedValue', recommendedValue);
 if (this.allowUpdateProperty(parentProperties, name, fileName, group, 
value)) {
   var allowConfigUpdate = true;

[ambari] 03/06: AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit ce50c1a72afbb50be29613305ebe3c3dfdc2ebe1
Author: hiveww 
AuthorDate: Thu Jul 12 13:53:58 2018 +0300

AMBARI-24246. Ambari does not pick the existing hive database from the jdbc 
url set
---
 ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 4d88c00..cd18159 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,7 +170,7 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   allowConfigUpdate = false;
 }
   }
-  if (prevRecommeneded !== config.get('value')) {
+  if (prevRecommeneded !== value) {
 allowConfigUpdate = false;
   }
   if (allowConfigUpdate) {

[ambari] branch branch-2.7 updated (6385622 -> cf3ec0c)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 6385622  AMBARI-24457. Hiveserver2 can't connect to metastore when 
using OneFS (amagyar) (#2024) (#2028)
 new e0af328  AMBARI-24246. Ambari does not pick the existing hive database 
from the jdbc url set
 new 704342f  AMBARI-24246. Ambari does not pick the existing hive database 
from the jdbc url set
 new ce50c1a  AMBARI-24246. Ambari does not pick the existing hive database 
from the jdbc url set
 new 585f307  AMBARI-24246. Ambari does not pick the existing hive database 
from the jdbc url set
 new 5c9c386  AMBARI-24246. Ambari does not pick the existing hive database 
from the jdbc url set
 new cf3ec0c  [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in 
YARN conf… (#2016)

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../common/configs/config_recommendation_parser.js | 53 --
 ambari-web/app/views/common/controls_view.js   |  1 -
 2 files changed, 50 insertions(+), 4 deletions(-)

[ambari] 01/06: AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit e0af328c569ca6c6aa3d54e787badc06a96b5930
Author: Alex Antonenko 
AuthorDate: Thu Jul 5 12:17:44 2018 +0300

AMBARI-24246. Ambari does not pick the existing hive database from the jdbc 
url set
---
 ambari-web/app/views/common/controls_view.js | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 50b4d63..b41026b 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -114,6 +114,13 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
   }
 }
 
+//Fix required by QA (Ambari does not pick the existing hive database from 
the jdbc url set)
+if (['oozie.service.JPAService.jdbc.url__oozie-site', 
'javax.jdo.option.ConnectionURL__hive-site'].contains(config.get('id'))) {
+  controller.set('recommendationsInProgress', true);
+  controller.runServerSideValidation().done(function () {
+controller.set('recommendationsInProgress', false)
+  });
+}
 return $.Deferred().resolve().promise();
   },
 

[ambari] 06/06: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit cf3ec0c543681387f2bfeec7a921207d1fcbc6d7
Author: Ishan Bhatt 
AuthorDate: Thu Aug 9 17:12:07 2018 -0700

[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… 
(#2016)

* [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs 
while enabling HSI.

* Changed function parameters info
---
 .../common/configs/config_recommendation_parser.js | 45 ++
 1 file changed, 45 insertions(+)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 74aeacd..19ea8a5 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -169,9 +169,15 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   allowConfigUpdate = false;
 }
   }
+
   if (prevRecommeneded !== value) {
 allowConfigUpdate = false;
   }
+
+  if (name === "capacity-scheduler") {
+allowConfigUpdate = 
this.compareCapacitySchedulerValues(prevRecommeneded, value);
+  }
+
   if (allowConfigUpdate) {
 Em.setProperties(config, {
   value: recommendedValue,
@@ -192,6 +198,45 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   },
 
   /**
+   * Configs with value across multiple lines could have them in a different 
order
+   * Eg: capacity-scheduler
+   *
+   * @param {String} prevRec
+   * @param {String} value
+   * @returns {Boolean}
+   * @method isPrevRecAndValueEqual
+   */
+
+  compareCapacitySchedulerValues: function (prevRec, value) {
+
+
+let prevRecArr = prevRec.split("\n");
+let valueArr = value.split("\n");
+
+//first value being added is capacity-scheduler=null. Remove that for 
comparison
+if (valueArr[0].includes("capacity-scheduler")) {
+  valueArr = valueArr.splice(1);
+}
+
+if (prevRecArr.length !== valueArr.length) {
+  return false;
+}
+if (prevRecArr.length < 2 || valueArr.length < 2) {
+  return prevRec === value;
+}
+let strMap = {};
+for (var i=0; i 

[ambari] 04/06: AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 585f307ffdd3624645355b1cc7cf21e497238458
Author: hiveww 
AuthorDate: Thu Jul 12 13:55:39 2018 +0300

AMBARI-24246. Ambari does not pick the existing hive database from the jdbc 
url set
---
 ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index cd18159..7d18574 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -160,7 +160,6 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 value = Em.get(config, 'value'),
 prevRecommeneded = config.get('recommendedValue');
 Em.set(config, 'recommendedValue', recommendedValue);
-console.log('test123', config, recommendedValue)
 if (this.allowUpdateProperty(parentProperties, name, fileName, group, 
value)) {
   var allowConfigUpdate = true;
   // workaround for capacity-scheduler

[ambari] 02/06: AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 704342f10da431b783164f74a99c7e2dd34cf398
Author: hiveww 
AuthorDate: Thu Jul 12 13:49:18 2018 +0300

AMBARI-24246. Ambari does not pick the existing hive database from the jdbc 
url set
---
 .../app/mixins/common/configs/config_recommendation_parser.js| 9 ++---
 ambari-web/app/views/common/controls_view.js | 8 
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index fcaf6f0..4d88c00 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -55,7 +55,6 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 App.assertFunction(updateCallback);
 App.assertFunction(removeCallback);
 App.assertFunction(updateBoundariesCallback);
-
 var propertiesToDelete = [];
 configs.forEach(function (config) {
   var name = Em.get(config, 'name'),
@@ -158,9 +157,10 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
 var name = Em.get(config, 'name'),
 fileName = Em.get(config, 'filename'),
 group = Em.get(config, 'group.name'),
-value = Em.get(config, 'value');
-
+value = Em.get(config, 'value'),
+prevRecommeneded = config.get('recommendedValue');
 Em.set(config, 'recommendedValue', recommendedValue);
+console.log('test123', config, recommendedValue)
 if (this.allowUpdateProperty(parentProperties, name, fileName, group, 
value)) {
   var allowConfigUpdate = true;
   // workaround for capacity-scheduler
@@ -170,6 +170,9 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   allowConfigUpdate = false;
 }
   }
+  if (prevRecommeneded !== config.get('value')) {
+allowConfigUpdate = false;
+  }
   if (allowConfigUpdate) {
 Em.setProperties(config, {
   value: recommendedValue,
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index b41026b..2c3c4d8 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -113,14 +113,6 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
  }]);
   }
 }
-
-//Fix required by QA (Ambari does not pick the existing hive database from 
the jdbc url set)
-if (['oozie.service.JPAService.jdbc.url__oozie-site', 
'javax.jdo.option.ConnectionURL__hive-site'].contains(config.get('id'))) {
-  controller.set('recommendationsInProgress', true);
-  controller.runServerSideValidation().done(function () {
-controller.set('recommendationsInProgress', false)
-  });
-}
 return $.Deferred().resolve().promise();
   },
 

[ambari] branch trunk updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 40aac82  [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in 
YARN conf… (#2016)
40aac82 is described below

commit 40aac8240bb516cf1048afd0642e1e7d6dc2027f
Author: Ishan Bhatt 
AuthorDate: Thu Aug 9 17:12:07 2018 -0700

[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… 
(#2016)

* [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs 
while enabling HSI.

* Changed function parameters info
---
 .../common/configs/config_recommendation_parser.js | 45 ++
 1 file changed, 45 insertions(+)

diff --git 
a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js 
b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 74aeacd..19ea8a5 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -169,9 +169,15 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   allowConfigUpdate = false;
 }
   }
+
   if (prevRecommeneded !== value) {
 allowConfigUpdate = false;
   }
+
+  if (name === "capacity-scheduler") {
+allowConfigUpdate = 
this.compareCapacitySchedulerValues(prevRecommeneded, value);
+  }
+
   if (allowConfigUpdate) {
 Em.setProperties(config, {
   value: recommendedValue,
@@ -192,6 +198,45 @@ App.ConfigRecommendationParser = 
Em.Mixin.create(App.ConfigRecommendations, {
   },
 
   /**
+   * Configs with value across multiple lines could have them in a different 
order
+   * Eg: capacity-scheduler
+   *
+   * @param {String} prevRec
+   * @param {String} value
+   * @returns {Boolean}
+   * @method isPrevRecAndValueEqual
+   */
+
+  compareCapacitySchedulerValues: function (prevRec, value) {
+
+
+let prevRecArr = prevRec.split("\n");
+let valueArr = value.split("\n");
+
+//first value being added is capacity-scheduler=null. Remove that for 
comparison
+if (valueArr[0].includes("capacity-scheduler")) {
+  valueArr = valueArr.splice(1);
+}
+
+if (prevRecArr.length !== valueArr.length) {
+  return false;
+}
+if (prevRecArr.length < 2 || valueArr.length < 2) {
+  return prevRec === value;
+}
+let strMap = {};
+for (var i=0; i 

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24396] Service theme call failing.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 938d31f  [AMBARI-24396] Service theme call failing.
938d31f is described below

commit 938d31f091d1b86dc5edcd565dd1a2ea8a9e30ce
Author: Ishan Bhatt 
AuthorDate: Tue Jul 31 12:56:23 2018 -0700

[AMBARI-24396] Service theme call failing.
---
 ambari-web/app/controllers/main.js |  2 +-
 .../app/mixins/main/service/themes_mapping.js  |  4 ++-
 .../controllers/main/service/info/summary_test.js  |  5 +++-
 ambari-web/test/controllers/main_test.js   | 22 +++
 ambari-web/test/models/stack_service_test.js   | 32 ++
 ambari-web/test/views/installer_test.js|  1 +
 6 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/ambari-web/app/controllers/main.js 
b/ambari-web/app/controllers/main.js
index 105fee0..1a5b2a0 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -61,7 +61,7 @@ App.MainController = Em.Controller.extend({
   dataLoading: function () {
 var self = this;
 var dfd = $.Deferred();
-if (App.router.get('clusterController.isLoaded')) {
+if (self.get('isClusterDataLoaded')) {
   dfd.resolve();
 } else {
   var interval = setInterval(function () {
diff --git a/ambari-web/app/mixins/main/service/themes_mapping.js 
b/ambari-web/app/mixins/main/service/themes_mapping.js
index 036ca7b..82ed9f5 100644
--- a/ambari-web/app/mixins/main/service/themes_mapping.js
+++ b/ambari-web/app/mixins/main/service/themes_mapping.js
@@ -33,6 +33,8 @@ App.ThemesMappingMixin = Em.Mixin.create({
*/
   loadConfigTheme: function(serviceName) {
 const dfd = $.Deferred();
+let stackName = App.StackService.find().findProperty('serviceName', 
serviceName).get('stackName');
+let stackVersion = App.StackService.find().findProperty('serviceName', 
serviceName).get('stackVersion');
 if (App.Tab.find().mapProperty('serviceName').contains(serviceName)) {
   dfd.resolve();
 } else {
@@ -41,7 +43,7 @@ App.ThemesMappingMixin = Em.Mixin.create({
 sender: this,
 data: {
   serviceName: serviceName,
-  stackVersionUrl: App.get('stackVersionURL')
+  stackVersionUrl: App.getStackVersionUrl(stackName, stackVersion) || 
App.get('stackVersionURL')
 },
 success: '_saveThemeToModel'
   }).complete(dfd.resolve);
diff --git a/ambari-web/test/controllers/main/service/info/summary_test.js 
b/ambari-web/test/controllers/main/service/info/summary_test.js
index e5cc32a..2fc85f3 100644
--- a/ambari-web/test/controllers/main/service/info/summary_test.js
+++ b/ambari-web/test/controllers/main/service/info/summary_test.js
@@ -113,17 +113,20 @@ describe('App.MainServiceInfoSummaryController', function 
() {
   configTypes: {}
 })
   ]);
+  this.mock = sinon.stub(App, 'get');
 });
 
 afterEach(function () {
   App.Service.find.restore();
   App.StackService.find.restore();
+  this.mock.restore();
 });
 
 cases.forEach(function (item) {
   it(item.title, function () {
 controller.set('isRangerPluginsArraySet', 
item.isRangerPluginsArraySet);
-App.set('router.clusterController.isLoaded', item.isLoaded);
+
this.mock.withArgs('router.clusterController.isLoaded').returns(item.isLoaded);
+controller.setRangerPlugins();
 
expect(controller.get('isRangerPluginsArraySet')).to.equal(item.expectedIsRangerPluginsArraySet);
 
expect(controller.get('rangerPlugins').filterProperty('isDisplayed').mapProperty('serviceName').sort()).to.eql(['HDFS',
 'HIVE']);
   });
diff --git a/ambari-web/test/controllers/main_test.js 
b/ambari-web/test/controllers/main_test.js
index 723d306..3606bf5 100644
--- a/ambari-web/test/controllers/main_test.js
+++ b/ambari-web/test/controllers/main_test.js
@@ -58,27 +58,25 @@ describe('App.MainController', function () {
 
   describe('#dataLoading', function() {
 
-beforeEach(function () {
-  this.stub = sinon.stub(App.router, 'get');
-});
-
-afterEach(function () {
-  this.stub.restore();
-});
-
 it ('Should resolve promise', function() {
-  this.stub.returns(true);
+  mainController.reopen({
+isClusterDataLoaded: true
+  });
   var deffer = mainController.dataLoading();
   deffer.then(function(val){
 expect(val).to.be.undefined;
   });
 });
 it ('Should resolve promise (2)', function(done) {
-  this.stub.returns(false);
+  mainController.reopen({
+isClusterDataLoaded: false
+  });
   
   setTimeout(function() {
-mainController.set('isClusterDataLoaded', true);
-  },150);
+mainController.reopen

[ambari] branch branch-2.7 updated: Revert hive pre-upgrade script commits in PR #1886

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 3503896  Revert hive pre-upgrade script commits in PR #1886
3503896 is described below

commit 3503896cd57e2a520c350b41e5ec9b62409037a2
Author: Ishan Bhatt 
AuthorDate: Fri Jul 27 09:58:33 2018 -0700

Revert hive pre-upgrade script commits in PR #1886
---
 .../HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py| 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
index c9fd147..4db8b8b 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
@@ -21,7 +21,7 @@ limitations under the License.
 import os
 import shutil
 import traceback
-import glob
+
 
 # Ambari Commons & Resource Management Imports
 from resource_management.core.exceptions import Fail
@@ -99,11 +99,7 @@ class HivePreUpgrade(Script):
   hive_kinit_cmd = format("{kinit_path_local} -kt {hive_server2_keytab} 
{hive_principal}; ")
   Execute(hive_kinit_cmd, user = params.hive_user)
 
-classpath = 
format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{source_dir}/hadoop-hdfs/*:{source_dir}/hadoop-hdfs/lib/*:{source_dir}/hadoop/etc/hadoop/:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf/conf.server")
-# hack to avoid derby cp issue we want derby-10.10.2.0.jar to appear first 
in cp, if its available, note other derby jars are derbyclient-10.11.1.1.jar  
derbynet-10.11.1.1.jar
-derby_jars = glob.glob(source_dir+"/hive2/lib/*derby-*.jar")
-if len(derby_jars) == 1:
-  classpath = derby_jars[0] + ":" + classpath
+classpath = 
format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf")
 cmd = format("{java64_home}/bin/java 
-Djavax.security.auth.useSubjectCredsOnly=false -cp {classpath} 
org.apache.hadoop.hive.upgrade.acid.PreUpgradeTool -execute")
 Execute(cmd, user = params.hive_user)
 

[ambari] branch branch-2.7 updated (b8461bf -> 9fb4764)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from b8461bf  [AMBARI-24354] [Log Search UI] wrong filter label on open log 
tab (#1880)
 new 492e933  AMBARI-24304 Fix convert table classpath (asutosh)
 new 9fb4764  AMBARI-24276 include derby jars for Hive convert table step 
(ashutosh)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py| 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

[ambari] 02/02: AMBARI-24276 include derby jars for Hive convert table step (ashutosh)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 9fb4764c1d265a535174903fe9fe9dcda9b32ddc
Author: Miklos Gergely 
AuthorDate: Thu Jul 19 13:23:24 2018 +0200

AMBARI-24276 include derby jars for Hive convert table step (ashutosh)
---
 .../common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
index 37c099e..c9fd147 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
@@ -21,7 +21,7 @@ limitations under the License.
 import os
 import shutil
 import traceback
-
+import glob
 
 # Ambari Commons & Resource Management Imports
 from resource_management.core.exceptions import Fail
@@ -100,6 +100,10 @@ class HivePreUpgrade(Script):
   Execute(hive_kinit_cmd, user = params.hive_user)
 
 classpath = 
format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{source_dir}/hadoop-hdfs/*:{source_dir}/hadoop-hdfs/lib/*:{source_dir}/hadoop/etc/hadoop/:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf/conf.server")
+# hack to avoid derby cp issue we want derby-10.10.2.0.jar to appear first 
in cp, if its available, note other derby jars are derbyclient-10.11.1.1.jar  
derbynet-10.11.1.1.jar
+derby_jars = glob.glob(source_dir+"/hive2/lib/*derby-*.jar")
+if len(derby_jars) == 1:
+  classpath = derby_jars[0] + ":" + classpath
 cmd = format("{java64_home}/bin/java 
-Djavax.security.auth.useSubjectCredsOnly=false -cp {classpath} 
org.apache.hadoop.hive.upgrade.acid.PreUpgradeTool -execute")
 Execute(cmd, user = params.hive_user)
 

[ambari] 01/02: AMBARI-24304 Fix convert table classpath (asutosh)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 492e93314e9b83d5d68d10fdc5758a6edbd48ca8
Author: Miklos Gergely 
AuthorDate: Thu Jul 19 11:43:52 2018 +0200

AMBARI-24304 Fix convert table classpath (asutosh)
---
 .../common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
index 4db8b8b..37c099e 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
@@ -99,7 +99,7 @@ class HivePreUpgrade(Script):
   hive_kinit_cmd = format("{kinit_path_local} -kt {hive_server2_keytab} 
{hive_principal}; ")
   Execute(hive_kinit_cmd, user = params.hive_user)
 
-classpath = 
format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf")
+classpath = 
format("{source_dir}/hive2/lib/*:{source_dir}/hadoop/*:{source_dir}/hadoop/lib/*:{source_dir}/hadoop-mapreduce/*:{source_dir}/hadoop-mapreduce/lib/*:{source_dir}/hadoop-hdfs/*:{source_dir}/hadoop-hdfs/lib/*:{source_dir}/hadoop/etc/hadoop/:{target_dir}/hive/lib/hive-pre-upgrade.jar:{source_dir}/hive/conf/conf.server")
 cmd = format("{java64_home}/bin/java 
-Djavax.security.auth.useSubjectCredsOnly=false -cp {classpath} 
org.apache.hadoop.hive.upgrade.acid.PreUpgradeTool -execute")
 Execute(cmd, user = params.hive_user)
 

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24350] UI service configs page hangs.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new f44fe6b  [AMBARI-24350] UI service configs page hangs.
f44fe6b is described below

commit f44fe6bb9c25ce4c3d6ec621a92a11c92d72358a
Author: Ishan Bhatt 
AuthorDate: Tue Jul 24 11:46:17 2018 -0700

[AMBARI-24350] UI service configs page hangs.
---
 ambari-web/app/controllers/global/update_controller.js | 10 +-
 ambari-web/app/controllers/main/service/item.js|  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 7dcac8c..c7a3e47 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -675,8 +675,8 @@ App.UpdateController = Em.Controller.extend({
 
   //TODO - update service auto-start to use this
   updateClusterEnv: function () {
-this.loadClusterSettings().then(function (settings) {
-  App.router.get('clusterController').set('clusterEnv', { properties: 
settings });
+return 
App.router.get('configurationController').getCurrentConfigsBySites(['cluster-env']).done(function
 (config) {
+  App.router.get('clusterController').set('clusterEnv', config[0]);
 });
   },
 
@@ -688,7 +688,7 @@ App.UpdateController = Em.Controller.extend({
   sender: this
 }).then(data => {
   const settings = {};
-  
+
   if (data && data.items) {
 data.items.forEach(item => {
   const key = item.ClusterSettingInfo.cluster_setting_name;
@@ -696,10 +696,10 @@ App.UpdateController = Em.Controller.extend({
   settings[key] = value;
 });
   }
-  
+
   dfd.resolve(settings);
 }, dfd.reject);
-
+
 return dfd.promise();
   },
 
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index 1200fde..6604143 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -210,6 +210,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   loadConfigs: function() {
 this.set('isServiceConfigsLoaded', false);
 this.set('stepConfigs', []);
+let self = this;
 
App.get('router.mainController.isLoading').call(App.get('router.clusterController'),
 'isConfigsPropertiesLoaded').done(() => {
   
App.router.get('configurationController').getCurrentConfigsBySites(this.get('sitesToLoad')).done((configs)
 => {
 let allConfigs = [];

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while g… (#1853)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 6e4a5d1  [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, 
while g… (#1853)
6e4a5d1 is described below

commit 6e4a5d123da37ae35b83a12f55ef618fa7b8c72d
Author: Ishan Bhatt 
AuthorDate: Wed Jul 25 09:25:58 2018 -0700

[AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while g… 
(#1853)

* [AMBARI-24342] PostTrunkMerge : UI issue at Step 7 of deploy, while 
getting configs for service.

* Removing the commented out code
---
 ambari-web/app/controllers/wizard/step7_controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 8e623f0..f66fece 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -2153,7 +2153,9 @@ App.WizardStep7Controller = 
App.WizardStepController.extend(App.ServerValidatorM
   },
 
   updateConfigAttributesFromThemes: function () {
-this.get('allSelectedServiceNames').forEach(serviceName => 
this.updateAttributesFromTheme(serviceName));
+App.config.get('preDefinedServiceConfigs').mapProperty('serviceName')
+  .filter(serviceName => 
this.get('allSelectedServiceNames').contains(serviceName))
+  .forEach(serviceName => this.updateAttributesFromTheme(serviceName));
   },
 
   validateOnTabSwitch: function () {

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-24328. PostTrunkMerge : UI Host page API call is broken.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 1ce5883  AMBARI-24328. PostTrunkMerge : UI Host page API call is 
broken.
1ce5883 is described below

commit 1ce5883984e75749a425eff77bc29049b7368f50
Author: Swapan Shridhar 
AuthorDate: Fri Jul 20 13:36:31 2018 -0700

AMBARI-24328. PostTrunkMerge : UI Host page API call is broken.
---
 .../app/controllers/global/update_controller.js| 48 ++
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 08ab275..7dcac8c 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -221,40 +221,6 @@ App.UpdateController = Em.Controller.extend({
 
   /**
*
-   * @param {boolean} loadMetricsSeparately
-   * @returns {string|*}
-   */
-  getUpdateHostUrlWithParams: function (loadMetricsSeparately) {
-let url = 
'/hosts?fields=Hosts/rack_info,Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,'
 +
-  
'Hosts/cpu_count,Hosts/ph_cpu_count,alerts_summary,Hosts/host_status,Hosts/host_state,'
 +
-  'Hosts/last_heartbeat_time,Hosts/ip,host_components/HostRoles/state,' +
-  
'host_components/HostRoles/maintenance_state,host_components/HostRoles/stale_configs,'
 +
-  
'host_components/HostRoles/service_name,host_components/HostRoles/display_name,'
 +
-  'host_components/HostRoles/desired_admin_state,' +
-  
'Hosts/total_mem_response=true';
-const stackVersionInfo = ',stack_versions/HostStackVersions,' +
-  
'stack_versions/repository_versions/RepositoryVersions/repository_version,' +
-  'stack_versions/repository_versions/RepositoryVersions/id,' +
-  'stack_versions/repository_versions/RepositoryVersions/display_name',
-  loggingResource = ',host_components/logging',
-  isHostDetailPage = App.router.get('currentState.parentState.name') === 
'hostDetails',
-  isHostsPage = App.router.get('currentState.parentState.name') === 
'hosts',
-  hostDetailsParams = 
',Hosts/os_arch,Hosts/os_type,metrics/cpu/cpu_system,metrics/cpu/cpu_user,' +
-'metrics/memory/mem_total,metrics/memory/mem_free',
-  nameNodeMetrics = 'host_components/metrics/dfs/namenode/ClusterId,' +
-'host_components/metrics/dfs/FSNamesystem/HAState,';
-
-url = url.replace("", stackVersionInfo);
-url = url.replace("", loadMetricsSeparately ? "" : 
"metrics/disk,metrics/load/load_one,");
-url = url.replace('', isHostsPage ? '' : 
hostDetailsParams);
-url = url.replace('', isHostDetailPage ? 
'Hosts/last_agent_env,' : '');
-url = url.replace('', 
App.Service.find('HDFS').get('isLoaded') ? nameNodeMetrics : '');
-url = App.get('supports.logSearch') ? url + loggingResource : url;
-return url;
-  },
-
-  /**
-   *
* @param {Function} callback
* @param {Function} error
* @param {boolean} lazyLoadMetrics
@@ -263,16 +229,23 @@ App.UpdateController = Em.Controller.extend({
 var testUrl = this.get('HOSTS_TEST_URL'),
 self = this,
 hostDetailsFilter = '',
+realUrl = 
'/hosts?fields=Hosts/rack_info,Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,Hosts/cpu_count,Hosts/ph_cpu_count,Hosts/last_agent_env,'
 +
+
'alerts_summary,Hosts/host_status,Hosts/host_state,Hosts/last_heartbeat_time,Hosts/ip,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,'
 +
+
'host_components/HostRoles/stale_configs,host_components/HostRoles/service_name,host_components/HostRoles/display_name,host_components/HostRoles/desired_admin_state,'
 +
+(App.Service.find().someProperty('serviceName', 'HDFS') ? 
'host_components/metrics/dfs/namenode/ClusterId,host_components/metrics/dfs/FSNamesystem/HAState,'
 : '') +
+
'Hosts/total_mem_response=true',
 hostDetailsParams = 
',Hosts/os_arch,Hosts/os_type,metrics/cpu/cpu_system,metrics/cpu/cpu_user,metrics/memory/mem_total,metrics/memory/mem_free',
 stackVersionInfo = '',
 mainHostController = App.router.get('mainHostController'),
 sortProperties = mainHostController.getSortProps(),
+loggingResource = ',host_components/logging',
 isHostsLoaded = false,
 // load hosts metrics separately of lazyLoadMetrics=true, but metrics 
in current request if we are sorting
 loadMetricsSeparately = lazyLoadMetrics && !(sortProperties.length && 
['loadAvg', 'diskUsage'].contains(sortProperties[0].name));
 this.get('queryParams').set('Hosts', 
mainHostController.getQueryParameters(true));
 if (Ap

[ambari] branch branch-feature-AMBARI-14714 updated: Fixing broken UI tests.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new fee4341  Fixing broken UI tests.
fee4341 is described below

commit fee4341bf5e8187631c0dbbfcb4c5dce664086f9
Author: Ishan Bhatt 
AuthorDate: Thu Jul 12 16:41:40 2018 -0700

Fixing broken UI tests.
---
 ambari-web/app/app.js  | 688 +++--
 .../app/controllers/wizard/step8_controller.js |   3 -
 ambari-web/app/mappers.js  |   3 +-
 .../app/mappers/socket/upgrade_state_mapper.js |  42 ++
 ambari-web/test/controllers/installer_test.js  |  74 +--
 .../main/admin/service_auto_start_test.js  |   1 -
 .../mixins/common/configs/enhanced_configs_test.js |   1 -
 7 files changed, 424 insertions(+), 388 deletions(-)

diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 760a16e..a9d28a7 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -17,7 +17,7 @@
  */
 
 if (Ember.$.uuid === undefined) {
-  Ember.$.uuid = 0;
+Ember.$.uuid = 0;
 }
 
 // Application bootstrapper
@@ -28,314 +28,380 @@ var stringUtils = require('utils/string_utils');
 var stompClientClass = require('utils/stomp_client');
 
 module.exports = Em.Application.create({
-  name: 'Ambari Web',
-  rootElement: '#wrapper',
-
-  store: DS.Store.create({
-revision: 4,
-adapter: DS.FixtureAdapter.create({
-  simulateRemoteResponse: false
+name: 'Ambari Web',
+rootElement: '#wrapper',
+
+store: DS.Store.create({
+revision: 4,
+adapter: DS.FixtureAdapter.create({
+simulateRemoteResponse: false
+}),
+typeMaps: {},
+recordCache: []
+}),
+StompClient: stompClientClass.create(),
+isAdmin: false,
+isOperator: false,
+isClusterUser: false,
+isPermissionDataLoaded: false,
+auth: undefined,
+isOnlyViewUser: function() {
+return App.auth && (App.auth.length == 0 || 
(App.isAuthorized('VIEW.USE') && App.auth.length == 1));
+}.property('auth'),
+
+/**
+ * @type {boolean}
+ * @default false
+ */
+isKerberosEnabled: false,
+
+/**
+ * state of stack upgrade process
+ * states:
+ *  - NOT_REQUIRED
+ *  - PENDING
+ *  - IN_PROGRESS
+ *  - HOLDING
+ *  - COMPLETED
+ *  - ABORTED
+ *  - HOLDING_FAILED
+ *  - HOLDING_TIMEDOUT
+ * @type {String}
+ */
+upgradeState: 'NOT_REQUIRED',
+
+/**
+ * Check if upgrade is in INIT state
+ * 'INIT' is set on upgrade start and when it's finished
+ * @type {boolean}
+ */
+upgradeInit: Em.computed.equal('upgradeState', 'NOT_REQUIRED'),
+
+/**
+ * flag is true when upgrade process is running
+ * @returns {boolean}
+ */
+upgradeInProgress: Em.computed.equal('upgradeState', 'IN_PROGRESS'),
+
+/**
+ * Checks if update process is completed
+ * @type {boolean}
+ */
+upgradeCompleted: Em.computed.equal('upgradeState', 'COMPLETED'),
+
+/**
+ * flag is true when upgrade process is waiting for user action
+ * to proceed, retry, perform manual steps etc.
+ * @returns {boolean}
+ */
+upgradeHolding: function() {
+return this.get('upgradeState').contains("HOLDING") || 
this.get('upgradeAborted');
+}.property('upgradeState', 'upgradeAborted'),
+
+/**
+ * flag is true when upgrade process is aborted
+ * SHOULD behave similar to HOLDING_FAILED state
+ * @returns {boolean}
+ */
+upgradeAborted: function () {
+return this.get('upgradeState') === "ABORTED" && 
!App.router.get('mainAdminStackAndUpgradeController.isSuspended');
+}.property('upgradeState', 
'router.mainAdminStackAndUpgradeController.isSuspended'),
+
+/**
+ * flag is true when upgrade process is suspended
+ * @returns {boolean}
+ */
+upgradeSuspended: function () {
+return this.get('upgradeState') === "ABORTED" && 
App.router.get('mainAdminStackAndUpgradeController.isSuspended');
+}.property('upgradeState', 
'router.mainAdminStackAndUpgradeController.isSuspended'),
+
+/**
+ * RU is running
+ * @type {boolean}
+ */
+upgradeIsRunning: Em.computed.or('upgradeInProgress', 'upgradeHolding'),
+
+/**
+ * flag is true when upgrade process is running or suspended
+ * or wizard used by another user
+ * @returns {boolean}
+ */
+wizardIsNotFinished: function () {
+return this.get('upgradeIsRunning') ||
+this.get('upgradeSuspended') ||
+App.router.get('wizardWatcherController.isNonWizardUser');
+}.property('upgradeIsRunning', 'upgradeAborted', 
'router.wizardWatcherController.isNonWizardUser', 'up

[ambari] branch trunk updated: Update support matrix for Ambari 2.7.0

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new c78fc94  Update support matrix for Ambari 2.7.0
c78fc94 is described below

commit c78fc940e2dbcc1299953812668d5a2e8efb0f34
Author: Ishan Bhatt 
AuthorDate: Wed Jul 18 12:13:51 2018 -0700

Update support matrix for Ambari 2.7.0
---
 docs/src/site/apt/index.apt | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/src/site/apt/index.apt b/docs/src/site/apt/index.apt
index 5db96f6..8ba3e87 100644
--- a/docs/src/site/apt/index.apt
+++ b/docs/src/site/apt/index.apt
@@ -56,17 +56,19 @@ Getting Started with Ambari
 
   Note: Ambari currently supports the 64-bit version of the following 
Operating Systems:
 
-  * RHEL (Redhat Enterprise Linux) 6 and 7
+  * RHEL (Redhat Enterprise Linux) 7.4, 7.3, 7.2
 
-  * CentOS 6 and 7
+  * CentOS 7.4, 7.3, 7.2
 
-  * OEL (Oracle Enterprise Linux) 6 and 7
+  * OEL (Oracle Enterprise Linux) 7.4, 7.3, 7.2
 
-  * SLES (SuSE Linux Enterprise Server) 11
+  * Amazon Linux 2
 
-  * Ubuntu 12 and 14
+  * SLES (SuSE Linux Enterprise Server) 12 SP3, 12 SP2
 
-  * Debian 7
+  * Ubuntu 14 and 16
+
+  * Debian 9
 
 Get Involved
 

[ambari] branch branch-2.7 updated: Update support matrix for Ambari 2.7.0

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 95510c8  Update support matrix for Ambari 2.7.0
95510c8 is described below

commit 95510c8797878e0be221f7b16a7e422258a6d4c3
Author: Ishan Bhatt 
AuthorDate: Wed Jul 18 12:13:51 2018 -0700

Update support matrix for Ambari 2.7.0
---
 docs/src/site/apt/index.apt | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/src/site/apt/index.apt b/docs/src/site/apt/index.apt
index 5db96f6..8ba3e87 100644
--- a/docs/src/site/apt/index.apt
+++ b/docs/src/site/apt/index.apt
@@ -56,17 +56,19 @@ Getting Started with Ambari
 
   Note: Ambari currently supports the 64-bit version of the following 
Operating Systems:
 
-  * RHEL (Redhat Enterprise Linux) 6 and 7
+  * RHEL (Redhat Enterprise Linux) 7.4, 7.3, 7.2
 
-  * CentOS 6 and 7
+  * CentOS 7.4, 7.3, 7.2
 
-  * OEL (Oracle Enterprise Linux) 6 and 7
+  * OEL (Oracle Enterprise Linux) 7.4, 7.3, 7.2
 
-  * SLES (SuSE Linux Enterprise Server) 11
+  * Amazon Linux 2
 
-  * Ubuntu 12 and 14
+  * SLES (SuSE Linux Enterprise Server) 12 SP3, 12 SP2
 
-  * Debian 7
+  * Ubuntu 14 and 16
+
+  * Debian 9
 
 Get Involved
 

[ambari] branch trunk updated: Updating Ambari docs for Ambari 2.7.0

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 297a931  Updating Ambari docs for Ambari 2.7.0
297a931 is described below

commit 297a9315939fb9a4e05d2ff529d611173b4c1ad2
Author: Ishan Bhatt 
AuthorDate: Fri Jul 13 12:49:19 2018 -0700

Updating Ambari docs for Ambari 2.7.0
---
 docs/pom.xml|  2 +-
 docs/src/site/apt/index.apt |  2 +-
 docs/src/site/apt/whats-new.apt | 45 +
 docs/src/site/site.xml  |  2 ++
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 2f273d2..2b90e01 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
 4.0.0
 
 org.apache.ambari
-2.6.2
+2.7.0
 ambari
 pom
 
diff --git a/docs/src/site/apt/index.apt b/docs/src/site/apt/index.apt
index 65be00d..5db96f6 100644
--- a/docs/src/site/apt/index.apt
+++ b/docs/src/site/apt/index.apt
@@ -52,7 +52,7 @@ Introduction
 
 Getting Started with Ambari
 
-  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.6.2}
 installation guide for Ambari 2.6.2}}.
+  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.7.0}
 installation guide for Ambari 2.7.0}}.
 
   Note: Ambari currently supports the 64-bit version of the following 
Operating Systems:
 
diff --git a/docs/src/site/apt/whats-new.apt b/docs/src/site/apt/whats-new.apt
index 334dbfe..7bf5bf8 100644
--- a/docs/src/site/apt/whats-new.apt
+++ b/docs/src/site/apt/whats-new.apt
@@ -16,7 +16,43 @@
 
 What's New with Ambari?
 
-  * The latest release of Ambari is Ambari 2.6.2.
+  * The latest release of Ambari is Ambari 2.7.0.
+
+  * Ambari 2.7.0 added the following features:
+
+* The Ambari UI, Ambari Server, and Ambari Agent have been significantly 
reworked to more efficiently handle large cluster management
+
+* In order to more efficiently manage large clusters, the AMS schema has 
been updated, and metric aggregation has been improved.
+
+* Updated default configurations, and configuration recommendations to 
ensure AMS is tuned well out of the box.
+
+* Added support for easily adding and managing new HDFS namespaces.
+
+* Added support for managing ViewFS mount table configuration.
+
+* Added FreeIPA as a supported KDC implementation.
+
+* Added support for a new Isilon Management Pack that can be used to 
easily install HDP on an existing Isilon OneFS implementation.
+
+* Ambari Infra Solr now uses Solr 7.
+
+* Amazon Linux is now a supported deployment platform.
+
+* Commonly customized properties are now confgurable all in one place 
during the installation, making it much easier to quickly configure your 
installation.
+
+* Added the ability for teams to quickly see who initiated operations like 
Add Service, Add Host, Enable HA, etc.
+
+* Added the ability for teams to quickly see who performed operations like 
restarting services, etc.
+
+* Made it easier to find hosts when adding services to a large cluster 
with many components deployed to it.
+
+* Added the ability to bulk add and delete components to multiple hosts.
+
+* Added the ability to delete hosts in bulk.
+
+* Created a new API portal in the Ambari Server to quickly understand and 
try out the Ambari API. Navigate to http://ambari.server:8080/api-docs to view 
the portal.
+
+* Made it easer to setup SSO for Ambari, Atlas, and Ranger.
 
   * Ambari 2.6.2 added the following features:
 
@@ -28,13 +64,6 @@ What's New with Ambari?
 
 * Conditionally Install LZO packages through Ambari (AMBARI-22457)
 
-  * Ambari 2.6.0 added the following features:
-
-* Ambari Metrics System's (AMS) distributed mode with multiple Collectors 
(General Availability) (AMBARI-15901)
-
-* Improvements in Host Recovery (Restart only), moving masters with 
minimum impact and scale testing (AMBARI-21898, AMBARI-21929, AMBARI-21834)
-
-* Improvement in Data Archival & Purging in Ambari Infra (AMBARI-21810)
 
 Getting Ambari Source
 
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 67c4ede..db0f0dd 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -107,6 +107,7 @@
   https://cwiki.apache.org/confluence/display/AMBARI/Quick+Start+Guide"/>
   https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=30755705"/>
   https://github.com/apache/ambari/blob/trunk/ambari-server/docs/api/v1/index.md"/>
+  https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.7.0"/>
   https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.6.2"/>
   https://cwiki.apache.org/confluence/displa

[ambari] branch branch-2.7 updated: Updating Ambari docs for Ambari 2.7.0

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 7b76144  Updating Ambari docs for Ambari 2.7.0
7b76144 is described below

commit 7b7614421ef8736088b1a1fb8480a3ffc4c5dc74
Author: Ishan Bhatt 
AuthorDate: Fri Jul 13 12:49:19 2018 -0700

Updating Ambari docs for Ambari 2.7.0
---
 docs/pom.xml|  2 +-
 docs/src/site/apt/index.apt |  2 +-
 docs/src/site/apt/whats-new.apt | 45 +
 docs/src/site/site.xml  |  2 ++
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index b4847b6..72dc38d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
 4.0.0
 
 org.apache.ambari
-2.7.0.0.0
+2.7.0
 ambari
 pom
 
diff --git a/docs/src/site/apt/index.apt b/docs/src/site/apt/index.apt
index 65be00d..5db96f6 100644
--- a/docs/src/site/apt/index.apt
+++ b/docs/src/site/apt/index.apt
@@ -52,7 +52,7 @@ Introduction
 
 Getting Started with Ambari
 
-  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.6.2}
 installation guide for Ambari 2.6.2}}.
+  Follow the 
{{{https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.7.0}
 installation guide for Ambari 2.7.0}}.
 
   Note: Ambari currently supports the 64-bit version of the following 
Operating Systems:
 
diff --git a/docs/src/site/apt/whats-new.apt b/docs/src/site/apt/whats-new.apt
index 334dbfe..7bf5bf8 100644
--- a/docs/src/site/apt/whats-new.apt
+++ b/docs/src/site/apt/whats-new.apt
@@ -16,7 +16,43 @@
 
 What's New with Ambari?
 
-  * The latest release of Ambari is Ambari 2.6.2.
+  * The latest release of Ambari is Ambari 2.7.0.
+
+  * Ambari 2.7.0 added the following features:
+
+* The Ambari UI, Ambari Server, and Ambari Agent have been significantly 
reworked to more efficiently handle large cluster management
+
+* In order to more efficiently manage large clusters, the AMS schema has 
been updated, and metric aggregation has been improved.
+
+* Updated default configurations, and configuration recommendations to 
ensure AMS is tuned well out of the box.
+
+* Added support for easily adding and managing new HDFS namespaces.
+
+* Added support for managing ViewFS mount table configuration.
+
+* Added FreeIPA as a supported KDC implementation.
+
+* Added support for a new Isilon Management Pack that can be used to 
easily install HDP on an existing Isilon OneFS implementation.
+
+* Ambari Infra Solr now uses Solr 7.
+
+* Amazon Linux is now a supported deployment platform.
+
+* Commonly customized properties are now confgurable all in one place 
during the installation, making it much easier to quickly configure your 
installation.
+
+* Added the ability for teams to quickly see who initiated operations like 
Add Service, Add Host, Enable HA, etc.
+
+* Added the ability for teams to quickly see who performed operations like 
restarting services, etc.
+
+* Made it easier to find hosts when adding services to a large cluster 
with many components deployed to it.
+
+* Added the ability to bulk add and delete components to multiple hosts.
+
+* Added the ability to delete hosts in bulk.
+
+* Created a new API portal in the Ambari Server to quickly understand and 
try out the Ambari API. Navigate to http://ambari.server:8080/api-docs to view 
the portal.
+
+* Made it easer to setup SSO for Ambari, Atlas, and Ranger.
 
   * Ambari 2.6.2 added the following features:
 
@@ -28,13 +64,6 @@ What's New with Ambari?
 
 * Conditionally Install LZO packages through Ambari (AMBARI-22457)
 
-  * Ambari 2.6.0 added the following features:
-
-* Ambari Metrics System's (AMS) distributed mode with multiple Collectors 
(General Availability) (AMBARI-15901)
-
-* Improvements in Host Recovery (Restart only), moving masters with 
minimum impact and scale testing (AMBARI-21898, AMBARI-21929, AMBARI-21834)
-
-* Improvement in Data Archival & Purging in Ambari Infra (AMBARI-21810)
 
 Getting Ambari Source
 
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 67c4ede..db0f0dd 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -107,6 +107,7 @@
   https://cwiki.apache.org/confluence/display/AMBARI/Quick+Start+Guide"/>
   https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=30755705"/>
   https://github.com/apache/ambari/blob/trunk/ambari-server/docs/api/v1/index.md"/>
+  https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.7.0"/>
   https://cwiki.apache.org/confluence/display/AMBARI/Installation+Guide+for+Ambari+2.6.2"/>
   https://cwiki.apache.org/

[ambari] annotated tag release-2.7.0-rc0 updated (da4e607 -> e5f417d)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to annotated tag release-2.7.0-rc0
in repository https://gitbox.apache.org/repos/asf/ambari.git.


*** WARNING: tag release-2.7.0-rc0 was modified! ***

from da4e607  (commit)
  to e5f417d  (tag)
 tagging da4e607a48033ab1f359b3ace302fcf29d823e38 (commit)
  by Ishan Bhatt
  on Mon Jul 9 19:03:38 2018 -0700

- Log -
Ambari 2.7.0 RC0
---


No new revisions were added by this update.

Summary of changes:

[ambari] branch branch-2.7 updated: Revert "AMBARI-24270. Agent Status Command Are Randomly Failing With Empty stderr (aonishuk) (#1728)"

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new da4e607  Revert "AMBARI-24270. Agent Status Command Are Randomly 
Failing With Empty stderr (aonishuk) (#1728)"
da4e607 is described below

commit da4e607a48033ab1f359b3ace302fcf29d823e38
Author: Aravindan Vijayan 
AuthorDate: Mon Jul 9 15:40:07 2018 -0700

Revert "AMBARI-24270. Agent Status Command Are Randomly Failing With Empty 
stderr (aonishuk) (#1728)"

This reverts commit 219a23623349bc3715f6c667369477bd32ef1b0b.
---
 .../main/python/ambari_agent/ComponentStatusExecutor.py|  2 +-
 .../main/python/ambari_agent/CustomServiceOrchestrator.py  | 14 --
 .../src/main/python/ambari_agent/PythonExecutor.py | 11 ++-
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git 
a/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
index 65af9b0..5d20495 100644
--- a/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
@@ -136,7 +136,7 @@ class ComponentStatusExecutor(threading.Thread):
 if status == LiveStatus.DEAD_STATUS:
   stderr = component_status_result['stderr']
   if not "ComponentIsNotRunning" in stderr and not 
"ClientComponentHasNoStatus" in stderr:
-logger.info("Status command for {0} failed ({1}) 
:\n{2}".format(component_name, component_status_result, stderr))
+logger.info("Status command for {0} 
failed:\n{1}".format(component_name, stderr))
 
 result = {
   'serviceName': service_name,
diff --git 
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py 
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index bcb3e9b..51a0d59 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -326,7 +326,6 @@ class CustomServiceOrchestrator():
 
 try:
   command = self.generate_command(command_header)
-  logger.info("Generated command")
   script_type = command['commandParams']['script_type']
   script = command['commandParams']['script']
   timeout = int(command['commandParams']['command_timeout'])
@@ -340,8 +339,6 @@ class CustomServiceOrchestrator():
 command_name = command['roleCommand']
   else:
 task_id = 'status'
-
-  logger.info("[{0}]".format(task_id))
 
   if forced_command_name is not None:  # If not supplied as an argument
 command_name = forced_command_name
@@ -425,18 +422,11 @@ class CustomServiceOrchestrator():
 if log_out_files:
   script_params.append("-o")
 
-logger.info("[{0}] python_executor.run_file({1})".format(task_id, 
(py_file, script_params,
-   tmpoutfile, tmperrfile, timeout,
-   tmpstrucoutfile, self.map_task_to_process,
-   task_id, override_output_files, 
backup_log_files,
-   handle, log_info_on_failure)))
-   
 ret = python_executor.run_file(py_file, script_params,
tmpoutfile, tmperrfile, timeout,
tmpstrucoutfile, self.map_task_to_process,
task_id, override_output_files, 
backup_log_files = backup_log_files,
handle = handle, 
log_info_on_failure=log_info_on_failure)
-logger.info("[{0}] python_executor.run_file() returned {1}", task_id, 
ret)
 # Next run_file() invocations should always append to current output
 override_output_files = False
 if ret['exitcode'] != 0:
@@ -447,7 +437,6 @@ class CustomServiceOrchestrator():
 
   # if canceled and not background command
   if handle is None:
-logger.info("[{0}] canceled", task_id)
 cancel_reason = self.command_canceled_reason(task_id)
 if cancel_reason is not None:
   ret['stdout'] += cancel_reason
@@ -523,7 +512,6 @@ class CustomServiceOrchestrator():
  Exit code 0 means that component is running and any other exit code means 
that
  component is not running
 """
-logger.info("Requesting component status {0}".format(command_header))
 override_output_files=True # by default, we override status command output
 if logger.level == logging.DEBUG:
   override_output_files = False
@@ -531,8 +519,6 @@ class CustomServiceOrchestrator():
 res

[ambari] branch branch-2.7 updated: Updated Ambari version to 2.7.0.0.0

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 9d92d90  Updated Ambari version to 2.7.0.0.0
9d92d90 is described below

commit 9d92d90a9371da89618ed65ce213748acebf9777
Author: Ishan Bhatt 
AuthorDate: Mon Jul 9 13:41:29 2018 -0700

Updated Ambari version to 2.7.0.0.0
---
 ambari-admin/pom.xml| 4 ++--
 ambari-agent/pom.xml| 4 ++--
 ambari-funtest/pom.xml  | 4 ++--
 ambari-infra/ambari-infra-solr-plugin/pom.xml   | 2 +-
 ambari-metrics/ambari-metrics-assembly/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml| 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-grafana/pom.xml   | 2 +-
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-host-aggregator/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml   | 4 ++--
 ambari-metrics/pom.xml  | 2 +-
 ambari-project/pom.xml  | 4 ++--
 ambari-server/pom.xml   | 4 ++--
 ambari-utility/pom.xml  | 2 +-
 ambari-views/examples/calculator-view/pom.xml   | 4 ++--
 ambari-views/examples/cluster-view/pom.xml  | 6 +++---
 ambari-views/examples/favorite-view/pom.xml | 4 ++--
 ambari-views/examples/hello-servlet-view/pom.xml| 6 +++---
 ambari-views/examples/hello-spring-view/pom.xml | 6 +++---
 ambari-views/examples/helloworld-view/pom.xml   | 6 +++---
 ambari-views/examples/phone-list-upgrade-view/pom.xml   | 6 +++---
 ambari-views/examples/phone-list-view/pom.xml   | 4 ++--
 ambari-views/examples/pom.xml   | 4 ++--
 ambari-views/examples/property-validator-view/pom.xml   | 6 +++---
 ambari-views/examples/property-view/pom.xml | 6 +++---
 ambari-views/examples/restricted-view/pom.xml   | 4 ++--
 ambari-views/examples/simple-view/pom.xml   | 6 +++---
 ambari-views/pom.xml| 4 ++--
 ambari-web/pom.xml  | 4 ++--
 contrib/ambari-scom/ambari-scom-server/pom.xml  | 4 ++--
 contrib/ambari-scom/metrics-sink/pom.xml| 2 +-
 contrib/ambari-scom/pom.xml | 2 +-
 contrib/management-packs/microsoft-r_mpack/pom.xml  | 2 +-
 contrib/management-packs/pom.xml| 2 +-
 contrib/views/ambari-views-package/pom.xml  | 2 +-
 contrib/views/capacity-scheduler/pom.xml| 4 ++--
 contrib/views/commons/pom.xml   | 6 +++---
 contrib/views/files/pom.xml | 6 +++---
 contrib/views/pig/pom.xml   | 8 
 contrib/views/pom.xml   | 8 
 contrib/views/utils/pom.xml | 4 ++--
 contrib/views/wfmanager/pom.xml | 6 +++---
 docs/pom.xml| 4 ++--
 pom.xml | 2 +-
 49 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 281280a..3f03629 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.0.0.0-SNAPSHOT
+2.7.0.0.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.0.0.0-SNAPSHOT
+  2.7.0.0.0
   Admin control panel
   
 
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 3dfb385..c81bf48 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,13 +19,13 @@
   
 org.apache.ambari
 ambari-project
-2.0.0.0-SNAPSHOT
+2.7.0.0.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
-  2.0.0.0-SNAPSHOT
+  2.7.0.0.0
   Ambari Agent
   Ambari Agent
   
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 813afa7..d08ac8a 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -13,12 +13,12 @@
   
 org.apache.ambari
 ambari-project
-2.0.0.0-SNAPSHOT
+2.7.0.0.0
 ../ambari-project
   
   org.apache.ambari
   ambari-funtest
-  2.0.0.0-SNAPSHOT
+  2.7.0.0.0
   ${packagingFormat}
   Ambari Functional Tests
   Ambari

[ambari] branch trunk updated: Update KEYS. (ishanbha)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new c50056a  Update KEYS. (ishanbha)
c50056a is described below

commit c50056ae612164ff5cf3773128411b371229ff77
Author: Ishan Bhatt 
AuthorDate: Mon Jul 9 14:20:12 2018 -0700

Update KEYS. (ishanbha)
---
 KEYS | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/KEYS b/KEYS
index e38d9ac..1f30316 100644
--- a/KEYS
+++ b/KEYS
@@ -592,3 +592,38 @@ 
y98PGhV5I/D/lnMEmt0jiGBolpFHvFn7wdTXgebU0yng5w8XNFlNMwrj3NuTl+oF
 a2PUifxYEOeykKn4
 =id3i
 -END PGP PUBLIC KEY BLOCK-
+pub   rsa2048 2018-07-09 [SC] [expires: 2020-07-08]
+  561D640083511C434148B45C6AB46D7B4E0D7845
+uid   [ultimate] Ishan Bhatt 
+sub   rsa2048 2018-07-09 [E] [expires: 2020-07-08]
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQENBFtDtRoBCADHmvavRKXQt5eCS3qIojd00QEta5v0ZFze5iPK71FHxkBrAa29
+r9bZWh0dp80FdlOmpzOeyMblMGEi1LHI3mzC8/JoV5bvgdRtG7aZ6aWf3lkwdeCw
+XOuEe/HggSGDknlyZgPwRTu87nzzJLzfk5ks5tYbqv841/FtHOhMELXyqtKM5VFV
+mys53hIqtn+TeO5eJGIbpUw1mccafJRJgWv9Wf4tShKf4kGLAtU/r9/LxLoeQDYM
+mfVg4WCHHqJfNqXVvaQP+JnA/nBFsOA/0FVOJDr8Wk6knxryjs6Ag3oZQSbsSp7/
+pCTJFb2yHMxmjkMdn7UsLZykVPD+IsjKj7ypABEBAAG0IUlzaGFuIEJoYXR0IDxp
+c2hhbmJoYUBhcGFjaGUub3JnPokBVAQTAQgAPhYhBFYdZACDURxDQUi0XGq0bXtO
+DXhFBQJbQ7UaAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEGq0
+bXtODXhFQsYH/ROTnlj2eJCFbva33ehJBxPdakvdQaPK9MyqpAtgzD0h8tKjWiGB
+acB3CuRMqoeaunyUG7bNHIhPooAUh2UopyRxZjG12LeXw3YQCYs/U9Xy2ASYKzcE
+stGWy3hy61lZImyR/E5lnWxZ9oqQxxRQbVbvFhxom/GJO9y+cPaSApm3YiT9+SYT
+OCLU827SW+g2LOuAPKwt2FioKvin6MN1ayYcFx/1A/UTUjk7iZAl6hE7WQKAOK5o
+ACfe2AhQLX46alLwUZhNdkKkWEX8hbgMLAnnQWvaLKK739rOduLiRqOktY/xtRj6
+TLA3xW3u1fmVW70i+Kwujrn9tqiXHnDNs8S5AQ0EW0O1GgEIANH/P5rqXLIdoi+L
+ks3uawYQ7YhxkRx3U9eWvL+4zExOhcifkB5iTQSo35t0CMWvdug0T24HgJpQSYDQ
+z8wXJe3A64zsGKIXCsN5TuA4oBz8WwIYegHmj0V0HKUc/wbohtXcus/MGCZz08AU
+svaT26Z6u1/wtWlNRdi5uiy96Fj+AEwYICD3SoNcoSGy6EU+Ip/QiXUPcS/Odh59
+izzLyslKwxGKZaY7yp2mU4OySu2AooGzc6LlOora0JKHHHjHH4y57JI80KM5AG3U
+QBy2Hnpj84lNL3oxPzeYG03isMScKU/n0gFsRILUkWNMiPX6IvaF/q0tf1K9mi9f
+whtGH/EAEQEAAYkBPAQYAQgAJhYhBFYdZACDURxDQUi0XGq0bXtODXhFBQJbQ7Ua
+AhsMBQkDwmcAAAoJEGq0bXtODXhFyA0IALMFr9HxUryX9lT88MXAI/NwPnqjjekk
+vFg6JrPDJQLOW9SYiOJlM2Zkgu7aMIeQOHWKTw5QJnLQCnFHH8WXsTOiDgr9Ta4A
+pQ7IJ3gvmfBS3kX7VyQD248RvF1H/UxDypwXQnWLpciR22+aHzzr7H44zr9Vee7e
+ZERa8bo5TVmVYiUSCYXP78Afc7uecNe+66U+tpYiqr6nzGqk1pvS2TBfixnnh9Nl
+FWbAngFSPgG+I7FfGXDMK3MvU8zOK5X456WEfpWVNJPcQuLWp1qw6fJwnRU17BYe
+L6iR19lcaL2CweiBdUrORuWJsnb3WOLPD6RE8WIMWSOUniPgD2XvzRA=
+=4Crm
+-END PGP PUBLIC KEY BLOCK-

[ambari] branch branch-2.7 updated: Update KEYS. (ishanbha)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new 361ee31  Update KEYS. (ishanbha)
361ee31 is described below

commit 361ee315a22b7aca44546a4221103ca9e411ba7e
Author: Ishan Bhatt 
AuthorDate: Mon Jul 9 14:17:54 2018 -0700

Update KEYS. (ishanbha)
---
 KEYS | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/KEYS b/KEYS
index e38d9ac..1f30316 100644
--- a/KEYS
+++ b/KEYS
@@ -592,3 +592,38 @@ 
y98PGhV5I/D/lnMEmt0jiGBolpFHvFn7wdTXgebU0yng5w8XNFlNMwrj3NuTl+oF
 a2PUifxYEOeykKn4
 =id3i
 -END PGP PUBLIC KEY BLOCK-
+pub   rsa2048 2018-07-09 [SC] [expires: 2020-07-08]
+  561D640083511C434148B45C6AB46D7B4E0D7845
+uid   [ultimate] Ishan Bhatt 
+sub   rsa2048 2018-07-09 [E] [expires: 2020-07-08]
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQENBFtDtRoBCADHmvavRKXQt5eCS3qIojd00QEta5v0ZFze5iPK71FHxkBrAa29
+r9bZWh0dp80FdlOmpzOeyMblMGEi1LHI3mzC8/JoV5bvgdRtG7aZ6aWf3lkwdeCw
+XOuEe/HggSGDknlyZgPwRTu87nzzJLzfk5ks5tYbqv841/FtHOhMELXyqtKM5VFV
+mys53hIqtn+TeO5eJGIbpUw1mccafJRJgWv9Wf4tShKf4kGLAtU/r9/LxLoeQDYM
+mfVg4WCHHqJfNqXVvaQP+JnA/nBFsOA/0FVOJDr8Wk6knxryjs6Ag3oZQSbsSp7/
+pCTJFb2yHMxmjkMdn7UsLZykVPD+IsjKj7ypABEBAAG0IUlzaGFuIEJoYXR0IDxp
+c2hhbmJoYUBhcGFjaGUub3JnPokBVAQTAQgAPhYhBFYdZACDURxDQUi0XGq0bXtO
+DXhFBQJbQ7UaAhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEGq0
+bXtODXhFQsYH/ROTnlj2eJCFbva33ehJBxPdakvdQaPK9MyqpAtgzD0h8tKjWiGB
+acB3CuRMqoeaunyUG7bNHIhPooAUh2UopyRxZjG12LeXw3YQCYs/U9Xy2ASYKzcE
+stGWy3hy61lZImyR/E5lnWxZ9oqQxxRQbVbvFhxom/GJO9y+cPaSApm3YiT9+SYT
+OCLU827SW+g2LOuAPKwt2FioKvin6MN1ayYcFx/1A/UTUjk7iZAl6hE7WQKAOK5o
+ACfe2AhQLX46alLwUZhNdkKkWEX8hbgMLAnnQWvaLKK739rOduLiRqOktY/xtRj6
+TLA3xW3u1fmVW70i+Kwujrn9tqiXHnDNs8S5AQ0EW0O1GgEIANH/P5rqXLIdoi+L
+ks3uawYQ7YhxkRx3U9eWvL+4zExOhcifkB5iTQSo35t0CMWvdug0T24HgJpQSYDQ
+z8wXJe3A64zsGKIXCsN5TuA4oBz8WwIYegHmj0V0HKUc/wbohtXcus/MGCZz08AU
+svaT26Z6u1/wtWlNRdi5uiy96Fj+AEwYICD3SoNcoSGy6EU+Ip/QiXUPcS/Odh59
+izzLyslKwxGKZaY7yp2mU4OySu2AooGzc6LlOora0JKHHHjHH4y57JI80KM5AG3U
+QBy2Hnpj84lNL3oxPzeYG03isMScKU/n0gFsRILUkWNMiPX6IvaF/q0tf1K9mi9f
+whtGH/EAEQEAAYkBPAQYAQgAJhYhBFYdZACDURxDQUi0XGq0bXtODXhFBQJbQ7Ua
+AhsMBQkDwmcAAAoJEGq0bXtODXhFyA0IALMFr9HxUryX9lT88MXAI/NwPnqjjekk
+vFg6JrPDJQLOW9SYiOJlM2Zkgu7aMIeQOHWKTw5QJnLQCnFHH8WXsTOiDgr9Ta4A
+pQ7IJ3gvmfBS3kX7VyQD248RvF1H/UxDypwXQnWLpciR22+aHzzr7H44zr9Vee7e
+ZERa8bo5TVmVYiUSCYXP78Afc7uecNe+66U+tpYiqr6nzGqk1pvS2TBfixnnh9Nl
+FWbAngFSPgG+I7FfGXDMK3MvU8zOK5X456WEfpWVNJPcQuLWp1qw6fJwnRU17BYe
+L6iR19lcaL2CweiBdUrORuWJsnb3WOLPD6RE8WIMWSOUniPgD2XvzRA=
+=4Crm
+-END PGP PUBLIC KEY BLOCK-

[ambari] branch branch-2.7 updated: AMBARI-24237. UI Install: Custom Yarn Capacity Scheduler property set is missing after deploy. (jaimin) (#1665)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
 new e97f6df  AMBARI-24237. UI Install: Custom Yarn Capacity Scheduler 
property set is missing after deploy. (jaimin) (#1665)
e97f6df is described below

commit e97f6dfe3ea44eeed40cab682880b9e63f090f6e
Author: Jetly 
AuthorDate: Mon Jul 2 22:35:30 2018 -0700

AMBARI-24237. UI Install: Custom Yarn Capacity Scheduler property set is 
missing after deploy. (jaimin) (#1665)
---
 ambari-web/app/utils/config.js   |  6 +-
 ambari-web/test/utils/config_test.js | 18 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index b3ec9ad..8c05a9a 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -938,15 +938,18 @@ App.config = Em.Object.create({
*/
   textareaIntoFileConfigs: function (configs, filename) {
 var configsTextarea = configs.findProperty('name', 'capacity-scheduler');
+var stackConfigs = App.configsCollection.getAll();
 if (configsTextarea && !App.get('testMode')) {
   var properties = configsTextarea.get('value').split('\n');
 
   properties.forEach(function (_property) {
-var name, value;
+var name, value, isUserProperty;
 if (_property) {
   _property = _property.split(/=(.+)/);
   name = _property[0];
   value = (_property[1]) ? _property[1] : "";
+  isUserProperty = !stackConfigs.filterProperty('filename', 
'capacity-scheduler.xml').findProperty('name', name);
+
   configs.push(Em.Object.create({
 name: name,
 value: value,
@@ -956,6 +959,7 @@ App.config = Em.Object.create({
 isFinal: configsTextarea.get('isFinal'),
 isNotDefaultValue: configsTextarea.get('isNotDefaultValue'),
 isRequiredByAgent: configsTextarea.get('isRequiredByAgent'),
+isUserProperty: isUserProperty,
 group: null
   }));
 }
diff --git a/ambari-web/test/utils/config_test.js 
b/ambari-web/test/utils/config_test.js
index 2c7baf9..e242476 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -574,6 +574,18 @@ describe('App.config', function() {
   describe('#textareaIntoFileConfigs', function () {
 var res, cs;
 beforeEach(function () {
+  var stackConfigs = [
+Em.Object.create({
+  name: 'n1',
+  value: 'v1',
+  savedValue: 'v1',
+  serviceName: 'YARN',
+  filename: 'capacity-scheduler.xml',
+  isFinal: true,
+  group: null
+})
+  ];
+  sinon.stub(App.configsCollection, 'getAll').returns(stackConfigs);
   res = [
 Em.Object.create({
   name: 'n1',
@@ -582,6 +594,7 @@ describe('App.config', function() {
   serviceName: 'YARN',
   filename: 'capacity-scheduler.xml',
   isFinal: true,
+  isUserProperty: false,
   group: null
 }),
 Em.Object.create({
@@ -591,6 +604,7 @@ describe('App.config', function() {
   serviceName: 'YARN',
   filename: 'capacity-scheduler.xml',
   isFinal: true,
+  isUserProperty: true,
   group: null
 })
   ];
@@ -611,6 +625,10 @@ describe('App.config', function() {
   });
 });
 
+afterEach(function () {
+  App.configsCollection.getAll.restore();
+});
+
 it('generate capacity scheduler', function () {
   expect(App.config.textareaIntoFileConfigs([cs], 
'capacity-scheduler.xml')).to.eql(res);
 });

[ambari] branch trunk updated: [AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerbero… (#1643)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 5919d5d  [AMBARI-24210] Provide Button to Download CSV of Keytabs From 
Kerbero… (#1643)
5919d5d is described below

commit 5919d5d7de287a2b0ea1fa3b4a64c759d6f9b7a8
Author: Ishan Bhatt 
AuthorDate: Thu Jun 28 15:12:45 2018 -0700

[AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerbero… 
(#1643)

* [AMBARI-24210] Provide Button to Download CSV of Keytabs From Kerberos 
Section in the UI.

* Added spacing between Regenerate keytab icon and text
---
 ambari-web/app/controllers/main/admin/kerberos.js |  9 
 ambari-web/app/templates/main/admin/kerberos.hbs  | 56 +--
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ambari-web/app/controllers/main/admin/kerberos.js 
b/ambari-web/app/controllers/main/admin/kerberos.js
index c559398..ea0eca5 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -655,6 +655,15 @@ App.MainAdminKerberosController = 
App.KerberosWizardStep4Controller.extend({
 }).always(function() {
   self.set('isRecommendedLoaded', true);
 });
+  },
+
+  showDownloadCsv: function () {
+var hasUpgradePrivilege = 
App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK');
+return hasUpgradePrivilege;
+  }.property(),
+
+  downloadCSV: function() {
+App.router.get('kerberosWizardStep5Controller').getCSVData(false);
   }
 
 });
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs 
b/ambari-web/app/templates/main/admin/kerberos.hbs
index 0a0b330..e74a90c 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -18,24 +18,34 @@
 {{#if dataIsLoaded}}
   {{#if securityEnabled}}
 
-{{t admin.security.enabled}}
-{{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
-{{#if App.supports.enableToggleKerberos}}
-  {{t 
admin.kerberos.button.disable}} 
-  {{#unless isManualKerberos}}
-
-   {{t 
admin.kerberos.button.regenerateKeytabs}}
-{{#if App.isCredentialStorePersistent}}
-  {{t 
admin.kerberos.credentials.store.menu.label}}
-{{/if}}
-  {{/unless}}
-  
-  
-{{t common.edit}}
-  
+  {{t admin.security.enabled}}
+  {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
+{{#if App.supports.enableToggleKerberos}}
+  {{t 
admin.kerberos.button.disable}} 
+  {{#unless isManualKerberos}}
+
+   {{t 
admin.kerberos.button.regenerateKeytabs}}
+{{#if App.isCredentialStorePersistent}}
+  {{t 
admin.kerberos.credentials.store.menu.label}}
 {{/if}}
-{{/isAuthorized}}
+  {{/unless}}
+{{/if}}
+  {{/isAuthorized}}
+  {{#if showDownloadCsv}}
+
+   {{t 
admin.kerberos.wizard.step5.downloadCSV}}
+
+  {{/if}}
+  
+  {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
+{{#if App.supports.enableToggleKerberos}}
+  
+{{t common.edit}}
+  
+{{/if}}
+  {{/isAuthorized}}
 
 
   {{view App.ServicesConfigView}}
@@ -50,12 +60,12 @@
   {{else}}
 
   {{t admin.security.disabled}}
-  {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
-{{#if App.supports.enableToggleKerberos}}
-  {{t 
admin.kerberos.button.enable}} 
-  
-{{/if}}
-  {{/isAuthorized}}
+{{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
+  {{#if App.supports.enableToggleKerberos}}
+{{t 
admin.kerberos.button.enable}} 
+
+  {{/if}}
+{{/isAuthorized}}
   
 
   {{/if}}

[ambari] branch trunk updated: [AMBARI-24150] Install wizard stuck at Assign Slaves and Clients page.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new f858525  [AMBARI-24150] Install wizard stuck at Assign Slaves and 
Clients page.
f858525 is described below

commit f8585251be9bfe478ae63522829be766456e7e8c
Author: Ishan Bhatt 
AuthorDate: Tue Jun 19 23:12:42 2018 -0700

[AMBARI-24150] Install wizard stuck at Assign Slaves and Clients page.
---
 ambari-web/app/mappers/configs/themes_mapper.js  | 13 +++--
 ambari-web/app/mixins/common/configs/enhanced_configs.js |  4 ++--
 ambari-web/app/models/configs/theme/theme_condition.js   |  5 +
 ambari-web/test/mappers/configs/themes_mapper_test.js| 16 ++--
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ambari-web/app/mappers/configs/themes_mapper.js 
b/ambari-web/app/mappers/configs/themes_mapper.js
index 3eb72ce..a2519e2 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -144,7 +144,7 @@ App.themesMapper = App.QuickDataMapper.create({
 parsedSubSection.id = parsedSubSection.name + '_' + serviceName + '_' 
+ themeName;
 parsedSubSection.theme_name = themeName;
 
-this.loadSubSectionTabs(subSection, parsedSubSection);
+this.loadSubSectionTabs(subSection, parsedSubSection, themeName);
 if (parsedSubSection['depends_on']) {
   subSectionConditions.push(parsedSubSection);
 }
@@ -152,7 +152,7 @@ App.themesMapper = App.QuickDataMapper.create({
   }, this);
   if (subSectionConditions.length) {
 var type = 'subsection';
-this.mapThemeConditions(subSectionConditions, type);
+this.mapThemeConditions(subSectionConditions, type, themeName);
   }
   App.store.safeLoadMany(this.get("subSectionModel"), subSections);
   parsedSection.sub_sections = subSections.mapProperty("id");
@@ -160,7 +160,7 @@ App.themesMapper = App.QuickDataMapper.create({
   },
 
 
-  loadSubSectionTabs: function(subSection, parsedSubSection) {
+  loadSubSectionTabs: function(subSection, parsedSubSection, themeName) {
 if (subSection['subsection-tabs']) {
   var subSectionTabs = [];
   var subSectionTabConditions = [];
@@ -168,7 +168,7 @@ App.themesMapper = App.QuickDataMapper.create({
   subSection['subsection-tabs'].forEach(function (subSectionTab) {
 var parsedSubSectionTab = this.parseIt(subSectionTab, 
this.get("subSectionTabConfig"));
 parsedSubSectionTab.sub_section_id = parsedSubSection.id;
-parsedSubSectionTab.theme_name = parsedSubSection.theme_name;
+parsedSubSectionTab.theme_name = themeName;
 if (parsedSubSectionTab['depends_on']) {
   subSectionTabConditions.push(parsedSubSectionTab);
 }
@@ -177,7 +177,7 @@ App.themesMapper = App.QuickDataMapper.create({
   subSectionTabs[0].is_active = true;
   if (subSectionTabConditions.length) {
 var type = 'subsectionTab';
-this.mapThemeConditions(subSectionTabConditions, type);
+this.mapThemeConditions(subSectionTabConditions, type, themeName);
   }
   App.store.safeLoadMany(this.get("subSectionTabModel"), subSectionTabs);
   parsedSubSection.sub_section_tabs = subSectionTabs.mapProperty("id");
@@ -299,7 +299,7 @@ App.themesMapper = App.QuickDataMapper.create({
* @param subSections: Array
* @param type: {String} possible values: `subsection` or `subsectionTab`
*/
-  mapThemeConditions: function(subSections, type) {
+  mapThemeConditions: function(subSections, type, themeName) {
 var subSectionConditionsCopy = [];
 subSections.forEach(function(_subSection){
   var subSectionConditions = _subSection['depends_on'];
@@ -307,6 +307,7 @@ App.themesMapper = App.QuickDataMapper.create({
 var subSectionCondition = $.extend({},_subSectionCondition);
 subSectionCondition.id = _subSection.id + '_' + index;
 subSectionCondition.name = _subSection.name;
+subSectionCondition.theme_name = themeName;
 if (_subSectionCondition.configs && 
_subSectionCondition.configs.length) {
   subSectionCondition.configs = 
_subSectionCondition.configs.map(function (item) {
 var result = {};
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index cec9744..e8b0864 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -827,11 +827,11 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 let themeResource;
 if (subsectionCondition.get('type') === 'subsection') {
   themeResource = App.SubSecti

[ambari] branch trunk updated: [AMBARI-24142] Show/Hide config-section not working for Ranger and Ra… (#1577)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 9ff13b2  [AMBARI-24142] Show/Hide config-section not working for 
Ranger and Ra… (#1577)
9ff13b2 is described below

commit 9ff13b2d7c080ccd81ace1e70bd9a941032d8c55
Author: Ishan Bhatt 
AuthorDate: Tue Jun 19 08:33:36 2018 -0700

[AMBARI-24142] Show/Hide config-section not working for Ranger and Ra… 
(#1577)

* [AMBARI-24142] Show/Hide config-section not working for Ranger and Ranger 
KMS theme.

* fixed a typo

* Replaced contains with includes
---
 ambari-web/app/mappers/configs/themes_mapper.js   |  2 ++
 .../app/mixins/common/configs/enhanced_configs.js |  8 ++--
 ambari-web/app/models/configs/theme/sub_section.js|  5 +
 .../app/models/configs/theme/sub_section_tab.js   |  5 +
 ambari-web/test/mappers/configs/themes_mapper_test.js | 19 ---
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ambari-web/app/mappers/configs/themes_mapper.js 
b/ambari-web/app/mappers/configs/themes_mapper.js
index aa6e004..3eb72ce 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -142,6 +142,7 @@ App.themesMapper = App.QuickDataMapper.create({
 var parsedSubSection = this.parseIt(subSection, 
this.get("subSectionConfig"));
 parsedSubSection.section_id = parsedSection.id;
 parsedSubSection.id = parsedSubSection.name + '_' + serviceName + '_' 
+ themeName;
+parsedSubSection.theme_name = themeName;
 
 this.loadSubSectionTabs(subSection, parsedSubSection);
 if (parsedSubSection['depends_on']) {
@@ -167,6 +168,7 @@ App.themesMapper = App.QuickDataMapper.create({
   subSection['subsection-tabs'].forEach(function (subSectionTab) {
 var parsedSubSectionTab = this.parseIt(subSectionTab, 
this.get("subSectionTabConfig"));
 parsedSubSectionTab.sub_section_id = parsedSubSection.id;
+parsedSubSectionTab.theme_name = parsedSubSection.theme_name;
 if (parsedSubSectionTab['depends_on']) {
   subSectionTabConditions.push(parsedSubSectionTab);
 }
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 78e65a9..cec9744 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -826,9 +826,13 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
   if (valueAttributes && !Em.none(valueAttributes.visible)) {
 let themeResource;
 if (subsectionCondition.get('type') === 'subsection') {
-  themeResource = App.SubSection.find().findProperty('name', 
subsectionConditionName);
+  themeResource = App.SubSection.find().find(function (subsection) {
+return subsection.get('name') === subsectionConditionName && 
subsectionCondition.get('id').toLowerCase().includes(subsection.get('themeName').toLowerCase());
+  });
 } else if (subsectionCondition.get('type') === 'subsectionTab') {
-  themeResource = App.SubSectionTab.find().findProperty('name', 
subsectionConditionName);
+  themeResource = App.SubSectionTab.find().find(function 
(subsectionTab) {
+return subsectionTab.get('name') === subsectionConditionName && 
subsectionCondition.get('id').toLowerCase().includes(subsectionTab.get('themeName').toLowerCase());
+  });
 }
 themeResource.set('isHiddenByConfig', !valueAttributes.visible);
 themeResource.get('configs').setEach('hiddenBySection', 
!valueAttributes.visible);
diff --git a/ambari-web/app/models/configs/theme/sub_section.js 
b/ambari-web/app/models/configs/theme/sub_section.js
index 591a3e9..f32854b 100644
--- a/ambari-web/app/models/configs/theme/sub_section.js
+++ b/ambari-web/app/models/configs/theme/sub_section.js
@@ -28,6 +28,11 @@ App.SubSection = DS.Model.extend({
   name: DS.attr('string'),
 
   /**
+   * theme from which this is coming from , eg: default, database, 
credentials, etc.
+   */
+  themeName: DS.attr('string'),
+
+  /**
* @type {string}
*/
   displayName: DS.attr('string'),
diff --git a/ambari-web/app/models/configs/theme/sub_section_tab.js 
b/ambari-web/app/models/configs/theme/sub_section_tab.js
index 9062457..79cea52 100644
--- a/ambari-web/app/models/configs/theme/sub_section_tab.js
+++ b/ambari-web/app/models/configs/theme/sub_section_tab.js
@@ -28,6 +28,11 @@ App.SubSectionTab = DS.Model.extend({
   name: DS.attr('string'),
 
   /**
+   * theme from which this is coming from , eg: default, database, 
credentials, etc.
+   */
+  themeName: DS.attr('string'),
+
+  /*

[ambari] branch trunk updated: [AMBARI-24130] Ranger/Atlas Default Install Changes. (#1565)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 24244f6  [AMBARI-24130] Ranger/Atlas Default Install Changes. (#1565)
24244f6 is described below

commit 24244f68b138638c58ad9d180eea449a5ff99178
Author: Ishan Bhatt 
AuthorDate: Tue Jun 19 07:35:21 2018 -0700

[AMBARI-24130] Ranger/Atlas Default Install Changes. (#1565)

* [AMBARI-24130] Ranger/Atlas Default Install Changes.

* minor fixes
---
 .../app/controllers/wizard/step4_controller.js | 67 --
 ambari-web/app/messages.js |  4 +-
 .../configs/widgets/combo_config_widget_view.js| 26 -
 ambari-web/test/controllers/wizard/step4_test.js   | 60 +--
 4 files changed, 27 insertions(+), 130 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index d0bf657..767147d 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -88,33 +88,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({
   },
 
   /**
-   * Check whether Ranger is selected and show installation requirements if yes
-   * @param {function} callback
-   * @method rangerValidation
-   */
-  rangerValidation: function (callback) {
-var rangerService = this.findProperty('serviceName', 'RANGER');
-if (rangerService && !rangerService.get('isInstalled')) {
-  if(rangerService.get('isSelected')) {
-this.addValidationError({
-  id: 'rangerRequirements',
-  type: 'WARNING',
-  callback: this.rangerRequirementsPopup,
-  callbackParams: [callback]
-});
-  }
-  else {
-//Ranger is selected, remove the Ranger error from errorObject array
-var rangerError = 
this.get('errorStack').filterProperty('id',"rangerRequirements");
-if(rangerError)
-{
-   this.get('errorStack').removeObject(rangerError[0]);
-}
-  }
-}
-  },
-
-  /**
* Warn user if he tries to install Spark with HDP 2.2
* @param {function} callback
* @method sparkValidation
@@ -199,7 +172,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({
 this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR', 
'ambariAtlasInfraCheck', callback);
 this.dependentServiceValidation('ATLAS', 'HBASE', 'ambariAtlasHbaseCheck', 
callback);
 this.dependentServiceValidation('LOGSEARCH', 'AMBARI_INFRA_SOLR', 
'ambariLogsearchCheck', callback);
-this.rangerValidation(callback);
 this.sparkValidation(callback);
 if (!!this.get('errorStack').filterProperty('isShown', false).length) {
   var firstError = this.get('errorStack').findProperty('isShown', false);
@@ -574,45 +546,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({
   },
 
   /**
-   * Show popup with installation requirements for Ranger service
-   * @param {function} callback
-   * @param {string} id
-   * @return {App.ModalPopup}
-   * @method rangerRequirementsPopup
-   */
-  rangerRequirementsPopup: function (callback, id) {
-var self = this;
-return App.ModalPopup.show({
-  'data-qa': 'ranger-requirements-modal',
-  header: Em.I18n.t('installer.step4.rangerRequirements.popup.header'),
-  bodyClass: Em.View.extend({
-templateName: 
require('templates/wizard/step4/step4_ranger_requirements_popup')
-  }),
-  primary: Em.I18n.t('common.proceed'),
-  isChecked: false,
-  disablePrimary: function () {
-return !this.get('isChecked');
-  }.property('isChecked'),
-  onPrimary: function () {
-self.onPrimaryPopupCallback(callback);
-this.hide();
-  },
-  onSecondary: function () {
-if (callback) {
-  callback(id);
-}
-this._super();
-  },
-  onClose: function () {
-if (callback) {
-  callback(id);
-}
-this._super();
-  }
-});
-  },
-
-  /**
* Show popup with Spark installation warning
* @param {function} callback
* @param {string} id
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4686e66..d908f15 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -916,7 +916,7 @@ Em.I18n.translations = {
   'will need to collect configuration and logs manually for troubleshooting 
support cases. ' +
   'Are you sure you want to proceed without SmartSense?',
   'installer.step4.rangerCheck.popup.header': 'Apache Ranger',
-  'installer.step4.rangerCheck.popup.body':'Apache Ranger provides fine 
grained authorization and audit of access attempts for many Hadoop ecosystem 
services. If you do not install the Apache Ranger Service, the security of your 
cluster 

[ambari] branch trunk updated: [AMBARI-24107] Ranger & Atlas initial install require additional properties to be explicitly configured in the UI.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 264347c  [AMBARI-24107] Ranger & Atlas initial install require 
additional properties to be explicitly configured in the UI.
264347c is described below

commit 264347cdaf5a23ecb32a30f16f5fda25f9152fb5
Author: Ishan Bhatt 
AuthorDate: Thu Jun 14 12:34:08 2018 -0700

[AMBARI-24107] Ranger & Atlas initial install require additional properties 
to be explicitly configured in the UI.
---
 ambari-web/app/controllers/wizard/step4_controller.js |  4 +++-
 ambari-web/app/controllers/wizard/step7_controller.js | 14 +-
 ambari-web/app/messages.js|  8 ++--
 ambari-web/test/controllers/wizard/step4_test.js  |  6 +++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index ec57cac..d0bf657 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -195,7 +195,9 @@ App.WizardStep4Controller = Em.ArrayController.extend({
   this.serviceValidation(callback, 'RANGER', 'rangerCheck');
   this.serviceValidation(callback, 'ATLAS', 'atlasCheck');
 }
-this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR', 
'ambariInfraCheck', callback);
+this.dependentServiceValidation('RANGER', 'AMBARI_INFRA_SOLR', 
'ambariRangerInfraCheck', callback);
+this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR', 
'ambariAtlasInfraCheck', callback);
+this.dependentServiceValidation('ATLAS', 'HBASE', 'ambariAtlasHbaseCheck', 
callback);
 this.dependentServiceValidation('LOGSEARCH', 'AMBARI_INFRA_SOLR', 
'ambariLogsearchCheck', callback);
 this.rangerValidation(callback);
 this.sparkValidation(callback);
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 204d4be..8acdaf8 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -590,10 +590,16 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 }
 
 var rangerService = App.StackService.find().findProperty('serviceName', 
'RANGER');
-var isRangerServicePresent = rangerService && 
(rangerService.get('isInstalled') || rangerService.get('isSelected'));
+const isRangerServicePresent = rangerService && 
(rangerService.get('isInstalled') || rangerService.get('isSelected'));
+var infraSolrService = App.StackService.find().findProperty('serviceName', 
'AMBARI_INFRA_SOLR');
+const isInfraSolrPresent = infraSolrService && 
(infraSolrService.get('isInstalled') || infraSolrService.get('isSelected'));
 if(isRangerServicePresent && (this.get('wizardController.name') === 
'installerController' || this.get('wizardController.name') === 
'addServiceController')) {
   this.setRangerPluginsEnabled(serviceConfigs);
+  if (isInfraSolrPresent) {
+this.setSolrCloudOn(serviceConfigs);
+  }
 }
+
 this.set('stepConfigs', serviceConfigs);
 this.set('stepConfigsCreated', true);
 this.updateConfigAttributesFromThemes();
@@ -656,6 +662,12 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 });
   },
 
+  setSolrCloudOn: function(stepConfigs) {
+var rangerServiceConfigs = stepConfigs.findProperty('serviceName', 
'RANGER').get('configs');
+var solrCloudEnabledProperty = rangerServiceConfigs.findProperty('name', 
'is_solrCloud_enabled');
+Em.set(solrCloudEnabledProperty, 'value', 'true');
+  },
+
   /**
*
* Makes installed service's configs resulting into component actions 
(add/delete) non editable on Add Service Wizard
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index edf43f7..4686e66 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -902,8 +902,12 @@ Em.I18n.translations = {
   'installer.step4.limitedFunctionality.popup.header':'Limited Functionality 
Warning',
   'installer.step4.ambariMetricsCheck.popup.header': 'Ambari Metrics',
   'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects 
metrics from the cluster and makes them available to Ambari.  If you do not 
install Ambari Metrics service, metrics will not be accessible from Ambari.  
Are you sure you want to proceed without Ambari Metrics?',
-  'installer.step4.ambariInfraCheck.popup.header': 'Ambari Infra',
-  'installer.step4.ambariInfraCheck.popup.body':'Since Ambari Infra is not 
selected, you must supply your own Solr to make Atlas work. Are you sure you 
want to proceed?',
+  'installer.step4.ambariRan

[ambari] branch trunk updated: [AMBARI-24092] Need xpaths for content/textarea to be unique.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 85c544c  [AMBARI-24092] Need xpaths for content/textarea to be unique.
85c544c is described below

commit 85c544c118d6fd5b08aad5b826c2e224fd5c026d
Author: Ishan Bhatt 
AuthorDate: Wed Jun 13 08:20:04 2018 -0700

[AMBARI-24092] Need xpaths for content/textarea to be unique.
---
 ambari-web/app/views/common/controls_view.js | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 22ad28e..869cac7 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -201,7 +201,11 @@ App.WidgetValueObserver = 
Em.Mixin.create(App.ValueObserver, {
 App.ServiceConfigCalculateId = Ember.Mixin.create({
   'data-qa': Ember.computed(function () {
 const config = this.get('config') && this.get('config.widget') ? 
this.get('config') : this.get('serviceConfig') || {};
-return Em.get(config, 'name') || '';
+const configName = Em.get(config, 'name') || '';
+if (configName === 'content') {
+  return Em.get(config, 'id') || '';
+}
+return configName;
   })
 });
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-24065] Ranger Kms service smart config tab - KMS HSM not shown after upgraded to Ambari-2.7.0.0.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new c314c5b  [AMBARI-24065] Ranger Kms service smart config tab - KMS HSM 
not shown after upgraded to Ambari-2.7.0.0.
c314c5b is described below

commit c314c5b674e44a5a9b883c12f71edeb09f4f8085
Author: Ishan Bhatt 
AuthorDate: Fri Jun 8 10:47:47 2018 -0700

[AMBARI-24065] Ranger Kms service smart config tab - KMS HSM not shown 
after upgraded to Ambari-2.7.0.0.
---
 .../stacks/HDP/2.5/services/RANGER_KMS/themes/theme_version_2.json   | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/themes/theme_version_2.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/themes/theme_version_2.json
index be50dad..935b293 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/themes/theme_version_2.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/themes/theme_version_2.json
@@ -1,4 +1,5 @@
 {
+  "name": "default",
   "configuration": {
 "layouts": [
   {

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24033] Use servicegroup api instead of service to show installed services in the UI.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 4e4cbb2  [AMBARI-24033] Use servicegroup api instead of service to 
show installed services in the UI.
4e4cbb2 is described below

commit 4e4cbb2bdc362c23b42af1e7dcdaf7f4576eacae
Author: Ishan Bhatt 
AuthorDate: Mon Jun 4 17:17:04 2018 -0700

[AMBARI-24033] Use servicegroup api instead of service to show installed 
services in the UI.
---
 ambari-web/app/controllers/global/update_controller.js | 2 +-
 ambari-web/app/mappers/service_mapper.js   | 7 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 5f38eef..6f06ad2 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -544,7 +544,7 @@ App.UpdateController = Em.Controller.extend({
 
   updateServices: function (callback) {
 var testUrl = '/data/services/HDP2/services.json';
-var componentConfigUrl = this.getUrl(testUrl, 
'/services?fields=ServiceInfo/state,ServiceInfo/maintenance_state,components');
+var componentConfigUrl = this.getUrl(testUrl, 
'/servicegroups?fields=services/ServiceInfo/state,services/ServiceInfo/maintenance_state,services/components');
 App.HttpClient.get(componentConfigUrl, App.serviceMapper, {
   complete: callback
 });
diff --git a/ambari-web/app/mappers/service_mapper.js 
b/ambari-web/app/mappers/service_mapper.js
index 1d00d84..99d8adb 100644
--- a/ambari-web/app/mappers/service_mapper.js
+++ b/ambari-web/app/mappers/service_mapper.js
@@ -32,7 +32,12 @@ App.serviceMapper = App.QuickDataMapper.create({
 console.time("App.serviceMapper execution time");
 var self = this;
 var passiveStateMap = this.get('passiveStateMap');
-json.items.forEach(function (service) {
+var services = [];
+json.items.forEach(function (item) {
+  services = services.concat(item.services);
+});
+
+services.forEach(function (service) {
   if(!service.ServiceInfo.service_name.includes('CLIENT')) {
 var cachedService = 
App.cache['services'].findProperty('ServiceInfo.service_name', 
service.ServiceInfo.service_name);
 if (cachedService) {

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24039] Quicklinks for HBASE are not displayed.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 422628f  [AMBARI-24039] Quicklinks for HBASE are not displayed.
422628f is described below

commit 422628f24cf82adbc1107b3969da03fee2237f7d
Author: Ishan Bhatt 
AuthorDate: Tue Jun 5 11:29:21 2018 -0700

[AMBARI-24039] Quicklinks for HBASE are not displayed.
---
 ambari-web/app/styles/application.less  | 1 +
 ambari-web/app/templates/main/service/service.hbs   | 2 +-
 ambari-web/app/views/common/quick_view_link_view.js | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index ef7fe9b..f13c5cd 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2564,6 +2564,7 @@ a.abort-icon:hover {
 }
   }
   .mpack-summary {
+padding-bottom: 20px;
 .col-md-2 {
   top: 0;
 }
diff --git a/ambari-web/app/templates/main/service/service.hbs 
b/ambari-web/app/templates/main/service/service.hbs
index bcad6a8..517e9d7 100644
--- a/ambari-web/app/templates/main/service/service.hbs
+++ b/ambari-web/app/templates/main/service/service.hbs
@@ -20,7 +20,7 @@
   
 
   
-{{t common.mpack.short}}:
+{{t common.mpack.short}}
 {{view.mpackVersion}}
   
 
diff --git a/ambari-web/app/views/common/quick_view_link_view.js 
b/ambari-web/app/views/common/quick_view_link_view.js
index d49d3b7..7508b52 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -175,12 +175,14 @@ App.QuickLinksView = Em.View.extend({
*/
   loadQuickLinksConfigurations: function () {
 var serviceName = this.get('content.serviceName');
+let serviceStackName = App.StackService.find().findProperty('serviceName', 
serviceName).get('stackName');
+let serviceStackVersion = 
App.StackService.find().findProperty('serviceName', 
serviceName).get('stackVersion');
 return App.ajax.send({
   name: 'configs.quicklinksconfig',
   sender: this,
   data: {
 serviceName: serviceName,
-stackVersionUrl: App.get('stackVersionURL')
+stackVersionUrl: App.getStackVersionUrl(serviceStackName, 
serviceStackVersion)
   },
   success: 'loadQuickLinksConfigSuccessCallback'
 });

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23969] UI should load stack services from multiple mpacks. (#1403)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 4b4ee31  [AMBARI-23969] UI should load stack services from multiple 
mpacks. (#1403)
4b4ee31 is described below

commit 4b4ee31119eb9c88733ac66d15349c0b115f0edd
Author: Ishan Bhatt 
AuthorDate: Tue May 29 12:16:23 2018 -0700

[AMBARI-23969] UI should load stack services from multiple mpacks. (#1403)

* [AMBARI-23969] UI should load stack services from multiple mpacks.

* Removed stack version number
---
 .../app/controllers/global/cluster_controller.js   | 62 +++---
 ambari-web/app/mappers/stack_service_mapper.js | 11 +++-
 ambari-web/app/utils/ajax/ajax.js  |  5 ++
 .../controllers/global/cluster_controller_test.js  |  8 ++-
 4 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/ambari-web/app/controllers/global/cluster_controller.js 
b/ambari-web/app/controllers/global/cluster_controller.js
index 0763ab7..e20e96f 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -218,18 +218,38 @@ App.ClusterController = 
Em.Controller.extend(App.ReloadPopupMixin, {
   loadClusterDataToModel: function() {
 var self = this;
 
-this.loadStackServiceComponents(function (data) {
-  data.items.forEach(function (service) {
-service.StackServices.is_selected = true;
-service.StackServices.is_installed = false;
-  }, self);
-  App.stackServiceMapper.mapStackServices(data);
-  App.config.setPreDefinedServiceConfigs(true);
-  self.updateLoadStatus('stackComponents');
-  self.loadServicesAndComponents();
+App.ajax.send({
+  name: 'cluster.service.groups.get',
+  sender: this,
+  success: 'loadStackServices'
 });
   },
 
+  loadStackServices: function (data) {
+var stackUrls = [];
+var self = this;
+data.items.forEach((servicegroup) => {
+  var serviceStackName = servicegroup.ServiceGroupInfo.mpack_name;
+  var serviceStackVersion = servicegroup.ServiceGroupInfo.mpack_version;
+  stackUrls.push(App.getStackVersionUrl(serviceStackName, 
serviceStackVersion));
+});
+if (stackUrls.length) {
+  this.loadStackServiceComponents(stackUrls, function (stacksData) {
+stacksData.forEach(function (data) {
+  data.items.forEach(function (service) {
+service.StackServices.is_selected = true;
+service.StackServices.is_installed = false;
+  }, self);
+});
+
+App.stackServiceMapper.mapStackServices(stacksData);
+App.config.setPreDefinedServiceConfigs(true);
+self.updateLoadStatus('stackComponents');
+self.loadServicesAndComponents();
+  }, 0);
+}
+  },
+
   loadServicesAndComponents: function() {
 var updater = App.router.get('updateController');
 var self = this;
@@ -344,18 +364,24 @@ App.ClusterController = 
Em.Controller.extend(App.ReloadPopupMixin, {
* @param callback
* @returns {?object}
*/
-  loadStackServiceComponents: function (callback) {
-var callbackObj = {
-  loadStackServiceComponentsSuccess: callback
-};
-return App.ajax.send({
+
+  loadStackServiceComponents: function (stackUrls, callback, stackPosition) {
+var self = this;
+App.ajax.send({
   name: 'wizard.service_components',
   data: {
-stackUrl: App.get('stackVersionURL'),
-stackVersion: App.get('currentStackVersionNumber')
+stackUrl: stackUrls[stackPosition]
   },
-  sender: callbackObj,
-  success: 'loadStackServiceComponentsSuccess'
+  sender: this
+}).then(data => {
+  var stacksData = self.get('stacksData') || [];
+  stacksData.push(data);
+  self.set('stacksData', stacksData);
+  if (stacksData.length === stackUrls.length) {
+callback(stacksData);
+  } else {
+self.loadStackServiceComponents(stackUrls, callback, 
stacksData.length);
+  }
 });
   },
 
diff --git a/ambari-web/app/mappers/stack_service_mapper.js 
b/ambari-web/app/mappers/stack_service_mapper.js
index 9b55a05..a33bf65 100644
--- a/ambari-web/app/mappers/stack_service_mapper.js
+++ b/ambari-web/app/mappers/stack_service_mapper.js
@@ -75,12 +75,19 @@ App.stackServiceMapper = App.QuickDataMapper.create({
 }
   },
 
-  mapStackServices: function(json) {
+  mapStackServices: function(data) {
+// to support legacy  calls
+if (!Array.isArray(data)) {
+  data = [data];
+}
+var self = this;
 App.set('isStackServicesLoaded',false);
 this.clearStackModels();
 App.resetDsStoreTypeMap(App.StackServiceComponent);
 App.resetDsStoreTypeMap(App.StackService);
-this.map(json);
+data.forEach(function

[ambari] branch trunk updated: [AMBARI-23942] Invalid repo url displayed on Ambari UI during service… (#1364)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new a7ac282  [AMBARI-23942] Invalid repo url displayed on Ambari UI during 
service… (#1364)
a7ac282 is described below

commit a7ac282e4c6b26cad34eae7ccff4cf67260e407e
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Thu May 24 10:47:45 2018 -0700

[AMBARI-23942] Invalid repo url displayed on Ambari UI during service… 
(#1364)

* [AMBARI-23942] Invalid repo url displayed on Ambari UI during service 
installation

* remove commented out code
---
 ambari-web/app/controllers/wizard/step8_controller.js | 14 +++---
 ambari-web/test/controllers/wizard/step8_test.js  | 15 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 578c337..5fcb0cc 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -331,9 +331,17 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
*/
   loadRepoInfo: function () {
 var stackName = App.get('currentStackName');
-var currentStackVersionNumber = App.get('currentStackVersionNumber');
-var currentStackVersion = App.StackVersion.find().filterProperty('stack', 
stackName).findProperty('version', currentStackVersionNumber);
-var currentRepoVersion = 
currentStackVersion.get('repositoryVersion.repositoryVersion');
+
+var currentRepoVersion;
+App.RepositoryVersion.find().forEach(function (repoVersion) {
+  if (repoVersion.get('stackVersionType') === stackName && 
repoVersion.get('isCurrent') && repoVersion.get('isStandard')) {
+currentRepoVersion = repoVersion.get('repositoryVersion');
+  }
+});
+
+if (!currentRepoVersion) {
+  console.error('Error while getting current stack repository version');
+}
 
 return App.ajax.send({
   name: 'cluster.load_repo_version',
diff --git a/ambari-web/test/controllers/wizard/step8_test.js 
b/ambari-web/test/controllers/wizard/step8_test.js
index 790b807..7512e08 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -653,21 +653,16 @@ describe('App.WizardStep8Controller', function () {
   describe('#loadRepoInfo', function() {
 
 beforeEach(function () {
-  var stubForGet = sinon.stub(App, 'get');
-  stubForGet.withArgs('currentStackName').returns('HDP');
-  stubForGet.withArgs('currentStackVersionNumber').returns('2.3');
-  sinon.stub(App.StackVersion, 'find', function() {
-return [
-  Em.Object.create({state: 'NOT_CURRENT', stack: 'HDP', version: 
'2.3', repositoryVersion: {repositoryVersion: '2.3.0.0-2208'}})
-];
-  });
+  var stubForGet = sinon.stub(App, 
'get').withArgs('currentStackName').returns('HDP');
+  this.mockRepo = sinon.stub(App.RepositoryVersion, 'find');
 });
 
 afterEach(function () {
   App.get.restore();
-  App.StackVersion.find.restore();
+  App.RepositoryVersion.find.restore();
 });
-it('should use current StackVersion', function() {
+it('should return repo', function() {
+  this.mockRepo.returns([Em.Object.create({stackVersionType: 'HDP', 
isCurrent: true, isStandard: true, repositoryVersion: '2.3.0.0-2208'})])
   installerStep8Controller.loadRepoInfo();
   var args = testHelpers.findAjaxRequest('name', 
'cluster.load_repo_version');
   expect(args[0].data).to.eql({stackName: 'HDP', repositoryVersion: 
'2.3.0.0-2208'});

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23908] Change config layout for service tabs in installer.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 06e4a3a  [AMBARI-23908] Change config layout for service tabs in 
installer.
06e4a3a is described below

commit 06e4a3a93809a08b1c158f25872532a13fe1e9f3
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Fri May 18 14:14:21 2018 -0700

[AMBARI-23908] Change config layout for service tabs in installer.
---
 ambari-web/app/styles/application.less  | 1 +
 ambari-web/app/styles/service_configurations.less   | 1 +
 ambari-web/app/styles/wizard.less   | 6 ++
 ambari-web/app/templates/common/configs/service_config_wizard.hbs   | 2 +-
 ambari-web/app/templates/common/configs/services_config.hbs | 2 +-
 .../app/views/common/configs/service_configs_by_category_view.js| 2 +-
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index fc1c51e..406bca1 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2295,6 +2295,7 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 }
 
 .tab-content.service-config-tab-content {
+  clear: both;
   overflow: visible;
   .enhanced-config-tab-content {
 overflow: visible;
diff --git a/ambari-web/app/styles/service_configurations.less 
b/ambari-web/app/styles/service_configurations.less
index 8a575c6..8307880 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -165,6 +165,7 @@
   }
 
   .common-config-category {
+clear: both;
 .icon-repeat {
   color: #cbcbcb;
   padding: 5px 10px;
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index 3be7652..63a2763 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -882,6 +882,10 @@
 }
   }
 
+  .installer-all-configs-notifications {
+float: right;
+margin-top: 25px;
+  }
   .notifications-group {
 #notifications-dropdown {
   padding: 10px;
@@ -962,6 +966,8 @@
 
 .one-row-tabs-container {
   padding: 5px 10px;
+  width: 95%;
+  float: left;
   .left-arrow, .right-arrow {
 float: left;
 text-align: center;
diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs 
b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
index 078703c..045a1ca 100644
--- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
@@ -80,7 +80,7 @@
 
 {{#if view.supportsConfigLayout}}
   {{#unless view.hideTabHeaders}}
-
+
   {{#each tab in view.tabs}}
 {{#unless tab.isHidden}}
   
diff --git a/ambari-web/app/templates/common/configs/services_config.hbs 
b/ambari-web/app/templates/common/configs/services_config.hbs
index b578191..8b9abf9 100644
--- a/ambari-web/app/templates/common/configs/services_config.hbs
+++ b/ambari-web/app/templates/common/configs/services_config.hbs
@@ -62,7 +62,7 @@
 {{/if}}
 {{#if controller.isInstallWizard}}
   {{#if issuesCounter}}
-
+
   
 
 
diff --git 
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js 
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index ff4d63e..5af921c 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -25,7 +25,7 @@ App.ServiceConfigsByCategoryView = 
Em.View.extend(App.Persist, App.ConfigOverrid
 
   templateName: require('templates/common/configs/service_config_category'),
 
-  classNames: ['panel-group', 'common-config-category'],
+  classNames: ['panel-group', 'common-config-category', 'clear'],
 
   classNameBindings: ['isShowBlock::hidden'],
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23884] Remove webhcat server as co-hosted component for Hive.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new d11c2b6  [AMBARI-23884] Remove webhcat server as co-hosted component 
for Hive.
d11c2b6 is described below

commit d11c2b6c36bb1b45cc1aebf43faa3aab41dd9bf4
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Thu May 17 12:42:46 2018 -0700

[AMBARI-23884] Remove webhcat server as co-hosted component for Hive.
---
 ambari-web/app/models/stack_service_component.js   | 4 +---
 ambari-web/test/models/stack_service_component_test.js | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ambari-web/app/models/stack_service_component.js 
b/ambari-web/app/models/stack_service_component.js
index 9b029ea..29f06a2 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -234,6 +234,4 @@ App.StackServiceComponent = DS.Model.extend({
 
 App.StackServiceComponent.FIXTURES = [];
 
-App.StackServiceComponent.coHost = {
-  'WEBHCAT_SERVER': 'HIVE_SERVER'
-};
+App.StackServiceComponent.coHost = {};
diff --git a/ambari-web/test/models/stack_service_component_test.js 
b/ambari-web/test/models/stack_service_component_test.js
index 6182c0a..69613e2 100644
--- a/ambari-web/test/models/stack_service_component_test.js
+++ b/ambari-web/test/models/stack_service_component_test.js
@@ -249,8 +249,8 @@ var componentPropertiesValidationTests = [
   isMasterAddableInstallerWizard: false,
   isHAComponentOnly: false,
   isRequiredOnAllHosts: false,
-  coHostedComponents: ['WEBHCAT_SERVER'],
-  isOtherComponentCoHosted: true,
+  coHostedComponents: [],
+  isOtherComponentCoHosted: false,
   isCoHostedComponent: false
 }
   },

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23830] Enable Ranger Plugins for supported components if ranger is installed.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new a8d4829  [AMBARI-23830] Enable Ranger Plugins for supported components 
if ranger is installed.
a8d4829 is described below

commit a8d48299aed34e45dc42bc9638e305c7684d32a2
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Fri May 11 18:08:46 2018 -0700

[AMBARI-23830] Enable Ranger Plugins for supported components if ranger is 
installed.
---
 .../app/controllers/wizard/step7_controller.js | 30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 745c73d..8c52163 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -588,12 +588,17 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 serviceConfigs = this._reconfigureServicesOnNnHa(serviceConfigs);
   }
 }
+
+var rangerService = App.StackService.find().findProperty('serviceName', 
'RANGER');
+var isRangerServicePresent = rangerService && 
(rangerService.get('isInstalled') || rangerService.get('isSelected'));
+if(isRangerServicePresent && (this.get('wizardController.name') === 
'installerController' || this.get('wizardController.name') === 
'addServiceController')) {
+  this.setRangerPluginsEnabled(serviceConfigs);
+}
 this.set('stepConfigs', serviceConfigs);
 this.set('stepConfigsCreated', true);
 this.checkHostOverrideInstaller();
 this.selectProperService();
 var isInstallerWizard = (this.get("content.controllerName") === 
'installerController');
-var rangerService = App.StackService.find().findProperty('serviceName', 
'RANGER');
 var isRangerServiceAbsent =  rangerService && 
!rangerService.get('isInstalled') && !rangerService.get('isSelected');
 if (isRangerServiceAbsent) {
   var isExternalRangerSetup;
@@ -628,6 +633,29 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   },
 
   /**
+  * Sets the value of ranger--plugin-enabled to "Yes" if ranger 
authorization /
+  * is supported for that service.
+  * @param stepConfigs Object[]
+  */
+  setRangerPluginsEnabled: function(stepConfigs) {
+var rangerServiceConfigs = stepConfigs.findProperty('serviceName', 
'RANGER').get('configs');
+var services = this.get('selectedServiceNames').filter(service => service 
!= 'RANGER');
+
+services.forEach(function(serviceName) {
+  var pluginEnabledPropertyName = 'ranger-' + serviceName.toLowerCase() + 
'-plugin-enabled';
+  var pluginEnabledProperty = rangerServiceConfigs.findProperty('name', 
pluginEnabledPropertyName);
+  //Kafka and Storm plugins need to be enabled only if cluster is 
kerberized
+  if (pluginEnabledProperty && (serviceName === 'STORM' || serviceName === 
'KAFKA')) {
+if (App.get('isKerberosEnabled')) {
+  Em.set(pluginEnabledProperty, 'value', 'Yes');
+}
+  } else if (pluginEnabledProperty) {
+Em.set(pluginEnabledProperty, 'value', 'Yes');
+  }
+});
+  },
+
+  /**
*
* Makes installed service's configs resulting into component actions 
(add/delete) non editable on Add Service Wizard
* @param configs Object[]

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23839] Show Limited Functionality warning for Ranger and Atlas during installer wizard.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 4c09f53  [AMBARI-23839] Show Limited Functionality warning for Ranger 
and Atlas during installer wizard.
4c09f53 is described below

commit 4c09f532d421fdf15d2ba872cea49bfff3bbd577
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon May 14 17:02:18 2018 -0700

[AMBARI-23839] Show Limited Functionality warning for Ranger and Atlas 
during installer wizard.
---
 .../app/controllers/wizard/step4_controller.js |  9 +++-
 ambari-web/app/messages.js |  9 
 .../step4/step4_service_validation_popup.hbs   | 19 +
 ambari-web/test/controllers/wizard/step4_test.js   | 48 --
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step4_controller.js 
b/ambari-web/app/controllers/wizard/step4_controller.js
index 5f9eea2..ec57cac 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -192,6 +192,8 @@ App.WizardStep4Controller = Em.ArrayController.extend({
 if (this.get('wizardController.name') === 'installerController') {
   this.serviceValidation(callback, 'AMBARI_METRICS', 'ambariMetricsCheck');
   this.serviceValidation(callback, 'SMARTSENSE', 'smartSenseCheck');
+  this.serviceValidation(callback, 'RANGER', 'rangerCheck');
+  this.serviceValidation(callback, 'ATLAS', 'atlasCheck');
 }
 this.dependentServiceValidation('ATLAS', 'AMBARI_INFRA_SOLR', 
'ambariInfraCheck', callback);
 this.dependentServiceValidation('LOGSEARCH', 'AMBARI_INFRA_SOLR', 
'ambariLogsearchCheck', callback);
@@ -542,7 +544,12 @@ App.WizardStep4Controller = Em.ArrayController.extend({
 var self = this;
 return App.ModalPopup.show({
   header: Em.I18n.t('installer.step4.limitedFunctionality.popup.header'),
-  body: Em.I18n.t('installer.step4.' + id + '.popup.body'),
+  //body: Em.I18n.t('installer.step4.' + id + '.popup.body'),
+  bodyClass: Em.View.extend({
+serviceHeader: Em.I18n.t('installer.step4.' + id + '.popup.header'),
+serviceBody: Em.I18n.t('installer.step4.' + id + '.popup.body'),
+templateName: 
require('templates/wizard/step4/step4_service_validation_popup')
+  }),
   primary: Em.I18n.t('common.proceedAnyway'),
   primaryClass: 'btn-warning',
   onPrimary: function () {
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 69db174..52861bd 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -901,13 +901,22 @@ Em.I18n.translations = {
   'installer.step4.serviceCheck.popup.body.multiOptions':'You did not select 
{0}, but it is needed by other services you selected. Select a compatible 
service from the following list: {1}',
   'installer.step4.hcfs.displayName':'a Hadoop Compatible File System',
   'installer.step4.limitedFunctionality.popup.header':'Limited Functionality 
Warning',
+  'installer.step4.ambariMetricsCheck.popup.header': 'Ambari Metrics',
   'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects 
metrics from the cluster and makes them available to Ambari.  If you do not 
install Ambari Metrics service, metrics will not be accessible from Ambari.  
Are you sure you want to proceed without Ambari Metrics?',
+  'installer.step4.ambariInfraCheck.popup.header': 'Ambari Infra',
   'installer.step4.ambariInfraCheck.popup.body':'Since Ambari Infra is not 
selected, you must supply your own Solr to make Atlas work. Are you sure you 
want to proceed?',
+  'installer.step4.ambariLogsearchCheck.popup.header': 'Ambari Logsearch',
   'installer.step4.ambariLogsearchCheck.popup.body':'Since Ambari Infra is not 
selected, you must supply your own Solr to make Log Search work. Are you sure 
you want to proceed?',
+  'installer.step4.smartSenseCheck.popup.header': 'Apache SmartSense',
   'installer.step4.smartSenseCheck.popup.body':'SmartSense securely collects 
cluster diagnostics in order to send you recommendations and automate analysis 
for ' +
   'troubleshooting support cases. If you choose not to install SmartSense, you 
will not receive any recommendations, and you ' +
   'will need to collect configuration and logs manually for troubleshooting 
support cases. ' +
   'Are you sure you want to proceed without SmartSense?',
+  'installer.step4.rangerCheck.popup.header': 'Apache Ranger',
+  'installer.step4.rangerCheck.popup.body':'Apache Ranger provides fine 
grained authorization and audit of access attempts for many Hadoop ecosystem 
services. If you do not install the Apache Ranger Service, the security of your 
cluster will be diminished. Are you sure you want to proceed without it? ',
+  'installer.step4.atlasCheck.popup.

[ambari] branch trunk updated: [AMBARI-23796] Allow Ranger and Ranger KMS installation via the Install Wizard.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 5fea707  [AMBARI-23796] Allow Ranger and Ranger KMS installation via 
the Install Wizard.
5fea707 is described below

commit 5fea707389964c0625e5c8d2369aab409131a343
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue May 8 15:41:42 2018 -0700

[AMBARI-23796] Allow Ranger and Ranger KMS installation via the Install 
Wizard.
---
 ambari-web/app/controllers/wizard/step7_controller.js | 5 -
 ambari-web/app/models/stack_service.js| 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index bfda293..745c73d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -1852,7 +1852,10 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 
   selectService: function (event) {
 this.set('selectedService', event.context);
-this.get('tabs').findProperty('isActive', true).set('selectedServiceName', 
event.context.serviceName);
+var activeTabs = this.get('tabs').findProperty('isActive', true);
+if (activeTabs) {
+  activeTabs.set('selectedServiceName', event.context.serviceName);
+}
   },
 
   /**
diff --git a/ambari-web/app/models/stack_service.js 
b/ambari-web/app/models/stack_service.js
index 2bd5217..aa48e17 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -215,9 +215,6 @@ App.StackService = DS.Model.extend({
 if(!App.supports.installGanglia) {
   skipServices.push('GANGLIA');
 }
-if(App.router.get('clusterInstallCompleted') != true){
-  skipServices.push('RANGER', 'RANGER_KMS');
-}
 return skipServices.contains(this.get('serviceName'));
   }.property('serviceName'),
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23771] Customize Services - Alignment between Final/Set Recommended buttons and text boxes not proper in new tabs

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 1dea194  [AMBARI-23771] Customize Services - Alignment between 
Final/Set Recommended buttons and text boxes not proper in new tabs
1dea194 is described below

commit 1dea1945b910230c462a04ef9c8eeb166b5ad588
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Fri May 4 18:59:21 2018 -0700

[AMBARI-23771] Customize Services - Alignment between Final/Set Recommended 
buttons and text boxes not proper in new tabs
---
 ambari-web/app/styles/service_configurations.less  |  7 
 ambari-web/app/styles/wizard.less  | 16 
 .../app/templates/common/configs/controls.hbs  |  4 +-
 .../templates/common/configs/widgets/controls.hbs  |  2 +-
 .../configs/widgets/controls/create_override.hbs   |  2 +-
 .../common/configs/widgets/controls/edit.hbs   |  2 +-
 .../configs/widgets/controls/remove_override.hbs   |  2 +-
 .../configs/widgets/controls/set_recommended.hbs   |  2 +-
 .../common/configs/widgets/config_widget_view.js   |  4 +-
 .../configs/widgets/config_widget_view_test.js | 44 +++---
 10 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/ambari-web/app/styles/service_configurations.less 
b/ambari-web/app/styles/service_configurations.less
index 6f36bf8..8a575c6 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -164,6 +164,13 @@
 line-height: 20px;
   }
 
+  .common-config-category {
+.icon-repeat {
+  color: #cbcbcb;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+  }
   .enhanced-config-tab-content {
 .action {
   display: inline-block;
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index 74e596a..52695f5 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -952,7 +952,14 @@
   .config-actions {
 margin-right: 10px;
   }
+  .widget-config-raw {
+display: inline;
+  }
+  .widget-action {
+display: inline !important;
+  }
   .widget-config-controls {
+float: none;
 a, .show {
   display: inline !important;
 }
@@ -962,6 +969,15 @@
   }
 }
 
+#databases {
+  .widget-action {
+display: inline !important;
+  }
+  .widget-config-controls {
+float: none;
+  }
+}
+
 #databases, #all-configurations {
   .config-section {
 border: none;
diff --git a/ambari-web/app/templates/common/configs/controls.hbs 
b/ambari-web/app/templates/common/configs/controls.hbs
index 84e50ad..e17ff2d 100644
--- a/ambari-web/app/templates/common/configs/controls.hbs
+++ b/ambari-web/app/templates/common/configs/controls.hbs
@@ -49,10 +49,10 @@
 
   {{/if}}
   {{#if view.showSetRecommended}}
-
-  
+  
 
   {{/if}}
 {{/if}}
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs 
b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index c8adee5..478079e 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -21,7 +21,7 @@
 
 {{#if view.supportSwitchToTextBox}}
   {{#unless view.isPropertyUndefined}}
-
+
   {{view App.PlainConfigTextField
 isVisibleBinding="view.config.showAsTextBox"
 sectionBinding="view.section"
diff --git 
a/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs 
b/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
index 71dde7d..d37ad08 100644
--- 
a/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
+++ 
b/ambari-web/app/templates/common/configs/widgets/controls/create_override.hbs
@@ -18,7 +18,7 @@
 
 {{#if view.overrideAllowed}}
   {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
-
+
   
diff --git a/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs 
b/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
index ac3cef9..3b02de1 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls/edit.hbs
@@ -20,7 +20,7 @@
   {{#if view.isWidgetViewAllowed}}
 
 
   {{else}}
diff --git 
a/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs 
b/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
index 53b7fc2..c1c5c78 100644
--- 
a/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
+++ 
b/ambari-web/app/templates/common/configs/widgets/controls/remove_override.hbs
@@ -19,7 +19,7 @@
 {{#unless view.isOriginalSCP}}
   {{#unless view.disabled}}
 {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}
-  
 
diff --

[ambari] branch trunk updated: [AMBARI-23772] Background Ops modal breaks in some cases (#1187)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new eec1244  [AMBARI-23772] Background Ops modal breaks in some cases 
(#1187)
eec1244 is described below

commit eec1244109e88fb280f1bd05989ed6edb5198e6a
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Sat May 5 14:42:04 2018 -0400

[AMBARI-23772] Background Ops modal breaks in some cases (#1187)
---
 ambari-web/app/templates/common/host_progress_popup.hbs | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs 
b/ambari-web/app/templates/common/host_progress_popup.hbs
index b95079c..ec36333 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -89,18 +89,18 @@
 
   
   {{/each}}
-
-  {{#if view.isPaginate}}
-
+{{/if}}
+  
+{{#if view.isPaginate}}
+  
 
   
 {{view App.PaginationView}}
   
 
-
-  {{/if}}
-
+  
 {{/if}}
+  
 {{#if view.isShowMore}}
   {{t hostPopup.serviceInfo.showMore}}
   

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23737] JS error adding Ranger to a cluster (#1146)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 23febb1  [AMBARI-23737] JS error adding Ranger to a cluster (#1146)
23febb1 is described below

commit 23febb1e9cfa10e26c657f09265ac9bf32e6a4a4
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue May 1 15:04:52 2018 -0400

[AMBARI-23737] JS error adding Ranger to a cluster (#1146)
---
 ambari-web/app/controllers/wizard/step7_controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 30131a8..bfda293 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -1097,7 +1097,8 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
* @method selectProperService
*/
   selectProperService: function () {
-var tabSelectedServiceName = this.get('tabs').findProperty('isActive', 
true).get('selectedServiceName');
+var activeTab = this.get('tabs').findProperty('isActive', true);
+var tabSelectedServiceName = activeTab ? 
activeTab.get('selectedServiceName') : null;
 var lastSelectedService = tabSelectedServiceName ? 
this.get('stepConfigs').findProperty('serviceName', tabSelectedServiceName) : 
null
 if(tabSelectedServiceName && lastSelectedService) {
   this.set('selectedService', lastSelectedService);

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23734] Customize Services - Tooltip issues on Accounts Tab and All Configuration Tabs (#1143)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 5c28f91  [AMBARI-23734] Customize Services - Tooltip issues on 
Accounts Tab and All Configuration Tabs (#1143)
5c28f91 is described below

commit 5c28f9106cb9e2a88bd9e65ddf75e2aaa7e77ab0
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue May 1 11:49:22 2018 -0400

[AMBARI-23734] Customize Services - Tooltip issues on Accounts Tab and All 
Configuration Tabs (#1143)
---
 ambari-web/app/styles/bootstrap_overrides.less | 1 +
 ambari-web/app/templates/wizard/step7/accounts_tab.hbs | 2 +-
 ambari-web/app/views/common/controls_view.js   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/styles/bootstrap_overrides.less 
b/ambari-web/app/styles/bootstrap_overrides.less
index e8e7cc2..51c7088 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -31,6 +31,7 @@ select.form-control {
 }
 
 .popover {
+  word-wrap: break-word;  
   small {
 font-size: 1.3rem;
   }
diff --git a/ambari-web/app/templates/wizard/step7/accounts_tab.hbs 
b/ambari-web/app/templates/wizard/step7/accounts_tab.hbs
index 8ff0cb9..d4f0fe8 100644
--- a/ambari-web/app/templates/wizard/step7/accounts_tab.hbs
+++ b/ambari-web/app/templates/wizard/step7/accounts_tab.hbs
@@ -38,7 +38,7 @@
 {{property.displayName}}
 
   
-{{view property.viewClass serviceConfigBinding="property" 
fullWidth=true}}
+{{view property.viewClass serviceConfigBinding="property" 
fullWidth=true isPopoverEnabled="false"}}
   
 
   
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index afece2f..22ad28e 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -250,6 +250,7 @@ App.ServiceConfigTextFieldUserGroupWithID = 
Ember.View.extend(App.ServiceConfigP
   valueBinding: 'serviceConfig.value',
   placeholderBinding: 'serviceConfig.savedValue',
   classNamesBindings: 'view.fullWidth::display-inline-block',
+  isPopoverEnabled: 'false',
 
   fullWidth: false,
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23711] Customize Services - The selected service/Modified con… (#1117)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 05bc12d  [AMBARI-23711] Customize Services - The selected 
service/Modified con… (#1117)
05bc12d is described below

commit 05bc12d4590970017575bb1b51f144219fd055bd
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Apr 30 12:55:07 2018 -0400

[AMBARI-23711] Customize Services - The selected service/Modified con… 
(#1117)

* [AMBARI-23711] Customize Services - The selected service/Modified 
configurations are not remembered when navigating away/to the configuration 
tabs.

* Removed logger
---
 ambari-web/app/controllers/wizard.js   | 11 ++--
 .../app/controllers/wizard/step7_controller.js | 16 ++-
 ambari-web/app/messages.js |  2 +-
 ambari-web/app/routes/add_host_routes.js   |  9 +-
 ambari-web/app/routes/add_service_routes.js| 17 ---
 ambari-web/app/routes/installer.js |  6 ++--
 .../app/views/wizard/step7/directories_tab_view.js |  8 +-
 ambari-web/app/views/wizard/step7_view.js  |  1 +
 ambari-web/test/controllers/wizard/step7_test.js   | 33 +-
 9 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/ambari-web/app/controllers/wizard.js 
b/ambari-web/app/controllers/wizard.js
index eb1de68..979806a 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -238,9 +238,11 @@ App.WizardController = 
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
 if (this.get('isStepDisabled').findProperty('step', step).get('value') !== 
false) {
   return false;
 }
+var currentStep = this.get('currentStep');
+var currentControllerName = this.get('content.controllerName');
 // if going back from Step 9 in Install Wizard, delete the checkpoint so 
that the user is not redirected
 // to Step 9
-if (this.get('content.controllerName') === 'installerController' && 
this.get('currentStep') === '9' && step < 9) {
+if (currentControllerName === 'installerController' && currentStep === '9' 
&& step < 9) {
   App.clusterStatus.setClusterStatus({
 clusterName: this.get('clusterName'),
 clusterState: 'CLUSTER_NOT_CREATED_1',
@@ -248,7 +250,12 @@ App.WizardController = 
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
 localdb: {}
   });
 }
-if ((this.get('currentStep') - step) > 1 && !disableNaviWarning) {
+var isCustomizeServicesStep = false;
+if ((currentControllerName === 'installerController' && currentStep === 
'7') || ((currentControllerName === 'addServiceController'|| 
currentControllerName === 'addHostController' ) && currentStep === '4')) {
+  isCustomizeServicesStep = true;
+}
+var stepDiff = currentStep - step;
+if (!disableNaviWarning && (stepDiff  > 1 || (isCustomizeServicesStep && 
stepDiff > 0))) {
   App.ModalPopup.show({
 header: Em.I18n.t('installer.navigation.warning.header'),
 onPrimary: function () {
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 855817d..30131a8 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -360,6 +360,10 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 this.get('filterColumns').setEach('selected', false);
   },
 
+  clearLastSelectedService: function () {
+
this.get('tabs').filterProperty('selectedServiceName').setEach('selectedServiceName',
 null);
+  },
+
   /**
* Generate "finger-print" for current stepConfigs[0]
* Used to determine, if user has some unsaved changes (comparing with 
hash)
@@ -1087,12 +1091,17 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   },
 
   /**
+   * Select previously selected service if not within the tab for the first 
time
* Select first addable service for addServiceWizard
* Select first service at all in other cases
* @method selectProperService
*/
   selectProperService: function () {
-if (this.get('wizardController.name') === 'addServiceController') {
+var tabSelectedServiceName = this.get('tabs').findProperty('isActive', 
true).get('selectedServiceName');
+var lastSelectedService = tabSelectedServiceName ? 
this.get('stepConfigs').findProperty('serviceName', tabSelectedServiceName) : 
null
+if(tabSelectedServiceName && lastSelectedService) {
+  this.set('selectedService', lastSelectedService);
+} else if (this.get('wizardController.name') === 'addServiceController') 

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23629] Review calls GET, PUT, DELETE for Host components and … (#1055)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 58381cf  [AMBARI-23629] Review calls GET, PUT, DELETE for Host 
components and … (#1055)
58381cf is described below

commit 58381cfe4c1f81d92e9bb79e8669c6a3b71ffd49
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue Apr 24 14:22:38 2018 -0400

[AMBARI-23629] Review calls GET, PUT, DELETE for Host components and … 
(#1055)

* [AMBARI-23629] Review calls GET, PUT, DELETE for Host components and make 
sure that we call them with ID as endpoint instead of name.

* Fixed all the test failures caused by this change
---
 .../app/controllers/global/update_controller.js|  1 +
 .../nameNode/rollbackHA/step2_controller.js|  3 ++-
 .../nameNode/rollback_controller.js|  6 ++---
 .../highAvailability/nameNode/step4_controller.js  |  3 ++-
 .../highAvailability/nameNode/step5_controller.js  |  2 +-
 .../highAvailability/nameNode/step6_controller.js  |  3 ++-
 .../highAvailability/nameNode/step9_controller.js  |  2 +-
 .../main/admin/kerberos/step6_controller.js|  2 +-
 ambari-web/app/controllers/main/host/details.js| 12 +
 .../app/controllers/main/service/info/summary.js   |  3 ++-
 .../main/service/reassign/step4_controller.js  | 31 --
 .../main/service/reassign/step6_controller.js  | 29 +++-
 .../main/service/reassign/step7_controller.js  |  4 +--
 ambari-web/app/mappers/service_metrics_mapper.js   |  1 +
 .../details/host_components/decommissionable.js|  2 +-
 .../details/host_components/install_component.js   |  2 +-
 .../details/support_client_configs_download.js |  3 ++-
 .../configs/component_actions_by_configs.js|  3 ++-
 .../mixins/wizard/wizardProgressPageController.js  |  4 +--
 ambari-web/app/models/host_component.js|  1 +
 ambari-web/app/utils/ajax/ajax.js  | 22 +++
 .../details/host_component_views/datanode_view.js  |  3 ++-
 .../info/metrics/flume/flume_metric_graph.js   |  4 +--
 .../info/metrics/flume/flume_metric_graphs.js  |  3 ++-
 .../nameNode/step4_controller_test.js  |  5 +++-
 .../nameNode/step5_controller_test.js  |  4 ++-
 .../nameNode/step6_controller_test.js  |  5 +++-
 .../nameNode/step9_controller_test.js  |  4 ++-
 .../main/admin/kerberos/step6_controller_test.js   |  3 ++-
 .../test/controllers/main/host/details_test.js | 24 +
 .../main/service/reassign/step4_controller_test.js | 20 ++
 .../main/service/reassign/step6_controller_test.js | 13 ++---
 .../main/service/reassign/step7_controller_test.js | 22 +--
 .../host_components/install_component_test.js  |  4 +--
 .../configs/component_actions_by_configs_test.js   |  4 ++-
 .../host_component_views/datanode_view_test.js |  8 +++---
 .../host_component_views/decommissionable_test.js  |  4 +--
 37 files changed, 176 insertions(+), 93 deletions(-)

diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 6c3b0eb..8bf96ed 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -485,6 +485,7 @@ App.UpdateController = Em.Controller.extend({
 'host_components/HostRoles/display_name,' +
 'host_components/HostRoles/host_name,' +
 'host_components/HostRoles/public_host_name,' +
+'host_components/HostRoles/component_name,' +
 'host_components/HostRoles/state,' +
 'host_components/HostRoles/maintenance_state,' +
 'host_components/HostRoles/stale_configs,' +
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollbackHA/step2_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollbackHA/step2_controller.js
index 6aa8274..60d2876 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollbackHA/step2_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollbackHA/step2_controller.js
@@ -27,7 +27,8 @@ App.RollbackHighAvailabilityWizardStep2Controller = 
App.HighAvailabilityWizardSt
   name: 'admin.high_availability.getNnCheckPointStatus',
   sender: this,
   data: {
-hostName: hostName
+hostName: hostName,
+nameNodeId: App.HostComponent.find().findProperty('componentName', 
'NAMENODE').get('compId')
   },
   success: 'checkNnCheckPointStatus'
 });
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvaila

[ambari] branch trunk updated: [AMBARI-23626] Progress bar is missing in UI during package install

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new ee83224  [AMBARI-23626] Progress bar is missing in UI during package 
install
ee83224 is described below

commit ee8322485add35d97335ae4c9235d2c177d5af31
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Thu Apr 19 10:33:31 2018 -0700

[AMBARI-23626] Progress bar is missing in UI during package install
---
 .../app/views/main/admin/stack_upgrade/upgrade_version_box_view.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index c0786a3..65189f6 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -173,7 +173,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
   element.set('action', 'confirmRevertPatchUpgrade');
   element.set('actionText', Em.I18n.t('common.revert'));
 }
-else if (['INSTALLING', 'CURRENT'].contains(status) && 
!this.get('content.isPatch')) {
+else if (['INSTALLING', 'CURRENT'].contains(status)) {
   element.setProperties(statePropertiesMap[status]);
 }
 else if (status === 'NOT_REQUIRED') {

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23606] Lifecycle-Bulk: Components can be added even when ambari agent is down. (#1034)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 3ecdc55  [AMBARI-23606] Lifecycle-Bulk: Components can be added even 
when ambari agent is down. (#1034)
3ecdc55 is described below

commit 3ecdc55e9031e3c7a22e5c8479dd0d976e6d0f86
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Thu Apr 19 10:01:23 2018 -0400

[AMBARI-23606] Lifecycle-Bulk: Components can be added even when ambari 
agent is down. (#1034)
---
 ambari-web/app/controllers/main/host/bulk_operations_controller.js | 5 +++--
 ambari-web/app/messages.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ambari-web/app/controllers/main/host/bulk_operations_controller.js 
b/ambari-web/app/controllers/main/host/bulk_operations_controller.js
index b64f598..43c1dfd 100644
--- a/ambari-web/app/controllers/main/host/bulk_operations_controller.js
+++ b/ambari-web/app/controllers/main/host/bulk_operations_controller.js
@@ -503,11 +503,12 @@ App.BulkOperationsController = Em.Controller.extend({
 var allHostsWithComponent = data.items.mapProperty('Hosts.host_name');
 var hostsWithComponent = [];
 hosts.forEach(function (host) {
-  if(allHostsWithComponent.contains(host.hostName)) {
+  var noHeartBeat = App.Host.find().findProperty('hostName', 
host.hostName).get('isNotHeartBeating');
+  if(allHostsWithComponent.contains(host.hostName) || noHeartBeat) {
 hostsWithComponent.push(Em.Object.create({
   error: {
 key: host.hostName,
-message: 
Em.I18n.t('hosts.bulkOperation.confirmation.add.component.skip').format(operationData.componentNameFormatted)
+message: noHeartBeat ? 
Em.I18n.t('hosts.bulkOperation.confirmation.add.component.noHeartBeat.skip') : 
Em.I18n.t('hosts.bulkOperation.confirmation.add.component.skip').format(operationData.componentNameFormatted)
   },
   isCollapsed: true,
   isBodyVisible: Em.computed.ifThenElse('isCollapsed', 'display: 
none;', 'display: block;')
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5dd9057..dce6f2b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2694,6 +2694,7 @@ Em.I18n.translations = {
   'hosts.bulkOperation.host_components.passiveState.nothingToDo.body':'All 
host components that you selected are already in Maintenance Mode',
   'hosts.bulkOperation.confirmation.add.component':'{0} will be added to the 
following hosts.',
   'hosts.bulkOperation.confirmation.add.component.skip':'{0} already 
installed.',
+  'hosts.bulkOperation.confirmation.add.component.noHeartBeat.skip':'Host 
heartbeat lost',
   'hosts.bulkOperation.confirmation.add.component.nothingToDo.body': 'All the 
selected hosts have {0} installed already.',
   'hosts.bulkOperation.confirmation.cannot.add1': 'The following hosts will be 
skipped (expand for reason):',
   'hosts.bulkOperation.confirmation.cannot.add2': '{0} cannot be added to the 
following hosts (expand for reason):',

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23582] UI reads service versions from base stack repo (#1006) (#1019)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new f24f152  [AMBARI-23582] UI reads service versions from base stack repo 
(#1006) (#1019)
f24f152 is described below

commit f24f152782c31b8c5757cbd88ce4d317dad7069d
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Apr 16 22:57:38 2018 -0400

[AMBARI-23582] UI reads service versions from base stack repo (#1006) 
(#1019)

* [AMBARI-23582] UI reads service versions from base stack repo

* Added an extra test
---
 .../main/admin/stack_and_upgrade_controller.js |  62 ++---
 .../main/admin/stack_upgrade/services_view.js  |  13 +-
 .../admin/stack_and_upgrade_controller_test.js | 275 +++--
 3 files changed, 240 insertions(+), 110 deletions(-)

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 50c0902..805e09c 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
@@ -2186,41 +2186,45 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 newWindow.focus();
   },
 
-  /**
-   * load version for services to display on Choose Services page
-   * should load from VersionDefinition endpoint
-   */
-  loadServiceVersionFromVersionDefinitions: function () {
-return App.ajax.send({
-  name: 'cluster.load_current_repo_stack_services',
-  sender: this,
-  data: {
-clusterName: App.get('clusterName')
-  },
-  success: 'loadServiceVersionFromVersionDefinitionsSuccessCallback',
-  error: 'loadServiceVersionFromVersionDefinitionsErrorCallback'
-});
-  },
-
   serviceVersionsMap: {},
 
   /**
-   * @param {object|null} jsonData
+   * load version for services to display on admin service page
+   * it should be fetched from the repo which corresponds to the 
desiredRepositoryVersionId of the service
*/
-  loadServiceVersionFromVersionDefinitionsSuccessCallback: function (jsonData) 
{
-var rv = Em.getWithDefault(jsonData, 'items', []).filter(function(i) {
-  return Em.getWithDefault(i, 'ClusterStackVersions.stack', null) === 
App.get('currentStackName') &&
-   Em.getWithDefault(i, 'ClusterStackVersions.version', null) === 
App.get('currentStackVersionNumber');
-})[0];
+  getServiceVersionFromRepo: function () {
+
+var currentStackName = App.get('currentStackName');
+var currentStackVersionNumber = App.get('currentStackVersionNumber');
 var map = this.get('serviceVersionsMap');
-var stackServices = Em.getWithDefault(rv || {}, 
'repository_versions.0.RepositoryVersions.stack_services', false);
-if (stackServices) {
-  stackServices.forEach(function (item) {
-map[item.name] = item.versions[0];
+
+var stackServices = App.StackService.find().filter(function (service) {
+  return service.get('stackName') === currentStackName && 
service.get('stackVersion') === currentStackVersionNumber;
+});
+
+stackServices.forEach(function (service) {
+  var serviceName = service.get('serviceName');
+
+  var installedService = App.Service.find().findProperty('serviceName', 
serviceName);
+  var desiredRepositoryVersionId = installedService ? 
installedService.get('desiredRepositoryVersionId') : null;
+  var serviceVersion = "";
+  var currentStackRepoVersions = 
App.RepositoryVersion.find().filter(function (repoVersion) {
+return repoVersion.get('stackVersionType') === currentStackName && 
repoVersion.get('stackVersionNumber') === currentStackVersionNumber;
   });
-}
-  },
 
-  loadServiceVersionFromVersionDefinitionsErrorCallback: function (request, 
ajaxOptions, error) {}
+  //Get service version from the current standard repo for stack services 
which are not installed else search by id
+  if(!desiredRepositoryVersionId) {
+currentStackRepoVersions.forEach(function(repoVersion) {
+  if(repoVersion.get('isCurrent') && repoVersion.get('isStandard')) {
+serviceVersion = 
repoVersion.get('stackServices').findProperty('name', 
serviceName).get('latestVersion');
+  }
+})
+  } else {
+var repoVersion = currentStackRepoVersions.findProperty('id', 
desiredRepositoryVersionId);
+serviceVersion = repoVersion.get('stackServices').findProperty('name', 
serviceName).get('latestVersion');
+  }
+  map[serviceName] = serviceVersion;
+});
+  }.observes('App.router.clusterController.isLoaded')
 
 });
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/services_view.j

[ambari] branch branch-2.6 updated: [AMBARI-23582] UI reads service versions from base stack repo (#1006)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new 982da77  [AMBARI-23582] UI reads service versions from base stack repo 
(#1006)
982da77 is described below

commit 982da77f25f6522a751ad8a027ecee1a45a45bb6
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Apr 16 11:18:23 2018 -0400

[AMBARI-23582] UI reads service versions from base stack repo (#1006)

* [AMBARI-23582] UI reads service versions from base stack repo

* Added an extra test
---
 .../main/admin/stack_and_upgrade_controller.js |  62 ++---
 .../main/admin/stack_upgrade/services_view.js  |  13 +-
 .../admin/stack_and_upgrade_controller_test.js | 275 +++--
 3 files changed, 240 insertions(+), 110 deletions(-)

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 fc2c7bc..2ba21b5 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
@@ -2162,41 +2162,45 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 newWindow.focus();
   },
 
-  /**
-   * load version for services to display on Choose Services page
-   * should load from VersionDefinition endpoint
-   */
-  loadServiceVersionFromVersionDefinitions: function () {
-return App.ajax.send({
-  name: 'cluster.load_current_repo_stack_services',
-  sender: this,
-  data: {
-clusterName: App.get('clusterName')
-  },
-  success: 'loadServiceVersionFromVersionDefinitionsSuccessCallback',
-  error: 'loadServiceVersionFromVersionDefinitionsErrorCallback'
-});
-  },
-
   serviceVersionsMap: {},
 
   /**
-   * @param {object|null} jsonData
+   * load version for services to display on admin service page
+   * it should be fetched from the repo which corresponds to the 
desiredRepositoryVersionId of the service
*/
-  loadServiceVersionFromVersionDefinitionsSuccessCallback: function (jsonData) 
{
-var rv = Em.getWithDefault(jsonData, 'items', []).filter(function(i) {
-  return Em.getWithDefault(i, 'ClusterStackVersions.stack', null) === 
App.get('currentStackName') &&
-   Em.getWithDefault(i, 'ClusterStackVersions.version', null) === 
App.get('currentStackVersionNumber');
-})[0];
+  getServiceVersionFromRepo: function () {
+
+var currentStackName = App.get('currentStackName');
+var currentStackVersionNumber = App.get('currentStackVersionNumber');
 var map = this.get('serviceVersionsMap');
-var stackServices = Em.getWithDefault(rv || {}, 
'repository_versions.0.RepositoryVersions.stack_services', false);
-if (stackServices) {
-  stackServices.forEach(function (item) {
-map[item.name] = item.versions[0];
+
+var stackServices = App.StackService.find().filter(function (service) {
+  return service.get('stackName') === currentStackName && 
service.get('stackVersion') === currentStackVersionNumber;
+});
+
+stackServices.forEach(function (service) {
+  var serviceName = service.get('serviceName');
+
+  var installedService = App.Service.find().findProperty('serviceName', 
serviceName);
+  var desiredRepositoryVersionId = installedService ? 
installedService.get('desiredRepositoryVersionId') : null;
+  var serviceVersion = "";
+  var currentStackRepoVersions = 
App.RepositoryVersion.find().filter(function (repoVersion) {
+return repoVersion.get('stackVersionType') === currentStackName && 
repoVersion.get('stackVersionNumber') === currentStackVersionNumber;
   });
-}
-  },
 
-  loadServiceVersionFromVersionDefinitionsErrorCallback: function (request, 
ajaxOptions, error) {}
+  //Get service version from the current standard repo for stack services 
which are not installed else search by id
+  if(!desiredRepositoryVersionId) {
+currentStackRepoVersions.forEach(function(repoVersion) {
+  if(repoVersion.get('isCurrent') && repoVersion.get('isStandard')) {
+serviceVersion = 
repoVersion.get('stackServices').findProperty('name', 
serviceName).get('latestVersion');
+  }
+})
+  } else {
+var repoVersion = currentStackRepoVersions.findProperty('id', 
desiredRepositoryVersionId);
+serviceVersion = repoVersion.get('stackServices').findProperty('name', 
serviceName).get('latestVersion');
+  }
+  map[serviceName] = serviceVersion;
+});
+  }.observes('App.router.clusterController.isLoaded')
 
 });
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
index 25

[ambari] branch trunk updated: [AMBARI-23487] Cannot tell which services are in maintenance mode. (#909)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new d49f54d  [AMBARI-23487] Cannot tell which services are in maintenance 
mode. (#909)
d49f54d is described below

commit d49f54d9773f6b0e1243008a1b08fad35ab5c65e
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue Apr 10 12:59:30 2018 -0400

[AMBARI-23487] Cannot tell which services are in maintenance mode. (#909)
---
 ambari-web/app/messages.js  | 1 +
 ambari-web/app/styles/application.less  | 8 +++-
 ambari-web/app/styles/common.less   | 1 +
 ambari-web/app/templates/main/service/menu_item.hbs | 3 +++
 ambari-web/app/views/main/menu.js   | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0c243bb..70cc8d7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2044,6 +2044,7 @@ Em.I18n.translations = {
   'services.service.summary.hiveserver2.jdbc.url.text': ' JDBC URL',
   'services.service.summary.hiveserver2.endpoint.tooltip.text':'JDBC 
connection string for {0}',
   
'services.service.summary.hiveserver2.endpoint.value':'jdbc:hive2://{0}/;serviceDiscoveryMode={1};zooKeeperNamespace={2}',
+  'services.service.summary.inMaintenanceMode.tooltip': 'Service is in 
maintenance mode',
   'services.service.actions.downloadClientConfigs':'Download Client Configs',
   'services.service.actions.downloadClientConfigs.fail.noConfigFile':'No 
configuration files defined for the component',
   'services.service.actions.downloadClientConfigs.fail.popup.header':'{0} 
Configs',
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 49eef8a..312486a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1173,10 +1173,16 @@ a.services-menu-blocks{
 word-break:break-word;
   }
 
-  .glyphicon.glyphicon-refresh {
+  .glyphicon.glyphicon-refresh, .icon-medkit {
 margin-left: 4px;
 margin-right: 4px;
+top: 0px;
   }
+
+  .icon-medkit {
+color: @maintenance-grey;
+  }
+
   .menu-item-name.INSTALLED:not(.client-only-service) {
 color: @health-status-red;
   }
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index fbcdc9a..e892522 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -29,6 +29,7 @@
 @health-status-yellow: #FFD13D;
 @health-status-orange: #e98a41;
 @maintenance-black: #000;
+@maintenance-grey: #99;
 @gray-text: #666;
 /
 * Health status(service/host/host component health)icon colors ends
diff --git a/ambari-web/app/templates/main/service/menu_item.hbs 
b/ambari-web/app/templates/main/service/menu_item.hbs
index 8ccefcc..72280d0 100644
--- a/ambari-web/app/templates/main/service/menu_item.hbs
+++ b/ambari-web/app/templates/main/service/menu_item.hbs
@@ -20,6 +20,9 @@
   
 
   
+  
+
+  
   {{#if view.content.alertsCount}}
 
   {{/if}}
diff --git a/ambari-web/app/views/main/menu.js 
b/ambari-web/app/views/main/menu.js
index 3f61d9a..d243a41 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -176,11 +176,13 @@ App.SideNavServiceMenuView = Em.CollectionView.extend({
 this.renderOnRoute();
 App.tooltip(this.$(".restart-required-service"), {html:true, 
placement:"right"});
 App.tooltip($("[rel='serviceHealthTooltip']"), {html:true, 
placement:"right"});
+App.tooltip(this.$(".passive-state-service"), {html: true, placement: 
"top"});
   },
 
   willDestroyElement: function() {
 App.router.location.removeObserver('lastSetURL', this, 'renderOnRoute');
 this.$(".restart-required-service").tooltip('destroy');
+this.$(".passive-state-service").tooltip('destroy');
   },
 
   activeServiceId:null,

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] 01/01: Merge pull request #903 from ishanbha/AMBARI-23481-trunk

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit e53f6af17ff175107cda922b7781a3fbbf5ddb5c
Merge: 865af31 05d08e0
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue Apr 10 12:59:00 2018 -0400

Merge pull request #903 from ishanbha/AMBARI-23481-trunk

[AMBARI-23481] Selected Hosts dropdown is disabled after navigating a…

 ambari-web/app/controllers/main/host.js | 2 ++
 ambari-web/app/routes/main.js   | 7 ++-
 ambari-web/app/views/main/host.js   | 5 +
 3 files changed, 13 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated (865af31 -> e53f6af)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 865af31  AMBARI-23523 Fix mysql-collector-java installation for HIVE 
(mgergely)
 add 1bcbcd4  [AMBARI-23481] Selected Hosts dropdown is disabled after 
navigating away and coming back to hosts page.
 add 05d08e0  [AMBARI-23483] Hosts Breadcrumb doesn't persist filters.
 new e53f6af  Merge pull request #903 from ishanbha/AMBARI-23481-trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-web/app/controllers/main/host.js | 2 ++
 ambari-web/app/routes/main.js   | 7 ++-
 ambari-web/app/views/main/host.js   | 5 +
 3 files changed, 13 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23516] Ambari can not recognize slash in property name in xml file. (#940)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 5a294a0  [AMBARI-23516] Ambari can not recognize slash in property 
name in xml file. (#940)
5a294a0 is described below

commit 5a294a0e45b67130eaf97914f1815aa6f5a0d6e0
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Apr 9 13:09:05 2018 -0400

[AMBARI-23516] Ambari can not recognize slash in property name in xml file. 
(#940)
---
 ambari-web/app/mappers/configs/themes_mapper.js | 6 --
 ambari-web/app/utils/validator.js   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/mappers/configs/themes_mapper.js 
b/ambari-web/app/mappers/configs/themes_mapper.js
index 7cde9a8..8d00f3b 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -354,8 +354,10 @@ App.themesMapper = App.QuickDataMapper.create({
*/
   getConfigId: function(json) {
 if (json && json.config && typeof json.config === "string") {
-  var split = json.config.split("/");
-  return App.config.configId(split[1], split[0]);
+  // symbols until first slash is file-name and the rest is config-name
+  const fileName = json.config.substr(0, json.config.indexOf('/'));
+  const configName = json.config.substr(json.config.indexOf('/') + 1);
+  return App.config.configId(configName, fileName);
 } else {
   return null;
 }
diff --git a/ambari-web/app/utils/validator.js 
b/ambari-web/app/utils/validator.js
index a0c64e7..e2dc2b1 100644
--- a/ambari-web/app/utils/validator.js
+++ b/ambari-web/app/utils/validator.js
@@ -194,7 +194,7 @@ module.exports = {
* @return {Boolean}
*/
   isValidConfigKey: function(value) {
-var configKeyRegex = /^\s*[0-9a-z_\-\.\*]+\s*$/i;
+var configKeyRegex = /^\s*[0-9a-z_\-\.\/\*]+\s*$/i;
 return configKeyRegex.test(value);
   },
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: Load stack mapper data from mpacks API after registering mpacks. (#887)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 858fd45  Load stack mapper data from mpacks API after registering 
mpacks. (#887)
858fd45 is described below

commit 858fd45f24bd7c05687df851b8842c4832340b69
Author: Jason Golieb <j...@golieb.net>
AuthorDate: Thu Apr 5 14:34:11 2018 -0400

Load stack mapper data from mpacks API after registering mpacks. (#887)
---
 ambari-web/app/controllers/installer.js| 198 +
 ambari-web/app/controllers/wizard.js   |   8 +
 .../wizard/downloadMpacks_controller.js|  18 +-
 ambari-web/app/mappers/stack_mapper.js |  37 +-
 ambari-web/app/routes/installer.js |   1 +
 ambari-web/app/utils/ajax/ajax.js  |   4 +
 ambari-web/test/controllers/installer_test.js  |  14 +-
 ambari-web/test/mappers/stack_mapper_test.js   | 939 +
 8 files changed, 454 insertions(+), 765 deletions(-)

diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 15a1f82..c809733 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -110,6 +110,7 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
 recommendationsHostGroups: null,
 controllerName: 'installerController',
 mpacks: [],
+registeredMpacks: [],
 mpackVersions: [],
 mpackServiceVersions: [],
 mpackServices: [],
@@ -316,104 +317,6 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
 
   stacks: [],
 
-  /**
-   * stack names used as auxiliary data to query stacks by name
-   */
-  stackNames: [],
-
-  /**
-   * Load stacks data from server or take exist data from in memory variable 
{{content.stacks}}
-   * The series of API calls will be called  When landing first time on Select 
Stacks page
-   * or on hitting refresh post select stacks page in installer wizard
-   */
-  loadStacks: function () {
-var stacks = this.get('content.stacks');
-var dfd = $.Deferred();
-if (stacks && stacks.get('length')) {
-  App.set('currentStackVersion', 
App.Stack.find().findProperty('isSelected').get('stackNameVersion'));
-  dfd.resolve(true);
-} else {
-  App.ajax.send({
-name: 'wizard.stacks',
-sender: this,
-success: 'loadStacksSuccessCallback',
-error: 'loadStacksErrorCallback'
-  }).complete(function () {
-dfd.resolve(false);
-  });
-}
-return dfd.promise();
-  },
-
-  /**
-   * Send queries to load versions for each stack
-   */
-  loadStacksSuccessCallback: function (data) {
-this.get('stacks').clear();
-this.set('stackNames', data.items.mapProperty('Stacks.stack_name'));
-  },
-
-  /**
-   * onError callback for loading stacks data
-   */
-  loadStacksErrorCallback: function () {
-  },
-
-  /**
-   * query every stack names from server
-   * @return {Array}
-   */
-  loadStacksVersions: function () {
-var requests = [];
-this.get('stackNames').forEach(function (stackName) {
-  requests.push(App.ajax.send({
-name: 'wizard.stacks_versions_definitions',
-sender: this,
-data: {
-  stackName: stackName
-},
-success: 'loadStacksVersionsDefinitionsSuccessCallback',
-error: 'loadStacksVersionsErrorCallback'
-  }));
-}, this);
-this.set('loadStacksRequestsCounter', requests.length);
-return requests;
-  },
-
-  /**
-   * Counter for counting number of successful requests to load stack versions
-   */
-  loadStacksRequestsCounter: 0,
-
-  /**
-   * Parse loaded data and create array of stacks objects
-   */
-  loadStacksVersionsDefinitionsSuccessCallback: function (data) {
-var stacks = App.db.getStacks();
-var oses = App.db.getOses();
-var repos = App.db.getRepos();
-this.decrementProperty('loadStacksRequestsCounter');
-var isStacksExistInDb = stacks && stacks.length;
-if (isStacksExistInDb) {
-  stacks.forEach(function (_stack) {
-var stack = data.items.findProperty('VersionDefinition.id', _stack.id);
-if (stack) {
-  stack.VersionDefinition.is_selected = _stack.is_selected;
-}
-  }, this);
-}
-
-
data.items.sortProperty('VersionDefinition.stack_version').reverse().forEach(function
 (versionDefinition) {
-  // to display repos panel, should map all available operating systems 
including empty ones
-  var stackInfo = {};
-  stackInfo.isStacksExistInDb = isStacksExistInDb;
-  stackInfo.stacks = stacks;
-  stackInfo.oses = oses;
-  stackInfo.repos = repos;
-  this.getSupportedOSList(versionDefinition, stackInfo);
-}, this);
-  },
-
   mergeChanges: functio

[ambari] branch trunk updated: [AMBARI-23439] Overflowing list of frozen hosts in Assign Slaves and Clients page. (#870)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 4291cb4  [AMBARI-23439] Overflowing list of frozen hosts in Assign 
Slaves and Clients page. (#870)
4291cb4 is described below

commit 4291cb410680ee7c74174d54f9a2424091a9428b
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Tue Apr 3 13:14:58 2018 -0700

[AMBARI-23439] Overflowing list of frozen hosts in Assign Slaves and 
Clients page. (#870)
---
 ambari-web/app/styles/wizard.less | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index 9f5b595..4f1614a 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -243,15 +243,19 @@
   max-height: 440px;
   position: relative;
   display: flex;
-  overflow-y: visible;
+  overflow-y: scroll;
   #component_assign_table {
 display: inline-block;
 overflow-x: scroll;
 margin-left: 190px;
-margin-bottom: 30px;
+margin-bottom: 10px;
+height: 100%;
 tbody td, th {
   white-space: nowrap;
 }
+tfoot td {
+  padding-bottom: 30px;
+}
 .trim_hostname {
   .ellipsis-overflow-nowrap;
   max-width: 180px;
@@ -283,7 +287,6 @@
 }
 .static-pagination {
   position: absolute;
-  bottom: 0px;
   right: 0px;
 }
   }

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714-ui updated: Implemented use of service config API in UI. (#836)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714-ui
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714-ui 
by this push:
 new b5e77e9  Implemented use of service config API in UI. (#836)
b5e77e9 is described below

commit b5e77e930bf3cc9e52fb6ecd5d7a36c6b86dabfd
Author: Jason Golieb <j...@golieb.net>
AuthorDate: Thu Mar 29 16:02:55 2018 -0400

Implemented use of service config API in UI. (#836)
---
 .../app/controllers/wizard/step8_controller.js | 49 --
 ambari-web/app/routes/installer.js |  6 +--
 ambari-web/app/utils/ajax/ajax.js  | 12 ++
 ambari-web/test/controllers/wizard/step8_test.js   | 34 +++
 4 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 2ef1597..e4da276 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1465,6 +1465,8 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   registerHostsToComponent: function (hostNames, componentName) {
 if (!hostNames.length) return;
 
+let serviceName,
+serviceGroupName;
 var queryStr = '';
 hostNames.forEach(function (hostName) {
   queryStr += 'Hosts/host_name=' + hostName + '|';
@@ -1472,6 +1474,13 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 //slice off last symbol '|'
 queryStr = queryStr.slice(0, -1);
 
+this.get('selectedServices').forEach( function (service) {
+  if (service.get('serviceComponents').findProperty('componentName', 
componentName)) {
+serviceName = service.get('serviceName');
+serviceGroupName = service.get('stackName') + "-" + 
service.get('stackVersion');
+  }
+});
+
 var data = {
   "RequestInfo": {
 "query": queryStr
@@ -1480,7 +1489,9 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 "host_components": [
   {
 "HostRoles": {
-  "component_name": componentName
+  "component_name": componentName,
+  "service_name": serviceName,
+  "service_group_name": serviceGroupName
 }
   }
 ]
@@ -1557,39 +1568,33 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
*/
   applyConfigurationsToCluster: function (serviceConfigTags) {
 var allServices = 
this.get('installedServices').concat(this.get('selectedServices'));
-var allConfigData = [];
+
 allServices.forEach(function (service) {
   var serviceConfigData = [];
+ 
   Object.keys(service.get('configTypesRendered')).forEach(function (type) {
 var serviceConfigTag = serviceConfigTags.findProperty('type', type);
 if (serviceConfigTag) {
   serviceConfigData.pushObject(serviceConfigTag);
 }
   }, this);
+  
   if (serviceConfigData.length) {
-allConfigData.pushObject(JSON.stringify({
-  Clusters: {
-desired_config: serviceConfigData.map(function(item) {
-  var props = {};
-  Em.keys(item.properties).forEach(function(propName) {
-if (item.properties[propName] !== null) {
-  props[propName] = item.properties[propName];
-}
-  });
-  item.properties = props;
-  return item;
-})
+//TODO: Remove this delete call when the API supports 
service_config_version_note
+serviceConfigData.forEach(scd => {
+  delete scd.service_config_version_note;
+})
+
+this.addRequestToAjaxQueue({
+  name: 'common.service.create.configs',
+  data: {
+serviceName: service.get('serviceName'),
+serviceGroupName: 
`${service.get('stackName')}-${service.get('stackVersion')}`,
+data: serviceConfigData
   }
-}));
+});
   }
 }, this);
-
-this.addRequestToAjaxQueue({
-  name: 'common.across.services.configurations',
-  data: {
-data: '[' + allConfigData.toString() + ']'
-  }
-});
   },
 
   /**
diff --git a/ambari-web/app/routes/installer.js 
b/ambari-web/app/routes/installer.js
index ffa392f..2082052 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -303,16 +303,16 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 controller.save('selectedServices');
 controller.save('selectedMpacks');
 controller.save('adv

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23269] Removed mpack version from service group name (#692)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 714218f  [AMBARI-23269] Removed mpack version from service group name 
(#692)
714218f is described below

commit 714218fc9cbed183e84c843ca3363081f4b3b4d1
Author: Jason Golieb <j...@golieb.net>
AuthorDate: Tue Mar 20 13:39:30 2018 -0400

[AMBARI-23269] Removed mpack version from service group name (#692)

* Removed version from service group name

* Removed unnecessary template strings.
---
 ambari-web/app/controllers/wizard/step8_controller.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index e4da276..42ee60a 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1012,7 +1012,7 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 if (mpacks) {
   const serviceGroups = mpacks.map(mpack => ({
   "ServiceGroupInfo": {
-"service_group_name": `${mpack.name}-${mpack.version}`,
+"service_group_name": mpack.name,
   }
 })
   );
@@ -1053,7 +1053,7 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   "service_type": service.get('serviceName'),
   //TODO: mpacks - needs to be revisited when we are no longer hard 
coding service groups to be named 
   //   for mpacks and when the concept of a "selected 
stack" is no longer a thing
-  "service_group_name": 
`${service.get('stackName')}-${service.get('stackVersion')}`,
+  "service_group_name": service.get('stackName'),
   "desired_stack": 
`${service.get('stackName')}-${service.get('stackVersion')}`,
 }
   })
@@ -1477,7 +1477,7 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 this.get('selectedServices').forEach( function (service) {
   if (service.get('serviceComponents').findProperty('componentName', 
componentName)) {
 serviceName = service.get('serviceName');
-serviceGroupName = service.get('stackName') + "-" + 
service.get('stackVersion');
+serviceGroupName = service.get('stackName');
   }
 });
 

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23191] Use service config API (#691)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 905b780  [AMBARI-23191] Use service config API (#691)
905b780 is described below

commit 905b78051996ee3cd7ce24fa3c94717b26bfda2c
Author: Jason Golieb <j...@golieb.net>
AuthorDate: Tue Mar 20 13:27:45 2018 -0400

[AMBARI-23191] Use service config API (#691)

* Add newline to avoid audit failures

* Fixed bug with clearing host recommendations when selected services are 
changed.

* Implemented use of service config API in installer.

* Revised unit test.
---
 .../server/orm/entities/RepoDefinitionEntity.java  |  2 +-
 .../app/controllers/wizard/step8_controller.js | 36 +-
 ambari-web/app/routes/installer.js |  6 ++--
 ambari-web/app/utils/ajax/ajax.js  | 12 
 ambari-web/test/controllers/wizard/step8_test.js   | 34 +---
 5 files changed, 46 insertions(+), 44 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
index edcc1f1..f308fd2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
@@ -241,4 +241,4 @@ public class RepoDefinitionEntity {
   repositoryDefinition.setTags(repositoryInfo.getTags());
   return repositoryDefinition;
 }
-  }
\ No newline at end of file
+  }
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index a780700..e4da276 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1568,39 +1568,33 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
*/
   applyConfigurationsToCluster: function (serviceConfigTags) {
 var allServices = 
this.get('installedServices').concat(this.get('selectedServices'));
-var allConfigData = [];
+
 allServices.forEach(function (service) {
   var serviceConfigData = [];
+ 
   Object.keys(service.get('configTypesRendered')).forEach(function (type) {
 var serviceConfigTag = serviceConfigTags.findProperty('type', type);
 if (serviceConfigTag) {
   serviceConfigData.pushObject(serviceConfigTag);
 }
   }, this);
+  
   if (serviceConfigData.length) {
-allConfigData.pushObject(JSON.stringify({
-  Clusters: {
-desired_config: serviceConfigData.map(function(item) {
-  var props = {};
-  Em.keys(item.properties).forEach(function(propName) {
-if (item.properties[propName] !== null) {
-  props[propName] = item.properties[propName];
-}
-  });
-  item.properties = props;
-  return item;
-})
+//TODO: Remove this delete call when the API supports 
service_config_version_note
+serviceConfigData.forEach(scd => {
+  delete scd.service_config_version_note;
+})
+
+this.addRequestToAjaxQueue({
+  name: 'common.service.create.configs',
+  data: {
+serviceName: service.get('serviceName'),
+serviceGroupName: 
`${service.get('stackName')}-${service.get('stackVersion')}`,
+data: serviceConfigData
   }
-}));
+});
   }
 }, this);
-
-this.addRequestToAjaxQueue({
-  name: 'common.across.services.configurations',
-  data: {
-data: '[' + allConfigData.toString() + ']'
-  }
-});
   },
 
   /**
diff --git a/ambari-web/app/routes/installer.js 
b/ambari-web/app/routes/installer.js
index ffa392f..2082052 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -303,16 +303,16 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 controller.save('selectedServices');
 controller.save('selectedMpacks');
 controller.save('advancedMode');
-var wizardStep6Controller = router.get('wizardStep6Controller');
+var wizardSelectMpacksController = 
router.get('wizardSelectMpacksController');
 // Clear subsequent settings if user changed service selections
-if (!wizardStep6Controller.get('isSaved')) {
+if (!wizardSelectMpacksController.get('isSaved')) {
   router.get('wizardStep5Controller').clearRecommendations();
   controller.setDBProperty('recommendations', undefined);
   contr

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23227] Pass service_group_name and service_name while creating Host Components. (#662)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 128afd2  [AMBARI-23227] Pass service_group_name and service_name while 
creating Host Components. (#662)
128afd2 is described below

commit 128afd2f3a3c58fdd84c58b38e50e0d3526c373b
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Fri Mar 16 08:39:00 2018 -0700

[AMBARI-23227] Pass service_group_name and service_name while creating Host 
Components. (#662)
---
 .../app/controllers/wizard/step8_controller.js | 42 --
 ambari-web/test/controllers/wizard/step4_test.js   |  2 ++
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index c2b5f9e..a780700 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1198,7 +1198,6 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 }, this);
 selectedMasterComponents.mapProperty('component').uniq().forEach(function 
(component) {
   var hostNames = [];
-  let serviceName = 
App.StackServiceComponent.find().findProperty('componentName', 
component).get('serviceName');
   if (masterOnAllHosts.length > 0) {
 var compOnAllHosts = false;
 for (var i=0; i < masterOnAllHosts.length; i++) {
@@ -1209,11 +1208,11 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 }
 if (!compOnAllHosts) {
   hostNames = selectedMasterComponents.filterProperty('component', 
component).filterProperty('isInstalled', false).mapProperty('hostName');
-  this.registerHostsToComponent(hostNames, component, serviceName);
+  this.registerHostsToComponent(hostNames, component);
 }
   } else {
 hostNames = selectedMasterComponents.filterProperty('component', 
component).filterProperty('isInstalled', false).mapProperty('hostName');
-this.registerHostsToComponent(hostNames, component, serviceName);
+this.registerHostsToComponent(hostNames, component);
   }
 }, this);
   },
@@ -1275,7 +1274,6 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   var hostNames = [];
   var compOnAllHosts;
   if (_slave.componentName !== 'CLIENT') {
-let serviceName = 
App.StackServiceComponent.find().findProperty('componentName', 
_slave.componentName).get('serviceName');
 if (slaveOnAllHosts.length > 0) {
   compOnAllHosts = false;
   for (var i=0; i < slaveOnAllHosts.length; i++) {
@@ -1288,18 +1286,16 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   }
   if (!compOnAllHosts) {
 hostNames = _slave.hosts.filterProperty('isInstalled', 
false).mapProperty('hostName');
-this.registerHostsToComponent(hostNames, _slave.componentName, 
serviceName);
+this.registerHostsToComponent(hostNames, _slave.componentName);
   }
 } else {
   hostNames = _slave.hosts.filterProperty('isInstalled', 
false).mapProperty('hostName');
-  this.registerHostsToComponent(hostNames, _slave.componentName, 
serviceName);
+  this.registerHostsToComponent(hostNames, _slave.componentName);
 }
   }
   else {
 clients.forEach(function (_client) {
   hostNames = _slave.hosts.mapProperty('hostName');
-  let compName = _client.component_name
-  let serviceName = 
App.StackServiceComponent.find().findProperty('componentName', 
compName).get('serviceName')
   // The below logic to install clients to existing/New master hosts 
should not be applied to Add Host wizard.
   // This is with the presumption that Add Host controller does not 
add any new Master component to the cluster
   if (!this.get('isAddHost')) {
@@ -1330,11 +1326,11 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
 }
 if (!compOnAllHosts) {
   hostNames = hostNames.uniq();
-  this.registerHostsToComponent(hostNames, _client.component_name, 
serviceName);
+  this.registerHostsToComponent(hostNames, _client.component_name);
 }
   } else {
 hostNames = hostNames.uniq();
-this.registerHostsToComponent(hostNames, _client.component_name, 
serviceName);
+this.registerHostsToComponent(hostNames, _client.component_name);
   }
 }, this);
   }
@@ -1391,8 +1387,7 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(Ap

[ambari] branch branch-feature-AMBARI-14714-ui updated: Add missing translations in messages (#629)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714-ui
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714-ui 
by this push:
 new 8f2aa6b  Add missing translations in messages (#629)
8f2aa6b is described below

commit 8f2aa6be6206d8a4b804b63f9ae10f9aa7622ff9
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Mar 12 10:42:17 2018 -0700

Add missing translations in messages (#629)
---
 ambari-web/app/messages.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1488fc4..be9df39 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -223,6 +223,7 @@ Em.I18n.translations = {
   'common.maint': 'Maint',
   'common.maintenance.task': ' Toggle Maintenance Mode',
   'common.maintenance': 'Maintenance',
+  'common.master':'Master',
   'common.maximum':'Maximum',
   'common.memory':'Memory',
   'common.message':'Message',
@@ -317,6 +318,7 @@ Em.I18n.translations = {
   'common.show':'Show',
   'common.showDetails':'Show Details',
   'common.skip':'Skip',
+  'common.slave':'Slave',
   'common.stack.versions':'Stack Versions',
   'common.stack': 'Stack',
   'common.stacks': 'Stacks',

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] 01/01: Merge pull request #627 from ishanbha/branch-feature-AMBARI-14714

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 1523f80805cb1486c61f71c105ac48c24dc5324c
Merge: f835be6 d491562
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Mar 12 10:41:58 2018 -0700

Merge pull request #627 from ishanbha/branch-feature-AMBARI-14714

Add missing translations in messages

 ambari-web/app/messages.js | 2 ++
 1 file changed, 2 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated (f835be6 -> 1523f80)

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from f835be6  AMBARI-22649. Avoid using uninitialized logger, reduce 
verbosity (#536)
 add d491562  Add missing translations in messages
 new 1523f80  Merge pull request #627 from 
ishanbha/branch-feature-AMBARI-14714

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-web/app/messages.js | 2 ++
 1 file changed, 2 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.