16106: update Azure preemptible node code after real world testing. Add

[arvados.git] / lib / cloud / azure / azure.go

diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index ad1f8c532d6a1a8a1630c1c83d35a67aaa8a6d0d..100d87c337f22a8daddf2e3aeca7efc5836102d4 100644 (file)
--- a/lib/cloud/azure/azure.go
+++ b/lib/cloud/azure/azure.go
@@ -491,21 +491,6 @@ func (az *azureInstanceSet) Create(
                }
        }
 
-       priority := compute.Regular
-       evictionPolicy := compute.Deallocate
-       var billingProfile compute.BillingProfile
-       var maxPrice float64
-       if instanceType.Preemptible {
-               priority = compute.Spot
-               evictionPolicy = compute.Delete
-               // Setting maxPrice to -1 is the equivalent of paying spot price, up to the
-               // normal price. This means the node will not be pre-empted for price
-               // reasons. It may still be pre-empted for capacity reasons though. And
-               // Azure offers *no* SLA on spot instances.
-               maxPrice = -1
-               billingProfile = compute.BillingProfile{MaxPrice: &maxPrice}
-       }
-
        vmParameters := compute.VirtualMachine{
                Location: &az.azconfig.Location,
                Tags:     tags,
@@ -514,9 +499,6 @@ func (az *azureInstanceSet) Create(
                                VMSize: compute.VirtualMachineSizeTypes(instanceType.ProviderType),
                        },
                        StorageProfile: storageProfile,
-                       Priority:       priority,
-                       EvictionPolicy: evictionPolicy,
-                       BillingProfile: &billingProfile,
                        NetworkProfile: &compute.NetworkProfile{
                                NetworkInterfaces: &[]compute.NetworkInterfaceReference{
                                        {
@@ -546,6 +528,18 @@ func (az *azureInstanceSet) Create(
                },
        }
 
+       var maxPrice float64
+       if instanceType.Preemptible {
+               // Setting maxPrice to -1 is the equivalent of paying spot price, up to the
+               // normal price. This means the node will not be pre-empted for price
+               // reasons. It may still be pre-empted for capacity reasons though. And
+               // Azure offers *no* SLA on spot instances.
+               maxPrice = -1
+               vmParameters.VirtualMachineProperties.Priority = compute.Spot
+               vmParameters.VirtualMachineProperties.EvictionPolicy = compute.Delete
+               vmParameters.VirtualMachineProperties.BillingProfile = &compute.BillingProfile{MaxPrice: &maxPrice}
+       }
+
        vm, err := az.vmClient.createOrUpdate(az.ctx, az.azconfig.ResourceGroup, name, vmParameters)
        if err != nil {
                // Do some cleanup. Otherwise, an unbounded number of new unused nics and