Remove shadowing

basho · Jul 23, 2015 · 9aaf541 · 9aaf541 · shino · Jul 24, 2015
1 parent 4fe128e
commit 9aaf541
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/stanchion_multipart.erl b/src/stanchion_multipart.erl
@@ -190,9 +190,7 @@ check_no_multipart_uploads(Bucket, RiakPid) ->
 
     %% check all up
     lists:all(fun(Key) ->
-                      {GetResult, TAT} =
-                          ?TURNAROUND_TIME(riakc_pb_socket:get(RiakPid, HashBucket, Key)),
-                      stanchion_stats:update([riakc, get_manifest], TAT),
+                      GetResult = stanchion_utils:get_manifests_raw(RiakPid, Bucket, Key),
                       has_no_upload(GetResult)
               end, Keys).
 

diff --git a/src/stanchion_utils.erl b/src/stanchion_utils.erl
@@ -32,6 +32,7 @@
          get_admin_creds/0,
          get_keys_and_values/1,
          get_manifests/3,
+         get_manifests_raw/3,
          has_tombstone/1,
          pow/2,
          pow/3,
@@ -598,6 +599,10 @@ is_bucket_clean(Bucket, RiakPid, BucketObj) ->
                         {true, BucketObj}
                 end
         end
+    catch T:E ->
+            _ = lager:error("Could not check whether bucket was empty. Reason: ~p:~p - ~p",
+                            [T,E,erlang:get_stacktrace()]),
+            error({T, E})
     after
         close_manifest_connection(RiakPid, ManifestRiakPid)
     end.