AMBARI-4904. Cannot Decommission/Recommission. (yusaku)

apache · Mar 1, 2014 · 0f23e3d · 0f23e3d
1 parent 0134fb6
commit 0f23e3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git 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}]
             }
           },
           {

diff --git 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}]
         })
       }
     }