Data Plane Update 2022-01-01.15.0

eng/spotbugs-aggregate-report/pom.xml

@@ -112,7 +112,7 @@
         <dependency>
           <groupId>com.microsoft.azure</groupId>
           <artifactId>azure-batch</artifactId>
-          <version>10.1.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-batch;current} -->
+          <version>10.2.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-batch;current} -->
         </dependency>
         <dependency>
           <groupId>com.microsoft.azure</groupId>

eng/versioning/version_data.txt

@@ -3,7 +3,7 @@
 # Note: com.azure:azure-sdk-parent is in version_client.txt
 
 com.azure:azure-data-sdk-parent;1.3.0;1.3.0
-com.microsoft.azure:azure-batch;10.0.0;10.1.0-beta.1
+com.microsoft.azure:azure-batch;10.1.0;10.2.0-beta.1
 com.microsoft.azure:azure-applicationinsights-query;1.0.0-beta-2;1.0.0-beta-2
 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-spellcheck;1.1.0-beta.1;1.1.0-beta.1
 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-textanalytics;1.1.0-beta.1;1.1.0-beta.1

sdk/batch/microsoft-azure-batch/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Release History
 
-## 10.1.0-beta.1 (Unreleased)
-
+## 10.1.0 (Unreleased)
+
+### Features Added
+- Added property uploadHeaders to `OutputFileBlobContainerDestination`.
+  - Allows users to set custom HTTP headers on resource file uploads.
+  - Array of type HttpHeader (also being added).
+- Added boolean property `allow_task_preemption` to `JobSpecification`, `CloudJob`, `JobAddParameter`, `JobPatchParameter`, `JobUpdateParameter`
+  - Mark Tasks as preemptible for higher priority Tasks (requires Comms-Enabled or Single Tenant Pool).
+- Replaced comment (title, description, etc.) references of "low-priority" with "Spot/Low-Priority", to reflect new service behavior.
+  - No API change required.
+  - Low-Priority Compute Nodes (VMs) will continue to be used for User Subscription pools (and only User Subscription pools), as before.
+  - Spot Compute Nodes (VMs) will now be used for Batch Managed (and only Batch Managed pools) pools.
+  - Relevant docs:
+      https://docs.microsoft.com/azure/batch/nodes-and-pools
+    - https://docs.microsoft.com/azure/batch/batch-spot-vms
+### Bugs Fixed
+ -upgraded unsupported Ubuntu versions of VMs in tests
 
 ## 10.0.0 (2021-07-30)
 

sdk/batch/microsoft-azure-batch/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Microsoft
+Copyright (c) 2022 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

sdk/batch/microsoft-azure-batch/pom.xml

@@ -16,7 +16,7 @@
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-batch</artifactId>
   <packaging>jar</packaging>
-  <version>10.1.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-batch;current} -->
+  <version>10.2.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-batch;current} -->
 
   <name>Microsoft Azure Batch SDK Root</name>
   <description>This package contains the root module of Microsoft Azure Batch SDK.</description>

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/PoolOperations.java

