You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/06/24 20:36:04 UTC
ambari git commit: AMBARI-12112: Add FALCON service stalls during Add
Service Wizard (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk be85313e2 -> 854eb4630
AMBARI-12112: Add FALCON service stalls during Add Service Wizard (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/854eb463
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/854eb463
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/854eb463
Branch: refs/heads/trunk
Commit: 854eb46303845d542eadba398de3539631505454
Parents: be85313
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed Jun 24 11:35:55 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Wed Jun 24 11:35:55 2015 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/add_controller.js | 5 +++--
ambari-web/app/controllers/wizard/step8_controller.js | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/854eb463/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 2a2f425..a33ccaf 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -525,8 +525,9 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
*/
installAdditionalClients: function () {
var dfd = $.Deferred();
+ var count = 0;
if (this.get('content.additionalClients.length') > 0) {
- this.get('content.additionalClients').forEach(function (c, k) {
+ this.get('content.additionalClients').forEach(function (c) {
if (c.hostNames.length > 0) {
var queryStr = 'HostRoles/component_name='+ c.componentName + '&HostRoles/host_name.in(' + c.hostNames.join() + ')';
this.get('installClietsQueue').addRequest({
@@ -538,7 +539,7 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
HostRoles: {
state: 'INSTALLED'
},
- counter: k,
+ counter: count++,
deferred: dfd
},
success: 'installClientSuccess',
http://git-wip-us.apache.org/repos/asf/ambari/blob/854eb463/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index c167f68..6a5cc3c 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1304,11 +1304,13 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
}
hostNames = hostNames.uniq();
if (hostNames.length > 0) {
- this.get('content.additionalClients').pushObject({hostNames: hostNames, componentName: _clientName});
// If a dependency for being co-hosted is derived between existing client and selected new master but that
// dependency is already satisfied in the cluster then disregard the derived dependency
this.removeClientsFromList(_clientName, hostNames);
this.registerHostsToComponent(hostNames, _clientName);
+ if(hostNames.length > 0) {
+ this.get('content.additionalClients').pushObject({hostNames: hostNames, componentName: _clientName});
+ }
}
}
}, this);