You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/09/07 11:44:56 UTC
[03/38] git commit: AMBARI-7161.UI show incorrect decommission status
for RegionServer.(XIWANG)
AMBARI-7161.UI show incorrect decommission status for RegionServer.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d487f9a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d487f9a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d487f9a
Branch: refs/heads/branch-alerts-dev
Commit: 5d487f9ac203736ac8d4ca8d58775f6dbc114be3
Parents: 3cec18a
Author: Xi Wang <xi...@apache.org>
Authored: Thu Sep 4 16:50:41 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Sep 4 18:27:10 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d487f9a/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 565407d..911e5c2 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -954,11 +954,16 @@ App.MainHostDetailsController = Em.Controller.extend({
{
"order_id": 2,
"type": "PUT",
- "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/host_components",
+ "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/host_components/" + slaveType,
"RequestBodyInfo": {
"RequestInfo": {
context: Em.I18n.t('hosts.host.regionserver.decommission.batch2'),
- query: 'HostRoles/component_name=' + slaveType + '&HostRoles/host_name.in(' + hostNames + ')&HostRoles/maintenance_state=OFF'
+ operation_level: {
+ level: "HOST_COMPONENT",
+ cluster_name: App.get('clusterName'),
+ host_name: hostNames,
+ service_name: serviceName || null
+ }
},
"Body": {
HostRoles: {
@@ -1075,11 +1080,16 @@ App.MainHostDetailsController = Em.Controller.extend({
{
"order_id": 2,
"type": "PUT",
- "uri": App.apiPrefix + "/clusters/" + App.get('clusterName') + "/host_components",
+ "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/host_components/" + slaveType,
"RequestBodyInfo": {
"RequestInfo": {
context: startContext,
- query: 'HostRoles/component_name=' + slaveType + '&HostRoles/host_name.in(' + hostNames + ')&HostRoles/maintenance_state=OFF'
+ operation_level: {
+ level: "HOST_COMPONENT",
+ cluster_name: App.get('clusterName'),
+ host_name: hostNames,
+ service_name: serviceName || null
+ }
},
"Body": {
HostRoles: {