use AzSessions 1.2 time offset

Author: samtkaplan

Project.toml

@@ -1,12 +1,13 @@
 name = "AzStorage"
 uuid = "c6697862-1611-5eae-9ef8-48803c85c8d6"
-version = "1.5.1"
+version = "1.6.0"
 
 [deps]
 AbstractStorage = "14dbef02-f468-5f15-853e-5ec8dee7b899"
 AzSessions = "f239b30d-ae6b-58be-a2d5-7e9f30e280a9"
 AzStorage_jll = "00c928b4-b5f3-54d8-b38d-afd4635c4ad2"
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
@@ -15,17 +16,16 @@ Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [compat]
 AbstractStorage = "^1.1"
-AzSessions = "1"
+AzSessions = "^1.2"
 AzStorage_jll = "0.4"
 HTTP = "0.8, 0.9"
 LightXML = "0.9"
 julia = "^1.6"
 
 [extras]
-Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Dates", "JSON", "Random", "Test"]
+test = ["JSON", "Random", "Test"]

src/AzStorage.jl

@@ -1,6 +1,6 @@
 module AzStorage
 
-using AbstractStorage, AzSessions, AzStorage_jll, Base64, DelimitedFiles, HTTP, LightXML, Serialization, Sockets
+using AbstractStorage, AzSessions, AzStorage_jll, Base64, Dates, DelimitedFiles, HTTP, LightXML, Serialization, Sockets
 
 # https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes
 const RETRYABLE_HTTP_ERRORS = [
@@ -244,7 +244,8 @@ function writebytes(c::AzContainer, o::AbstractString, data::DenseArray{UInt8};
     end
 
     function writebytes_block(c, o, data, _nblocks)
-        t = token(c.session)
+        # heuristic to increase probability that token is valid during the retry logic in AzSessions.c
+        t = token(c.session; offset=Minute(30))
         l = ceil(Int, log10(_nblocks))
         blockids = [base64encode(lpad(blockid-1, l, '0')) for blockid in 1:_nblocks]
         _blockids = [HTTP.escapeuri(blockid) for blockid in blockids]
@@ -412,7 +413,8 @@ function readbytes!(c::AzContainer, o::AbstractString, data::DenseArray{UInt8};
     end
 
     function readbytes_threaded!(c, o, data, offset, _nthreads)
-        t = token(c.session)
+        # heuristic to increase probability that token is valid during the retry logic in AzSessions.c
+        t = token(c.session; offset=Minute(30))
         r = ccall((:curl_readbytes_retry_threaded, libAzStorage), ResponseCodes,
             (Cstring, Cstring,          Cstring,         Cstring,        Ptr{UInt8}, Csize_t, Csize_t,      Cint,      Cint,     Cint),
              t,       c.storageaccount, c.containername, addprefix(c,o), data,       offset,  length(data), _nthreads, c.nretry, c.verbose)