ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-6350 Unable to restart all host-components on 110 node cluster. (Buzhor Denys via atkach)
Date Wed, 02 Jul 2014 10:15:11 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f63a5804d -> b7cd438a5


AMBARI-6350 Unable to restart all host-components on 110 node cluster. (Buzhor Denys via atkach)


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

Branch: refs/heads/trunk
Commit: b7cd438a514e51b8b02f790f2126e6fc31b1715d
Parents: f63a580
Author: atkach <atkach@hortonworks.com>
Authored: Wed Jul 2 13:10:13 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Wed Jul 2 13:10:13 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/batch_scheduled_requests.js | 16 ++++++----------
 ambari-web/test/controllers/main/host_test.js    |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b7cd438a/ambari-web/app/utils/batch_scheduled_requests.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/batch_scheduled_requests.js b/ambari-web/app/utils/batch_scheduled_requests.js
index cc6cd2c..13ec4b2 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -218,8 +218,8 @@ module.exports = {
       }
     }
     if (hostComponentsList.length > 0) {
-      var operation_level = this.getOperationLevelobject(level, hosts.uniq().join(","),
-        componentServiceMap[hostComponentsList[0].get("componentName")], hostComponentsList[0].get("componentName"));
+      var operation_level = this.getOperationLevelobject(level, componentServiceMap[hostComponentsList[0].get("componentName")],
+        hostComponentsList[0].get("componentName"));
     }
 
 
@@ -244,23 +244,19 @@ module.exports = {
 
   /**
    * @param {String} level - operation level name, can be ("CLUSTER", "SERVICE", "HOST",
"HOSTCOMPONENT")
-   * @param {String} hostName get host name or hostNames as String("host1,host2")
    * @param {String} serviceName
    * @param {String} componentName
    * @returns {Object} {{level: *, cluster_name: *}} - operation level object
    * @method getOperationLevelobject - create operation level object to be included into
ajax query
    */
-  getOperationLevelobject: function(level, hostName, serviceName, componentName) {
+  getOperationLevelobject: function(level, serviceName, componentName) {
     var operationLevel = {
       "level": level,
       "cluster_name": App.get("clusterName")
     };
-    if (level === "HOST") {
-      operationLevel["host_name"] = hostName;
-    } else if (level === "SERVICE") {
+    if (level === "SERVICE") {
       operationLevel["service_name"] = serviceName;
-    } else {
-      operationLevel["host_name"] = hostName;
+    } else if(level !== "HOST") {
       operationLevel["service_name"] = serviceName;
       operationLevel["hostcomponent_name"] = componentName;
     }
@@ -572,4 +568,4 @@ module.exports = {
       successCallback({});
     }
   }
-};
\ No newline at end of file
+};

http://git-wip-us.apache.org/repos/asf/ambari/blob/b7cd438a/ambari-web/test/controllers/main/host_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host_test.js b/ambari-web/test/controllers/main/host_test.js
index 1734d41..adb51d0 100644
--- a/ambari-web/test/controllers/main/host_test.js
+++ b/ambari-web/test/controllers/main/host_test.js
@@ -303,7 +303,7 @@ describe('MainHostController', function () {
 
   });
 
-  describe.only('#getRegExp()', function() {
+  describe('#getRegExp()', function() {
     before(function() {
       hostController = App.MainHostController.create({});
     });


Mime
View raw message