From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 4 Feb 2021 20:48:56 +0000 (-0500)
Subject: rgw: Don't swallow errors in datalog async trim
X-Git-Tag: v16.2.2~8^2~9^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a6a7b3900ca4d1e14423d1ac07a0be60edb0ad0;p=ceph.git

rgw: Don't swallow errors in datalog async trim

Typo and misleading indentation.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit e97de55f46bbe67b523abfb4c30c50f1547f2601)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/rgw_datalog.cc b/src/rgw/rgw_datalog.cc
index 1db5eb86d62e..0b68c45a13e8 100644
--- a/src/rgw/rgw_datalog.cc
+++ b/src/rgw/rgw_datalog.cc
@@ -798,7 +798,10 @@ int DataLogBackends::trim_entries(int shard_id, std::string_view marker)
     l.unlock();
     auto c = be->gen_id == target_gen ? cursor : be->max_marker();
     r = be->trim(shard_id, c);
-    if (r == -ENODATA && be->gen_id < target_gen) r = 0;
+    if (r == -ENOENT)
+      r = -ENODATA;
+    if (r == -ENODATA && be->gen_id < target_gen)
+      r = 0;
     l.lock();
   };
   return r;
@@ -820,8 +823,8 @@ public:
   const uint64_t tail_gen;
   boost::intrusive_ptr<RGWDataChangesBE> be;
 
-  GenTrim(DataLogBackends* bes, int shard_id, uint64_t target_gen, std::string cursor,
-	  uint64_t head_gen, uint64_t tail_gen,
+  GenTrim(DataLogBackends* bes, int shard_id, uint64_t target_gen,
+	  std::string cursor, uint64_t head_gen, uint64_t tail_gen,
 	  boost::intrusive_ptr<RGWDataChangesBE> be,
 	  lr::AioCompletion* super)
     : Completion(super), bes(bes), shard_id(shard_id), target_gen(target_gen),
@@ -831,8 +834,9 @@ public:
   void handle(Ptr&& p, int r) {
     auto gen_id = be->gen_id;
     be.reset();
-    if (r == -ENOENT) r = -ENODATA;
-    if (r == -ENODATA && gen_id < target_gen) r = 0;
+    if (r == -ENOENT)
+      r = -ENODATA;
+    if (r == -ENODATA && gen_id < target_gen)
       r = 0;
     if (r < 0) {
       complete(std::move(p), r);
@@ -844,7 +848,7 @@ public:
       auto i = bes->upper_bound(gen_id);
       if (i == bes->end() || i->first > target_gen || i->first > head_gen) {
 	l.unlock();
-	complete(std::move(p), r);
+	complete(std::move(p), -ENODATA);
 	return;
       }
       be = i->second;