@@ -305,7 +305,7 @@ public void createPool(String poolId, String virtualMachineSize,
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @throws BatchErrorException
      *             Exception thrown when an error response is received from the
      *             Batch service.
@@ -335,7 +335,7 @@ public void createPool(String poolId, String virtualMachineSize,
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @param additionalBehaviors
      *            A collection of {@link BatchClientBehavior} instances that are
      *            applied to the Batch service request.
@@ -398,7 +398,7 @@ public void createPool(String poolId, String virtualMachineSize,
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @throws BatchErrorException
      *             Exception thrown when an error response is received from the
      *             Batch service.
@@ -428,7 +428,7 @@ public void createPool(String poolId, String virtualMachineSize,
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @param additionalBehaviors
      *            A collection of {@link BatchClientBehavior} instances that are
      *            applied to the Batch service request.
@@ -502,7 +502,7 @@ public void createPool(PoolAddParameter pool, Iterable<BatchClientBehavior> addi
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @throws BatchErrorException
      *             Exception thrown when an error response is received from the
      *             Batch service.
@@ -524,7 +524,7 @@ public void resizePool(String poolId, Integer targetDedicatedNodes, Integer targ
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @param resizeTimeout
      *            The timeout for allocation of compute nodes to the pool or removal
      *            of compute nodes from the pool. If the pool has not reached the
@@ -550,7 +550,7 @@ public void resizePool(String poolId, Integer targetDedicatedNodes, Integer targ
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @param resizeTimeout
      *            The timeout for allocation of compute nodes to the pool or removal
      *            of compute nodes from the pool. If the pool has not reached the
@@ -580,7 +580,7 @@ public void resizePool(String poolId, Integer targetDedicatedNodes, Integer targ
      * @param targetDedicatedNodes
      *            The desired number of dedicated compute nodes in the pool.
      * @param targetLowPriorityNodes
-     *            The desired number of low-priority compute nodes in the pool.
+     *            The desired number of Spot/Low-priority compute nodes in the pool.
      * @param resizeTimeout
      *            The timeout for allocation of compute nodes to the pool or removal
      *            of compute nodes from the pool. If the pool has not reached the

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodeExtensions.java

@@ -21,6 +21,7 @@
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponseWithHeaders;
+import java.io.IOException;
 import java.util.List;
 import rx.Observable;
 

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java

@@ -50,6 +50,7 @@
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponseWithHeaders;
 import java.io.InputStream;
+import java.io.IOException;
 import java.util.List;
 import rx.Observable;
 

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Files.java

@@ -35,6 +35,7 @@
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponseWithHeaders;
 import java.io.InputStream;
+import java.io.IOException;
 import java.util.List;
 import rx.Observable;
 

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/Pools.java

@@ -57,6 +57,7 @@
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponseWithHeaders;
+import java.io.IOException;
 import java.util.List;
 import rx.Observable;
 

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/implementation/BatchServiceClientImpl.java

@@ -304,7 +304,7 @@ public BatchServiceClientImpl(RestClient restClient) {
     }
 
     protected void initialize() {
-        this.apiVersion = "2021-06-01.14.0";
+        this.apiVersion = "2022-01-01.15.0";
         this.acceptLanguage = "en-US";
         this.longRunningOperationRetryTimeout = 30;
         this.generateClientRequestId = true;
@@ -328,6 +328,6 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s)", super.userAgent(), "BatchServiceClient", "2021-06-01.14.0");
+        return String.format("%s (%s, %s)", super.userAgent(), "BatchServiceClient", "2022-01-01.15.0");
     }
 }

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJob.java

@@ -107,13 +107,24 @@ public class CloudJob {
     @JsonProperty(value = "priority")
     private Integer priority;
 
+    /**
+     * Whether Tasks in this job can be preempted by other high priority jobs.
+     * If the value is set to True, other high priority jobs submitted to the
+     * system will take precedence and will be able requeue tasks from this
+     * job. You can update a job's allowTaskPreemption after it has been
+     * created using the update job API.
+     */
+    @JsonProperty(value = "allowTaskPreemption")
+    private Boolean allowTaskPreemption;
+
     /**
      * The maximum number of tasks that can be executed in parallel for the
      * job.
      * The value of maxParallelTasks must be -1 or greater than 0 if specified.
      * If not specified, the default value is -1, which means there's no limit
      * to the number of tasks that can be run at once. You can update a job's
      * maxParallelTasks after it has been created using the update job API.
+     * This property is currently in private preview.
      */
     @JsonProperty(value = "maxParallelTasks")
     private Integer maxParallelTasks;
@@ -452,6 +463,26 @@ public CloudJob withPriority(Integer priority) {
         return this;
     }
 
+    /**
+     * Get if the value is set to True, other high priority jobs submitted to the system will take precedence and will be able requeue tasks from this job. You can update a job's allowTaskPreemption after it has been created using the update job API.
+     *
+     * @return the allowTaskPreemption value
+     */
+    public Boolean allowTaskPreemption() {
+        return this.allowTaskPreemption;
+    }
+
+    /**
+     * Set if the value is set to True, other high priority jobs submitted to the system will take precedence and will be able requeue tasks from this job. You can update a job's allowTaskPreemption after it has been created using the update job API.
+     *
+     * @param allowTaskPreemption the allowTaskPreemption value to set
+     * @return the CloudJob object itself.
+     */
+    public CloudJob withAllowTaskPreemption(Boolean allowTaskPreemption) {
+        this.allowTaskPreemption = allowTaskPreemption;
+        return this;
+    }
+
     /**
      * Get the value of maxParallelTasks must be -1 or greater than 0 if specified. If not specified, the default value is -1, which means there's no limit to the number of tasks that can be run at once. You can update a job's maxParallelTasks after it has been created using the update job API.
      *
@@ -462,7 +493,7 @@ public Integer maxParallelTasks() {
     }
 
     /**
-     * Set the value of maxParallelTasks must be -1 or greater than 0 if specified. If not specified, the default value is -1, which means there's no limit to the number of tasks that can be run at once. You can update a job's maxParallelTasks after it has been created using the update job API.
+     * Set the value of maxParallelTasks must be -1 or greater than 0 if specified. If not specified, the default value is -1, which means there's no limit to the number of tasks that can be run at once. You can update a job's maxParallelTasks after it has been created using the update job API. This property is currently in private preview.
      *
      * @param maxParallelTasks the maxParallelTasks value to set
      * @return the CloudJob object itself.

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudJobSchedule.java

@@ -94,6 +94,8 @@ public class CloudJobSchedule {
 
     /**
      * The schedule according to which Jobs will be created.
+     * All times are fixed respective to UTC and are not impacted by daylight
+     * saving time.
      */
     @JsonProperty(value = "schedule")
     private Schedule schedule;
@@ -328,7 +330,7 @@ public CloudJobSchedule withPreviousStateTransitionTime(DateTime previousStateTr
     }
 
     /**
-     * Get the schedule value.
+     * Get all times are fixed respective to UTC and are not impacted by daylight saving time.
      *
      * @return the schedule value
      */
@@ -337,7 +339,7 @@ public Schedule schedule() {
     }
 
     /**
-     * Set the schedule value.
+     * Set all times are fixed respective to UTC and are not impacted by daylight saving time.
      *
      * @param schedule the schedule value to set
      * @return the CloudJobSchedule object itself.

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/CloudPool.java

@@ -145,9 +145,9 @@ public class CloudPool {
     private Integer currentDedicatedNodes;
 
     /**
-     * The number of low-priority Compute Nodes currently in the Pool.
-     * low-priority Compute Nodes which have been preempted are included in
-     * this count.
+     * The number of Spot/Low-priority Compute Nodes currently in the Pool.
+     * Spot/Low-priority Compute Nodes which have been preempted are included
+     * in this count.
      */
     @JsonProperty(value = "currentLowPriorityNodes")
     private Integer currentLowPriorityNodes;
@@ -632,7 +632,7 @@ public CloudPool withCurrentDedicatedNodes(Integer currentDedicatedNodes) {
     }
 
     /**
-     * Get low-priority Compute Nodes which have been preempted are included in this count.
+     * Get spot/Low-priority Compute Nodes which have been preempted are included in this count.
      *
      * @return the currentLowPriorityNodes value
      */
@@ -641,7 +641,7 @@ public Integer currentLowPriorityNodes() {
     }
 
     /**
-     * Set low-priority Compute Nodes which have been preempted are included in this count.
+     * Set spot/Low-priority Compute Nodes which have been preempted are included in this count.
      *
      * @param currentLowPriorityNodes the currentLowPriorityNodes value to set
      * @return the CloudPool object itself.

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNode.java

@@ -34,7 +34,7 @@ public class ComputeNode {
 
     /**
      * The current state of the Compute Node.
-     * The low-priority Compute Node has been preempted. Tasks which were
+     * The Spot/Low-priority Compute Node has been preempted. Tasks which were
      * running on the Compute Node when it was preempted will be rescheduled
      * when another Compute Node becomes available. Possible values include:
      * 'idle', 'rebooting', 'reimaging', 'running', 'unusable', 'creating',
@@ -179,7 +179,7 @@ public class ComputeNode {
 
     /**
      * Whether this Compute Node is a dedicated Compute Node. If false, the
-     * Compute Node is a low-priority Compute Node.
+     * Compute Node is a Spot/Low-priority Compute Node.
      */
     @JsonProperty(value = "isDedicated")
     private Boolean isDedicated;
@@ -244,7 +244,7 @@ public ComputeNode withUrl(String url) {
     }
 
     /**
-     * Get the low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. Possible values include: 'idle', 'rebooting', 'reimaging', 'running', 'unusable', 'creating', 'starting', 'waitingForStartTask', 'startTaskFailed', 'unknown', 'leavingPool', 'offline', 'preempted'.
+     * Get the Spot/Low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. Possible values include: 'idle', 'rebooting', 'reimaging', 'running', 'unusable', 'creating', 'starting', 'waitingForStartTask', 'startTaskFailed', 'unknown', 'leavingPool', 'offline', 'preempted'.
      *
      * @return the state value
      */
@@ -253,7 +253,7 @@ public ComputeNodeState state() {
     }
 
     /**
-     * Set the low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. Possible values include: 'idle', 'rebooting', 'reimaging', 'running', 'unusable', 'creating', 'starting', 'waitingForStartTask', 'startTaskFailed', 'unknown', 'leavingPool', 'offline', 'preempted'.
+     * Set the Spot/Low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. Possible values include: 'idle', 'rebooting', 'reimaging', 'running', 'unusable', 'creating', 'starting', 'waitingForStartTask', 'startTaskFailed', 'unknown', 'leavingPool', 'offline', 'preempted'.
      *
      * @param state the state value to set
      * @return the ComputeNode object itself.

sdk/batch/microsoft-azure-batch/src/main/java/com/microsoft/azure/batch/protocol/models/ComputeNodeState.java

@@ -51,7 +51,7 @@ public enum ComputeNodeState {
     /** The Compute Node is not currently running a Task, and scheduling of new Tasks to the Compute Node is disabled. */
     OFFLINE("offline"),
 
-    /** The low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. */
+    /** The Spot/Low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available. */
     PREEMPTED("preempted");
 
     /** The actual serialized value for a ComputeNodeState instance. */