AMBARI-15194: Auto-start services - Create default settings for auto start

ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentRequest.java

@@ -23,10 +23,18 @@ public class StackServiceComponentRequest extends StackServiceRequest {
 
   private String componentName;
 
+  private String recoveryEnabled;
+
   public StackServiceComponentRequest(String stackName, String stackVersion,
       String serviceName, String componentName) {
+    this(stackName, stackVersion, serviceName, componentName, null);
+  }
+
+  public StackServiceComponentRequest(String stackName, String stackVersion,
+      String serviceName, String componentName, String recoveryEnabled) {
     super(stackName, stackVersion, serviceName);
     setComponentName(componentName);
+    setRecoveryEnabled(recoveryEnabled);
   }
 
   public String getComponentName() {
@@ -37,4 +45,22 @@ public class StackServiceComponentRequest extends StackServiceRequest {
     this.componentName = componentName;
   }
 
+  /**
+   * Get whether auto start is enabled. If value is null,
+   * auto start value was not specified.
+   *
+   * @return null, "true", "false"
+   */
+  public String getRecoveryEnabled() {
+    return recoveryEnabled;
+  }
+
+  /**
+   * Set whether auto start is enabled. Null indicates unspecified.
+   *
+   * @param recoveryEnabled null, "true", "false"
+   */
+  public void setRecoveryEnabled(String recoveryEnabled) {
+    this.recoveryEnabled = recoveryEnabled;
+  }
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceComponentResponse.java

@@ -90,6 +90,11 @@ public class StackServiceComponentResponse {
    */
   private List<String> customCommands;
 
+  /**
+   * Enabled for auto start or not.
+   */
+  private boolean recoveryEnabled;
+
 
   /**
    * Constructor.
@@ -106,6 +111,7 @@ public class StackServiceComponentResponse {
     cardinality = component.getCardinality();
     versionAdvertised = component.isVersionAdvertised();
     autoDeploy = component.getAutoDeploy();
+    recoveryEnabled = component.isRecoveryEnabled();
 
     // the custom command names defined for this component
     List<CustomCommandDefinition> definitions = component.getCustomCommands();
@@ -301,6 +307,24 @@ public class StackServiceComponentResponse {
     this.versionAdvertised = versionAdvertised;
   }
 
+  /**
+   * Get whether auto start is enabled.
+   *
+   * @return True or false.
+   */
+  public boolean isRecoveryEnabled() {
+    return recoveryEnabled;
+  }
+
+  /**
+   * Set whether auto start is enabled.
+   *
+   * @param recoveryEnabled True or false.
+   */
+  public void setRecoveryEnabled(boolean recoveryEnabled) {
+    this.recoveryEnabled = recoveryEnabled;
+  }
+
 
   /**
    * Get auto deploy information.

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

@@ -352,6 +352,24 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
         sc.setDesiredState(s.getDesiredState());
       }
 
+      /**
+       * If request does not have recovery_enabled field,
+       * then get the default from the stack definition.
+       */
+      if (StringUtils.isNotEmpty(request.getRecoveryEnabled())) {
+        boolean recoveryEnabled = Boolean.parseBoolean(request.getRecoveryEnabled());
+        sc.setRecoveryEnabled(recoveryEnabled);
+      } else {
+        StackId stackId = s.getDesiredStackVersion();
+        ComponentInfo componentInfo = ambariMetaInfo.getComponent(stackId.getStackName(),
+                stackId.getStackVersion(), s.getName(), request.getComponentName());
+        if (componentInfo == null) {
+            throw new AmbariException("Could not get component information from stack definition: Stack=" +
+                stackId.toString() + ", Service=" + s.getName() + ", Component=" + request.getComponentName());
+        }
+        sc.setRecoveryEnabled(componentInfo.isRecoveryEnabled());
+      }
+
       s.addServiceComponent(sc);
       sc.persist();
     }

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

@@ -65,6 +65,9 @@ public class StackServiceComponentResourceProvider extends
   private static final String CUSTOM_COMMANDS_PROPERTY_ID = PropertyHelper.getPropertyId(
       "StackServiceComponents", "custom_commands");
 
+  private static final String RECOVERY_ENABLED = PropertyHelper.getPropertyId(
+      "StackServiceComponents", "recovery_enabled");
+
   private static final String AUTO_DEPLOY_ENABLED_ID = PropertyHelper.getPropertyId(
       "auto_deploy", "enabled");
 
@@ -141,6 +144,9 @@ public class StackServiceComponentResourceProvider extends
       setResourceProperty(resource, ADVERTISE_VERSION_ID,
           response.isVersionAdvertised(), requestedIds);
 
+      setResourceProperty(resource, RECOVERY_ENABLED,
+          response.isRecoveryEnabled(), requestedIds);
+
       setResourceProperty(resource, CUSTOM_COMMANDS_PROPERTY_ID,
           response.getCustomCommands(), requestedIds);
 
@@ -165,7 +171,8 @@ public class StackServiceComponentResourceProvider extends
         (String) properties.get(STACK_NAME_PROPERTY_ID),
         (String) properties.get(STACK_VERSION_PROPERTY_ID),
         (String) properties.get(SERVICE_NAME_PROPERTY_ID),
-        (String) properties.get(COMPONENT_NAME_PROPERTY_ID));
+        (String) properties.get(COMPONENT_NAME_PROPERTY_ID),
+        (String) properties.get(RECOVERY_ENABLED));
   }
 
   @Override

ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java

