AMBARI-10466. RU TODO : Get rid of the UPGRADE_FORCE_DOWNGRADE property (dlysnichenko)

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

@@ -666,17 +666,18 @@ class ActionScheduler implements Runnable {
         new ServiceComponentHostOpFailedEvent(componentName,
           hostname, timestamp);
 
-      if (serviceName != null) {
+      if (serviceName != null && ! serviceName.isEmpty() &&
+              componentName != null && ! componentName.isEmpty()) {
         Service svc = cluster.getService(serviceName);
         ServiceComponent svcComp = svc.getServiceComponent(componentName);
         ServiceComponentHost svcCompHost =
                 svcComp.getServiceComponentHost(hostname);
         svcCompHost.handleEvent(failedEvent);
       } else {
-        LOG.info("Service name is null, skipping sending ServiceComponentHostOpFailedEvent for " + componentName);
+        LOG.info("Service name is " + serviceName + ", component name is " + componentName +
+                "skipping sending ServiceComponentHostOpFailedEvent for " + componentName);
       }
 
-
     } catch (ServiceComponentNotFoundException scnex) {
       LOG.debug(componentName + " associated with service " + serviceName +
         " is not a service component, assuming it's an action.");

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java

@@ -105,8 +105,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
   protected static final String UPGRADE_CLUSTER_NAME = "Upgrade/cluster_name";
   protected static final String UPGRADE_VERSION = "Upgrade/repository_version";
   protected static final String UPGRADE_REQUEST_ID = "Upgrade/request_id";
-  // TODO : Get rid of the UPGRADE_FORCE_DOWNGRADE property... should use downgrade create directive
-  protected static final String UPGRADE_FORCE_DOWNGRADE = "Upgrade/force_downgrade";
   protected static final String UPGRADE_FROM_VERSION = "Upgrade/from_version";
   protected static final String UPGRADE_TO_VERSION = "Upgrade/to_version";
   protected static final String UPGRADE_DIRECTION = "Upgrade/direction";
@@ -184,7 +182,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
     PROPERTY_IDS.add(UPGRADE_CLUSTER_NAME);
     PROPERTY_IDS.add(UPGRADE_VERSION);
     PROPERTY_IDS.add(UPGRADE_REQUEST_ID);
-    PROPERTY_IDS.add(UPGRADE_FORCE_DOWNGRADE);
     PROPERTY_IDS.add(UPGRADE_FROM_VERSION);
     PROPERTY_IDS.add(UPGRADE_TO_VERSION);
     PROPERTY_IDS.add(UPGRADE_DIRECTION);
@@ -236,11 +233,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
         public UpgradeEntity invoke() throws AmbariException {
           String forceDowngrade = requestInfoProps.get(UpgradeResourceDefinition.DOWNGRADE_DIRECTIVE);
 
-          // check the property if the directive is not specified...
-          if (forceDowngrade == null) {
-            forceDowngrade = (String) requestMap.get(UPGRADE_FORCE_DOWNGRADE);
-          }
-
           Direction direction = Boolean.parseBoolean(forceDowngrade) ?
               Direction.DOWNGRADE : Direction.UPGRADE;
 

ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java

@@ -524,11 +524,15 @@ public class UpgradeResourceProviderTest {
     UpgradeGroupEntity group = upgrade.getUpgradeGroups().get(2);
     assertEquals(1, group.getItems().size());
 
+    requestProps.clear();
+    requestProps.put(UpgradeResourceProvider.UPGRADE_CLUSTER_NAME, "c1");
     requestProps.put(UpgradeResourceProvider.UPGRADE_VERSION, "2.2");
     requestProps.put(UpgradeResourceProvider.UPGRADE_FROM_VERSION, "2.2.2.3");
-    requestProps.put(UpgradeResourceProvider.UPGRADE_FORCE_DOWNGRADE, "true");
 
-    request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), null);
+    Map<String, String> requestInfoProps = new HashMap<String, String>();
+    requestInfoProps.put("downgrade", "true");
+
+    request = PropertyHelper.getCreateRequest(Collections.singleton(requestProps), requestInfoProps);
     upgradeResourceProvider.createResources(request);
 
     upgrades = upgradeDao.findUpgrades(cluster.getClusterId());

ambari-web/app/utils/ajax/ajax.js

@@ -1520,9 +1520,11 @@ var urls = {
     'format': function (data) {
       return {
         data: JSON.stringify({
+          "RequestInfo": {
+            "downgrade": "true"
+          },
           "Upgrade": {
-            "repository_version": data.value,
-            "force_downgrade": true
+            "repository_version": data.value
           }
         })
       }