You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/06/24 04:06:04 UTC
git commit: AMBARI-6247. Add host stops all services. (alexantonenko
via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 97a76e56c -> 6f01ddc29
AMBARI-6247. Add host stops all services. (alexantonenko via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f01ddc2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f01ddc2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f01ddc2
Branch: refs/heads/branch-1.6.1
Commit: 6f01ddc29f9e486d4c728500460b6fd18bf2c160
Parents: 97a76e5
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Jun 23 19:05:04 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Jun 23 19:05:57 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/add_controller.js | 4 +++-
ambari-web/app/controllers/wizard/step9_controller.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f01ddc2/ambari-web/app/controllers/main/host/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js
index 33a21e6..0b0397f 100644
--- a/ambari-web/app/controllers/main/host/add_controller.js
+++ b/ambari-web/app/controllers/main/host/add_controller.js
@@ -399,7 +399,9 @@ App.AddHostController = App.WizardController.extend({
var clusterName = this.get('content.cluster.name');
var hostNames = [];
for (var hostname in this.getDBProperty('hosts')) {
- hostNames.push(hostname);
+ if(this.getDBProperty('hosts')[hostname].isInstalled == false){
+ hostNames.push(hostname);
+ }
}
if(!clusterName || hostNames.length === 0) return false;
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f01ddc2/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index 9b9262b..181e895 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -434,7 +434,9 @@ App.WizardStep9Controller = Em.Controller.extend({
name = 'wizard.step9.add_host.launch_start_services';
var hostnames = [];
for (var hostname in this.get('wizardController').getDBProperty('hosts')) {
- hostnames.push(hostname);
+ if(this.get('hosts').findProperty('name', hostname)){
+ hostnames.push(hostname);
+ }
}
data = {
"RequestInfo": {