ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-6247. Add host stops all services. (alexantonenko via yusaku)
Date Tue, 24 Jun 2014 02:06:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 279802228 -> 7fecef8b7


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/7fecef8b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7fecef8b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7fecef8b

Branch: refs/heads/trunk
Commit: 7fecef8b7728cf79cd9ca9528c5fbf9d0c2c9edf
Parents: 2798022
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Jun 23 19:05:04 2014 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Jun 23 19:06:21 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/7fecef8b/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/7fecef8b/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": {


Mime
View raw message