fixup

Author: samtkaplan

src/AzStorage.jl

@@ -976,7 +976,31 @@ function generate_user_delegation_sas(c::AzContainer, b::AbstractString; permiss
     "sig=$signed_string"
 end
 
-function Base.cp(inc::AzContainer, inb::AbstractString, outc::AzContainer, outb::AbstractString; showprogress=false)
+function status(c::AzContainer, b::AbstractString)
+    local copy_progress
+    r_status = @retry c.nretry HTTP.request(
+        "GET",
+        "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/$(addprefix(c,b))",
+        [
+            "Authorization" => "Bearer $(token(c.session))",
+            "x-ms-version" => API_VERSION
+        ];
+        retry = false,
+        verbose = c.verbose,
+        connect_timeout = c.connect_timeout,
+        readtimeout = c.read_timeout
+    )
+
+    copy_status = HTTP.header(r_status, "x-ms-copy-status")
+    copy_progress = HTTP.header(r_status, "x-ms-copy-progress")
+    copy_reason = HTTP.header(r_status, "x-ms-copy-status-description")
+
+    Dict("status"=>copy_status, "progress"=>copy_progress, "reason"=>copy_reason)
+
+    nothing
+end
+
+function Base.cp(inc::AzContainer, inb::AbstractString, outc::AzContainer, outb::AbstractString; showprogress=false, async=false)
     source_url = "https://$(inc.storageaccount).blob.core.windows.net/$(inc.containername)/$(addprefix(inc,inb))"
 
     if inc.storageaccount != outc.storageaccount
@@ -990,7 +1014,7 @@ function Base.cp(inc::AzContainer, inb::AbstractString, outc::AzContainer, outb:
         "x-ms-copy-source" => source_url
     ]
 
-    r = @retry inc.nretry HTTP.request(
+    r_copy = @retry inc.nretry HTTP.request(
         "PUT",
         "https://$(outc.storageaccount).blob.core.windows.net/$(outc.containername)/$(addprefix(outc,outb))",
         headers;
@@ -1000,37 +1024,26 @@ function Base.cp(inc::AzContainer, inb::AbstractString, outc::AzContainer, outb:
         readtimeout = inc.read_timeout
     )
 
-    if r.status == 202
-        local copy_progress
+    if !async && r_copy.status == 202
         while true
-            r_status = HTTP.request(
-                "GET",
-                "https://$(outc.storageaccount).blob.core.windows.net/$(outc.containername)/$(addprefix(outc,outb))",
-                [
-                    "Authorization" => "Bearer $(token(outc.session))",
-                    "x-ms-version" => API_VERSION
-                ];
-                retry = false,
-                verbose = inc.verbose,
-                connect_timeout = inc.connect_timeout,
-                readtimeout = inc.read_timeout
-            )
-
-            copy_status = HTTP.header(r_status, "x-ms-copy-status")
-            copy_progress = HTTP.header(r_status, "x-ms-copy-progress")
-            if copy_status == "success"
-                break
+            local stat
+            try
+                stat = cp_status(outc, outb)
+            catch
+                @warn "unable to get copy status for blob copy, retrying..."
+                stat = Dict("status"=>"unknown")
             end
-            if copy_status == "aborted"
-                reason = HTTP.header(r_status, "x-ms-copy-status-description")
-                error("blob copy aborted, src=$(inc.storageaccount): $(inc.containername)/$(addprefix(inc,inb)), dest=$(outc.storageaccount): $(outc.containername)/$(addprefix(outc,outb)), reason=$reason")
+
+            if stat["status"] == "success"
+                break
+            elseif stat["status"] == "aborted"
+                error("blob copy aborted, dest=$(outc.storageaccount): $(outc.containername)/$(addprefix(outc,outb)), reason=$(stat["reason"])")
                 break
+            elseif stat["status"] == "pending" && showprogress
+                print("copy progress: $(stat["progress"])\r")
             end
-
-            showprogress && print("copy progress: $copy_progress bytes\r")
-            sleep(.1)
+            sleep(1)
         end
-        showprogress && print("copy progress: $copy_progress bytes\r\n")
     end
 
     nothing
@@ -1406,6 +1419,6 @@ Note that the information stored is global, and not specfic to any one given IO
 """
 getperf_counters() = @ccall libAzStorage.getperf_counters()::PerfCounters
 
-export AzContainer, containers, readdlm, writedlm
+export AzContainer, containers, readdlm, status, writedlm
 
 end