AWS EMR Serverless: Adds a new option in the CancelJobRun API in EMR 7.9.0+, to cancel a job with grace period. This feature is enabled by default with a 120-second grace period for streaming jobs and is not enabled by default for batch jobs.

Author: aws-sdk-dotnet-automation

generator/ServiceModels/emr-serverless/emr-serverless-2021-07-13.api.json

@@ -420,6 +420,11 @@
           "shape":"JobRunId",
           "location":"uri",
           "locationName":"jobRunId"
+        },
+        "shutdownGracePeriodInSeconds":{
+          "shape":"ShutdownGracePeriodInSeconds",
+          "location":"querystring",
+          "locationName":"shutdownGracePeriodInSeconds"
         }
       }
     },
@@ -594,14 +599,15 @@
     },
     "EntryPointArgument":{
       "type":"string",
-      "max":10280,
       "min":1,
       "pattern":".*\\S.*",
       "sensitive":true
     },
     "EntryPointArguments":{
       "type":"list",
-      "member":{"shape":"EntryPointArgument"}
+      "member":{"shape":"EntryPointArgument"},
+      "max":1024,
+      "min":0
     },
     "EntryPointPath":{
       "type":"string",
@@ -1318,6 +1324,10 @@
       },
       "exception":true
     },
+    "ShutdownGracePeriodInSeconds":{
+      "type":"integer",
+      "box":true
+    },
     "SparkSubmit":{
       "type":"structure",
       "required":["entryPoint"],

generator/ServiceModels/emr-serverless/emr-serverless-2021-07-13.docs.json

@@ -815,6 +815,12 @@
       "refs": {
       }
     },
+    "ShutdownGracePeriodInSeconds": {
+      "base": null,
+      "refs": {
+        "CancelJobRunRequest$shutdownGracePeriodInSeconds": "<p>The duration (in seconds) to wait before forcefully terminating the job after cancellation is requested.</p>"
+      }
+    },
     "SparkSubmit": {
       "base": "<p>The configurations for the Spark submit job driver.</p>",
       "refs": {

generator/ServiceModels/emr-serverless/emr-serverless-2021-07-13.normal.json

@@ -544,6 +544,12 @@
           "documentation":"<p>The ID of the job run to cancel.</p>",
           "location":"uri",
           "locationName":"jobRunId"
+        },
+        "shutdownGracePeriodInSeconds":{
+          "shape":"ShutdownGracePeriodInSeconds",
+          "documentation":"<p>The duration (in seconds) to wait before forcefully terminating the job after cancellation is requested.</p>",
+          "location":"querystring",
+          "locationName":"shutdownGracePeriodInSeconds"
         }
       }
     },
@@ -817,14 +823,15 @@
     },
     "EntryPointArgument":{
       "type":"string",
-      "max":10280,
       "min":1,
       "pattern":".*\\S.*",
       "sensitive":true
     },
     "EntryPointArguments":{
       "type":"list",
-      "member":{"shape":"EntryPointArgument"}
+      "member":{"shape":"EntryPointArgument"},
+      "max":1024,
+      "min":0
     },
     "EntryPointPath":{
       "type":"string",
@@ -1891,6 +1898,10 @@
       },
       "exception":true
     },
+    "ShutdownGracePeriodInSeconds":{
+      "type":"integer",
+      "box":true
+    },
     "SparkSubmit":{
       "type":"structure",
       "required":["entryPoint"],

sdk/src/Services/EMRServerless/Generated/Model/CancelJobRunRequest.cs

@@ -37,6 +37,7 @@ public partial class CancelJobRunRequest : AmazonEMRServerlessRequest
     {
         private string _applicationId;
         private string _jobRunId;
+        private int? _shutdownGracePeriodInSeconds;
 
         /// <summary>
         /// Gets and sets the property ApplicationId. 
@@ -76,5 +77,24 @@ internal bool IsSetJobRunId()
             return this._jobRunId != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property ShutdownGracePeriodInSeconds. 
+        /// <para>
+        /// The duration (in seconds) to wait before forcefully terminating the job after cancellation
+        /// is requested.
+        /// </para>
+        /// </summary>
+        public int ShutdownGracePeriodInSeconds
+        {
+            get { return this._shutdownGracePeriodInSeconds.GetValueOrDefault(); }
+            set { this._shutdownGracePeriodInSeconds = value; }
+        }
+
+        // Check to see if ShutdownGracePeriodInSeconds property is set
+        internal bool IsSetShutdownGracePeriodInSeconds()
+        {
+            return this._shutdownGracePeriodInSeconds.HasValue; 
+        }
+
     }
 }

sdk/src/Services/EMRServerless/Generated/Model/Internal/MarshallTransformations/CancelJobRunRequestMarshaller.cs

@@ -65,7 +65,11 @@ public IRequest Marshall(CancelJobRunRequest publicRequest)
             if (!publicRequest.IsSetJobRunId())
                 throw new AmazonEMRServerlessException("Request object does not have required field JobRunId set");
             request.AddPathResource("{jobRunId}", StringUtils.FromString(publicRequest.JobRunId));
+            
+            if (publicRequest.IsSetShutdownGracePeriodInSeconds())
+                request.Parameters.Add("shutdownGracePeriodInSeconds", StringUtils.FromInt(publicRequest.ShutdownGracePeriodInSeconds));
             request.ResourcePath = "/applications/{applicationId}/jobruns/{jobRunId}";
+            request.UseQueryString = true;
 
             return request;
         }

sdk/src/Services/EMRServerless/Generated/Model/SparkSubmit.cs

@@ -63,6 +63,7 @@ internal bool IsSetEntryPoint()
         /// The arguments for the Spark submit job run.
         /// </para>
         /// </summary>
+        [AWSProperty(Min=0, Max=1024)]
         public List<string> EntryPointArguments
         {
             get { return this._entryPointArguments; }