@@ -88,6 +88,8 @@ public class ComponentModule extends BaseModule<ComponentModule, ComponentInfo>
         componentInfo.setAutoDeploy(parentInfo.getAutoDeploy());
       }
 
+      componentInfo.setRecoveryEnabled(parentInfo.isRecoveryEnabled());
+
       mergeComponentDependencies(parentInfo.getDependencies(),
               componentInfo.getDependencies());
 

ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java

@@ -90,6 +90,10 @@ public class ComponentInfo {
   @XmlElement(name="auto-deploy")
   private AutoDeployInfo autoDeploy;
 
+  @XmlElements(@XmlElement(name = "recovery_enabled"))
+  private Boolean recoveryEnabled = null;
+
+
   private String timelineAppid;
 
   public ComponentInfo() {
@@ -146,6 +150,10 @@ public class ComponentInfo {
     return "MASTER".equals(category);
   }
 
+  public boolean isSlave() {
+    return "SLAVE".equals(category);
+  }
+
   public boolean isDeleted() {
     return deleted;
   }
@@ -247,6 +255,27 @@ public class ComponentInfo {
     return versionAdvertised;
   }
 
+  public void setRecoveryEnabled(boolean recoveryEnabled) {
+    this.recoveryEnabled = recoveryEnabled;
+  }
+
+  public boolean isRecoveryEnabled() {
+    /**
+     * If recovery_enabled was not provided, then use defaults:
+     * Slave components: recovery_enabled = true
+     * Master components: recovery_enabled = false
+     * All others: recovery_enabled = false
+     */
+    if (recoveryEnabled == null) {
+      if (isSlave()) {
+        recoveryEnabled = true;
+      } else {
+        recoveryEnabled = false;
+      }
+    }
+    return recoveryEnabled;
+  }
+
   public List<String> getClientsToUpdateConfigs() {
     return clientsToUpdateConfigs;
   }

ambari-server/src/main/resources/properties.json

@@ -243,6 +243,7 @@
         "StackServiceComponents/is_master",
         "StackServiceComponents/cardinality",
         "StackServiceComponents/custom_commands",
+        "StackServiceComponents/recovery_enabled",
         "auto_deploy/enabled",
         "auto_deploy/location",
         "_"

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

@@ -126,6 +126,7 @@ public class ComponentResourceProviderTest {
     ServiceComponentFactory serviceComponentFactory = createNiceMock(ServiceComponentFactory.class);
     ServiceComponent serviceComponent = createNiceMock(ServiceComponent.class);
     StackId stackId = createNiceMock(StackId.class);
+    ComponentInfo componentInfo = createNiceMock(ComponentInfo.class);
 
     expect(managementController.getClusters()).andReturn(clusters);
     expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo);
@@ -143,6 +144,9 @@ public class ComponentResourceProviderTest {
 
     expect(ambariMetaInfo.isValidServiceComponent("HDP", "99", "Service100", "Component100")).andReturn(true).anyTimes();
 
+    expect(componentInfo.isRecoveryEnabled()).andReturn(true).anyTimes();
+    expect(ambariMetaInfo.getComponent("HDP", "99", "Service100", "Component100")).andReturn(componentInfo).anyTimes();
+
     expect(serviceComponentFactory.createNew(service, "Component100")).andReturn(serviceComponent);
 
     // replay