Merge pull request #28 from ChevronETC/windowsworkaround

force a single thread on windows

Author: samtkaplan

.github/workflows/Test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         julia-version: [1.6, 1.7]
-        os: [ubuntu-latest, macOS-latest]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
       - uses: actions/checkout@v1.0.0
       - uses: azure/login@v1.1

src/AzStorage.jl

@@ -84,6 +84,13 @@ Base.close(object::AzObject) = nothing
 
 const __OAUTH_SCOPE = "offline_access+openid+https://storage.azure.com/user_impersonation"
 
+function windows_one_thread(nthreads)
+    if Sys.iswindows() && nthreads != 1
+        @warn "On Windows, AzStorage is limited to a single thread."
+    end
+    Sys.iswindows() ? 1 : nthreads
+end
+
 """
     container = AzContainer("containername"; storageaccount="myacccount", kwargs...)
 
@@ -105,7 +112,7 @@ function AzContainer(containername::AbstractString; storageaccount, session=AzSe
     name = split(containername, '/')
     _containername = name[1]
     prefix *= lstrip('/'*join(name[2:end], '/'), '/')
-    AzContainer(String(storageaccount), String(_containername), String(prefix), session, nthreads, nretry, verbose)
+    AzContainer(String(storageaccount), String(_containername), String(prefix), session, windows_one_thread(nthreads), nretry, verbose)
 end
 
 function AbstractStorage.Container(::Type{<:AzContainer}, d::Dict, session=AzSession(;lazy=true, scope=__OAUTH_SCOPE); nthreads = Sys.CPU_THREADS, nretry=10, verbose=0)
@@ -114,7 +121,7 @@ function AbstractStorage.Container(::Type{<:AzContainer}, d::Dict, session=AzSes
         d["containername"],
         d["prefix"],
         session,
-        get(d, "nthreads", nthreads),
+        windows_one_thread(get(d, "nthreads", nthreads)),
         get(d, "nretry", nretry),
         get(d, "verbose", verbose))
 end

test/runtests.jl

@@ -16,12 +16,12 @@ sleep(60)
 
 @testset "Error codes" begin
     @test unsafe_load(cglobal((:N_HTTP_RETRY_CODES, AzStorage.libAzStorage), Cint)) == 2
-    x = unsafe_load(cglobal((:HTTP_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clong}))
+    x = Sys.iswindows() ? unsafe_load(cglobal((:HTTP_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clonglong})) : unsafe_load(cglobal((:HTTP_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clong}))
     y = unsafe_wrap(Array, x, (2,); own=false)
     @test y == [500,503]
 
     @test unsafe_load(cglobal((:N_CURL_RETRY_CODES, AzStorage.libAzStorage), Cint)) == 5
-    x = unsafe_load(cglobal((:CURL_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clong}))
+    x = Sys.iswindows() ? unsafe_load(cglobal((:CURL_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clonglong})) : unsafe_load(cglobal((:CURL_RETRY_CODES, AzStorage.libAzStorage), Ptr{Clong}))
     y = unsafe_wrap(Array, x, (5,); own=false)
     @test y == [6,7,28,55,56]
 end
@@ -240,7 +240,11 @@ end
     @test _c.storageaccount == storageaccount
     @test _c.containername == "foo-$r-k"
     @test _c.nretry == 10
-    @test _c.nthreads == 2
+    if Sys.iswindows()
+        @test _c.nthreads == 1
+    else
+        @test _c.nthreads == 2
+    end
     rm(c)
 end
 
@@ -478,7 +482,8 @@ end
     rm(c)
 end
 
-@testset "Container,Object, copy blob to blob" begin    sleep(1)
+@testset "Container,Object, copy blob to blob" begin
+    sleep(1)
     r = lowercase(randstring(MersenneTwister(millisecond(now())+33)))
     c = AzContainer("foo-$r-o", storageaccount=storageaccount, session=session, nthreads=2, nretry=10)
     mkpath(c)
@@ -487,3 +492,14 @@ end
     @test read(open(c, "bar.txt"), String) == "Hello world"
     rm(c)
 end
+
+@testset "Windows, single thread check" begin
+    sleep(1)
+    r = lowercase(randstring(MersenneTwister(millisecond(now())+34)))
+    container = AzContainer("foo-$r.o", storageaccount=storageaccount, session=session, nthreads=2, nretry=10)
+    if Sys.iswindows()
+        @test container.nthreads == 1
+    else
+        @test container.nthreads == 2
+    end
+end