Repository: ambari Updated Branches: refs/heads/trunk 0134fb666 -> 0f23e3d8c
AMBARI-4904. Cannot Decommission/Recommission. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f23e3d8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f23e3d8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f23e3d8 Branch: refs/heads/trunk Commit: 0f23e3d8ce397b2cae61495b84dc596a3d7ef716 Parents: 0134fb6 Author: Yusaku Sako <yus...@hortonworks.com> Authored: Fri Feb 28 19:13:00 2014 -0800 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Fri Feb 28 19:13:00 2014 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 15 ++++++--------- ambari-web/app/utils/ajax.js | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f23e3d8/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index b285d4a..2504f16 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -782,13 +782,12 @@ App.MainHostDetailsController = Em.Controller.extend({ "RequestInfo" : { "context" : Em.I18n.t('hosts.host.regionserver.decommission.batch1'), "command" : "DECOMMISSION", - "service_name" : serviceName, - "component_name" : componentName, "parameters" : { "slave_type": slaveType, "excluded_hosts": hostNames } - } + }, + "Requests/resource_filters": [{"service_name" : serviceName, "component_name" : componentName}] } }, { @@ -877,13 +876,12 @@ App.MainHostDetailsController = Em.Controller.extend({ "RequestInfo" : { "context" : context_1, "command" : "DECOMMISSION", - "service_name" : serviceName, - "component_name" : componentName, "parameters" : { "slave_type": slaveType, "included_hosts": hostNames } - } + }, + "Requests/resource_filters": [{"service_name" : serviceName, "component_name" : componentName}] } }, { @@ -928,13 +926,12 @@ App.MainHostDetailsController = Em.Controller.extend({ "RequestInfo" : { "context" : context_1, "command" : "DECOMMISSION", - "service_name" : serviceName, - "component_name" : componentName, "parameters" : { "slave_type": slaveType, "included_hosts": hostNames } - } + }, + "Requests/resource_filters": [{"service_name" : serviceName, "component_name" : componentName}] } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/0f23e3d8/ambari-web/app/utils/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js index 5934808..bca06cb 100644 --- a/ambari-web/app/utils/ajax.js +++ b/ambari-web/app/utils/ajax.js @@ -364,13 +364,12 @@ var urls = { RequestInfo: { 'context': data.context, 'command': data.command, - 'service_name': data.serviceName, - 'component_name': data.componentName, 'parameters': { 'slave_type': data.slaveType, 'excluded_hosts': data.hostName } - } + }, + "Requests/resource_filters": [{"service_name" : data.serviceName, "component_name" : data.componentName}] }) } } @@ -406,13 +405,12 @@ var urls = { RequestInfo: { context: data.context, command: data.command, - service_name: data.serviceName, - component_name: data.componentName, parameters: { slave_type: data.slaveType, included_hosts: data.hostName } - } + }, + "Requests/resource_filters": [{"service_name" : data.serviceName, "component_name" : data.componentName}] }) } } @@ -1612,10 +1610,9 @@ var urls = { 'RequestInfo': { 'context': data.context, 'command': 'DECOMMISSION', - 'service_name': data.serviceName, - 'component_name': data.componentName, 'parameters': data.parameters - } + }, + "Requests/resource_filters": [{"service_name" : data.serviceName, "component_name" : data.componentName}] }) } }
