[ARVADOS] updated: 1.3.0-2851-g91ce66442

[Git user]

Summary of changes:
 lib/cloud/azure/azure.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

       via  91ce664427d1ba915230dde3bc14163b57342af6 (commit)
      from  c76e5bc93b066d93a668c4e00b52aa550028e1f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 91ce664427d1ba915230dde3bc14163b57342af6
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Aug 19 17:43:47 2020 -0400

    16625: implement some more review feedback.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index d2dbde96d..0accb67b3 100644
--- a/lib/cloud/azure/azure.go
+++ b/lib/cloud/azure/azure.go
@@ -437,7 +437,10 @@ func (az *azureInstanceSet) Create(
 	var storageProfile *compute.StorageProfile
 
 	re := regexp.MustCompile(`^http(s?)://`)
-	if re.MatchString(string(imageID)) && az.blobcont != nil {
+	if re.MatchString(string(imageID)) {
+		if az.blobcont == nil {
+			return nil, wrapAzureError(errors.New("Invalid configuration: can't configure unmanaged image URL without StorageAccount and BlobContainer"))
+		}
 		blobname = fmt.Sprintf("%s-os.vhd", name)
 		instanceVhd := fmt.Sprintf("https://%s.blob.%s/%s/%s",
 			az.azconfig.StorageAccount,
@@ -458,7 +461,7 @@ func (az *azureInstanceSet) Create(
 				},
 			},
 		}
-	} else if az.blobcont == nil {
+	} else {
 		storageProfile = &compute.StorageProfile{
 			ImageReference: &compute.ImageReference{
 				ID: to.StringPtr("/subscriptions/" + az.azconfig.SubscriptionID + "/resourceGroups/" + az.imageResourceGroup + "/providers/Microsoft.Compute/images/" + string(imageID)),
@@ -469,8 +472,6 @@ func (az *azureInstanceSet) Create(
 				CreateOption: compute.DiskCreateOptionTypesFromImage,
 			},
 		}
-	} else {
-		return nil, wrapAzureError(errors.New("Invalid configuration: can't configure unmanaged image URL without StorageAccount and BlobContainer"))
 	}
 
 	vmParameters := compute.VirtualMachine{
@@ -512,7 +513,12 @@ func (az *azureInstanceSet) Create(
 
 	vm, err := az.vmClient.createOrUpdate(az.ctx, az.azconfig.ResourceGroup, name, vmParameters)
 	if err != nil {
-		if az.blobcont != nil {
+		// Do some cleanup. Otherwise, an unbounded number of new unused nics and
+		// blobs can pile up during times when VMs can't be created and the
+		// dispatcher keeps retrying, because the garbage collection in manageBlobs
+		// and manageNics is only triggered periodically. This is most important
+		// for nics, because those are subject to a quota.
+		if blobname != "" {
 			_, delerr := az.blobcont.GetBlobReference(blobname).DeleteIfExists(nil)
 			if delerr != nil {
 				az.logger.WithError(delerr).Warnf("Error cleaning up vhd blob after failed create")

-----------------------------------------------------------------------


hooks/post-receive
--