aboutsummaryrefslogtreecommitdiff
path: root/script/jepsen.garage/src/jepsen
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-10-19 23:40:55 +0200
committerAlex Auvolat <alex@adnab.me>2023-10-19 23:40:55 +0200
commitef662822c9e48ff7cfd9300590617e089c0a9498 (patch)
tree13bfaf142e3d4ea7251f0596b6e70077eadc2951 /script/jepsen.garage/src/jepsen
parentda8b1707489b70c25395ee49383ecbbd8c9f9404 (diff)
downloadgarage-ef662822c9e48ff7cfd9300590617e089c0a9498.tar.gz
garage-ef662822c9e48ff7cfd9300590617e089c0a9498.zip
jepsen: fix the list-objects call (?)
Diffstat (limited to 'script/jepsen.garage/src/jepsen')
-rw-r--r--script/jepsen.garage/src/jepsen/garage/s3api.clj27
-rw-r--r--script/jepsen.garage/src/jepsen/garage/set.clj16
2 files changed, 23 insertions, 20 deletions
diff --git a/script/jepsen.garage/src/jepsen/garage/s3api.clj b/script/jepsen.garage/src/jepsen/garage/s3api.clj
index 977de7dc..4f292ac0 100644
--- a/script/jepsen.garage/src/jepsen/garage/s3api.clj
+++ b/script/jepsen.garage/src/jepsen/garage/s3api.clj
@@ -31,19 +31,20 @@
:input-stream bytes-stream
:metadata {:content-length (count some-bytes)}))))
+(defn list-inner [creds prefix ct accum]
+ (let [list-result (s3/list-objects-v2 creds
+ {:bucket-name (:bucket creds)
+ :prefix prefix
+ :continuation-token ct})
+ new-object-summaries (:object-summaries list-result)
+ new-objects (map (fn [d] (:key d)) new-object-summaries)
+ objects (concat new-objects accum)]
+ (info (:endpoint creds) "ListObjectsV2 prefix(" prefix "), ct(" ct "): " new-objects)
+ (if (:truncated? list-result)
+ (list-inner creds prefix (:next-continuation-token list-result) objects)
+ objects)))
(defn list
"Helper for ListObjects -- just lists everything in the bucket"
[creds prefix]
- (defn list-inner [ct accum]
- (let [list-result (s3/list-objects-v2 creds
- {:bucket-name (:bucket creds)
- :prefix prefix
- :continuation-token ct})
- new-object-summaries (:object-summaries list-result)
- new-objects (map (fn [d] (:key d)) new-object-summaries)
- objects (concat new-objects accum)]
- (info (:endpoint creds) "ListObjectsV2 prefix(" prefix "), ct(" ct "): " new-objects)
- (if (:truncated? list-result)
- (list-inner (:next-continuation-token list-result) objects)
- objects)))
- (list-inner nil []))
+ (info "in s3/list creds:" creds ", prefix:" prefix)
+ (list-inner creds prefix nil []))
diff --git a/script/jepsen.garage/src/jepsen/garage/set.clj b/script/jepsen.garage/src/jepsen/garage/set.clj
index 8a1ab83f..c5387462 100644
--- a/script/jepsen.garage/src/jepsen/garage/set.clj
+++ b/script/jepsen.garage/src/jepsen/garage/set.clj
@@ -44,13 +44,15 @@
(util/timeout
10000
(assoc op :type :fail, :error ::timeout)
- (let [items (s3/list (:creds this) prefix)]
- (info "list results for prefix" prefix ":" items " (node:" (:endpoint (:creds this)) ")")
- (let [items-stripped (map (fn [o]
- (assert (str/starts-with? o prefix))
- (str/replace-first o prefix "")) items)
- items-set (set (map parse-long items-stripped))]
- (assoc op :type :ok, :value (independent/tuple k items-set))))))))
+ (do
+ (info "call s3/list creds: " (:creds this) ", prefix:" prefix)
+ (let [items (s3/list (:creds this) prefix)]
+ (info "list results for prefix" prefix ":" items " (node:" (:endpoint (:creds this)) ")")
+ (let [items-stripped (map (fn [o]
+ (assert (str/starts-with? o prefix))
+ (str/replace-first o prefix "")) items)
+ items-set (set (map parse-long items-stripped))]
+ (assoc op :type :ok, :value (independent/tuple k items-set)))))))))
(teardown! [this test])
(close! [this test]))