Disable UnreachableStrategy for resident tasks

Summary:
Require disabled for resident tasks. Fixes #5163. Partially addresses

Test Plan: create resident task. Make it get lost. Ensure that it
doesn't come go inactive.

Subscribers: marathon-team

Differential Revision: https://phabricator.mesosphere.com/D488

docs/docs/rest-api/public/api/v2/types/unreachableStrategy.raml

@@ -1,6 +1,10 @@
 #%RAML 1.0 Library
 types:
-  UnreachableStrategy:
+  UnreachableStrategy: (UnreachableDisabled | UnreachableEnabled)
+  UnreachableDisabled:
+    type: string
+    enum: [ disabled ]
+  UnreachableEnabled:
     type: object
     properties:
       inactiveAfterSeconds?:
@@ -13,8 +17,7 @@ types:
           as inactive. This will trigger a new instance launch. The original task is not
           expunged yet. Must be less than expungeAfterSeconds.
 
-          The default value is set to 5 minutes for ephemeral tasks (300 seconds).
-          The default value is set to 1 hour for resident tasks (3600 seconds).
+          The default value is set to 5 minutes (300 seconds).
 
       expungeAfterSeconds?:
         type: integer
@@ -26,8 +29,4 @@ types:
           it will be killed if it ever comes back. Instances are usually marked as unreachable before they are expunged
           but they don't have to. This value is required to be greater than inactiveAfterSeconds.
 
-          The default value is set to 10 minutes for ephemeral tasks (600 seconds).
-          The default value is set to 7 days for resident tasks (604800 seconds).
-
-          If the instance has any persistent volumes associated with it, then they will be destroyed and associated data
-          will be deleted.
+          The default value is set to 10 minutes (600 seconds).

src/main/proto/marathon.proto

@@ -118,8 +118,8 @@ message ServiceDefinition {
 }
 
 message UnreachableStrategy {
-  required uint64 inactiveAfterSeconds = 1 [default = 900 ]; // 15 minutes
-  required uint64 expungeAfterSeconds = 2 [default = 604800 ]; // 7 days
+  optional uint64 inactiveAfterSeconds = 1 [default = 900 ]; // 15 minutes
+  optional uint64 expungeAfterSeconds = 2 [default = 604800 ]; // 7 days
 }
 
 // we serialize PodDefinition and Instances as json, only required for legacy content

src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala

@@ -15,7 +15,7 @@ import mesosphere.marathon.core.pod.PodDefinition
 import mesosphere.marathon.core.readiness.ReadinessCheck
 import mesosphere.marathon.core.task.Task
 import mesosphere.marathon.core.task.state.NetworkInfo
-import mesosphere.marathon.raml.{ Pod, Raml, Resources, UnreachableStrategy, KillSelection }
+import mesosphere.marathon.raml.{ Pod, Raml, Resources, KillSelection }
 import mesosphere.marathon.state
 import mesosphere.marathon.state._
 import mesosphere.marathon.upgrade.DeploymentManager.DeploymentStepInfo
@@ -1096,7 +1096,7 @@ trait AppAndGroupFormats {
             readinessChecks = extra.readinessChecks,
             secrets = extra.secrets,
             taskKillGracePeriod = extra.maybeTaskKillGracePeriod,
-            unreachableStrategy = extra.unreachableStrategy.fold(defaultUnreachableStrategy)(Raml.fromRaml(_)),
+            unreachableStrategy = extra.unreachableStrategy.getOrElse(defaultUnreachableStrategy),
             killSelection = extra.killSelection.fold(state.KillSelection.DefaultKillSelection)(Raml.fromRaml(_))
           )
         }
@@ -1163,6 +1163,17 @@ trait AppAndGroupFormats {
     }
   }
 
+  implicit val UnreachableStrategyFormat: Format[UnreachableStrategy] = new Format[UnreachableStrategy] {
+    // override def
+    override def reads(json: JsValue): JsResult[UnreachableStrategy] = {
+      json.validate[raml.UnreachableStrategy].map(Raml.fromRaml(_))
+    }
+
+    override def writes(unreachableStrategy: UnreachableStrategy): JsValue = {
+      Json.toJson(Raml.toRaml(unreachableStrategy))
+    }
+  }
+
   implicit lazy val ResidencyFormat: Format[Residency] = (
     (__ \ "relaunchEscalationTimeoutSeconds").formatNullable[Long]
     .withDefault(Residency.defaultRelaunchEscalationTimeoutSeconds) ~
@@ -1379,7 +1390,7 @@ trait AppAndGroupFormats {
         storeUrls = storeUrls, requirePorts = requirePorts,
         backoff = backoffSeconds, backoffFactor = backoffFactor, maxLaunchDelay = maxLaunchDelaySeconds,
         container = container, healthChecks = healthChecks, dependencies = dependencies,
-        unreachableStrategy = unreachableStrategy.map(Raml.fromRaml(_)),
+        unreachableStrategy = unreachableStrategy,
         killSelection = killSelection.map(Raml.fromRaml(_))
       )
     ).flatMap { update =>