[ARVADOS] updated: 1.3.0-1659-ga994f208a

Git user git at public.curoverse.com
Mon Sep 30 18:55:54 UTC 2019


Summary of changes:
 services/keepstore/azure_blob_volume.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  a994f208a6ab576261721735e4283e7a01759d00 (commit)
      from  fcb08f0ca7794b05c77a15ab8bd46b978cb07778 (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 a994f208a6ab576261721735e4283e7a01759d00
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Sep 30 14:53:57 2019 -0400

    Use default Azure storage endpoint if configured value is "".
    
    This is the documented behavior.
    
    refs #13647
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 6806c8c6c..50a8edcbb 100644
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -34,7 +34,6 @@ func init() {
 
 func newAzureBlobVolume(cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) (Volume, error) {
 	v := &AzureBlobVolume{
-		StorageBaseURL:    storage.DefaultBaseURL,
 		RequestTimeout:    azureDefaultRequestTimeout,
 		WriteRaceInterval: azureDefaultWriteRaceInterval,
 		WriteRacePollTime: azureDefaultWriteRacePollTime,
@@ -53,6 +52,9 @@ func newAzureBlobVolume(cluster *arvados.Cluster, volume arvados.Volume, logger
 	if v.ListBlobsMaxAttempts == 0 {
 		v.ListBlobsMaxAttempts = azureDefaultListBlobsMaxAttempts
 	}
+	if v.StorageBaseURL == "" {
+		v.StorageBaseURL = storage.DefaultBaseURL
+	}
 	if v.ContainerName == "" || v.StorageAccountName == "" || v.StorageAccountKey == "" {
 		return nil, errors.New("DriverParameters: ContainerName, StorageAccountName, and StorageAccountKey must be provided")
 	}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list