You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/07/02 12:14:36 UTC
git commit: AMBARI-6350 Unable to restart all host-components on 110
node cluster. (Buzhor Denys via atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 8b12f08b8 -> 293b183b7
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/293b183b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/293b183b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/293b183b
Branch: refs/heads/branch-1.6.1
Commit: 293b183b7bab129c9ed28be20831ffab532c72d5
Parents: 8b12f08
Author: atkach <at...@hortonworks.com>
Authored: Wed Jul 2 13:13:25 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Wed Jul 2 13:14:32 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/293b183b/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 38aeb8c..14c4994 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -215,8 +215,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"));
}
@@ -241,23 +241,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;
}
@@ -548,4 +544,4 @@ module.exports = {
successCallback({});
}
}
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/293b183b/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({});
});