journal: allow remove set when jounal pool is full

Signed-off-by: kungf <yang.wang@easystack.cn>

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index d3289499a090d3ecca0c4db94a5d85f1f143650a..645a62304c5f99a67a29b3106f88b9bd2ecd100a 100644 (file)
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -139,7 +139,8 @@ void JournalTrimmer::remove_set(uint64_t object_set) {
     librados::AioCompletion *comp =
       librados::Rados::aio_create_completion(ctx, NULL,
                                              utils::rados_ctx_callback);
-    int r = m_ioctx.aio_remove(oid, comp);
+    int r = m_ioctx.aio_remove(oid, comp,
+                               CEPH_OSD_FLAG_FULL_FORCE | CEPH_OSD_FLAG_FULL_TRY);
     ceph_assert(r == 0);
     comp->release();
   }

diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index 4ad154bd1dcc5575b62127ca1143c8787805800b..78a290a3ac5e9d45040d45d1441cd080c4dcd5f9 100644 (file)
--- a/src/test/librados_test_stub/LibradosTestStub.cc
+++ b/src/test/librados_test_stub/LibradosTestStub.cc
@@ -475,6 +475,11 @@ int IoCtx::aio_remove(const std::string& oid, AioCompletion *c) {
   return ctx->aio_remove(oid, c->pc);
 }
 
+int IoCtx::aio_remove(const std::string& oid, AioCompletion *c, int flags) {
+  TestIoCtxImpl *ctx = reinterpret_cast<TestIoCtxImpl*>(io_ctx_impl);
+  return ctx->aio_remove(oid, c->pc, flags);
+}
+
 int IoCtx::aio_watch(const std::string& o, AioCompletion *c, uint64_t *handle,
                      librados::WatchCtx2 *watch_ctx) {
   TestIoCtxImpl *ctx = reinterpret_cast<TestIoCtxImpl*>(io_ctx_impl);

diff --git a/src/test/librados_test_stub/TestIoCtxImpl.h b/src/test/librados_test_stub/TestIoCtxImpl.h
index 448575a334df9a0285d5bbca3992011bd4738b29..e92d7dfa505f669f4dfdc89e249bbe99298a9346 100644 (file)
--- a/src/test/librados_test_stub/TestIoCtxImpl.h
+++ b/src/test/librados_test_stub/TestIoCtxImpl.h
@@ -90,7 +90,8 @@ public:
   virtual int aio_operate_read(const std::string& oid, TestObjectOperationImpl &ops,
                                AioCompletionImpl *c, int flags,
                                bufferlist *pbl);
-  virtual int aio_remove(const std::string& oid, AioCompletionImpl *c) = 0;
+  virtual int aio_remove(const std::string& oid, AioCompletionImpl *c,
+                         int flags = 0) = 0;
   virtual int aio_watch(const std::string& o, AioCompletionImpl *c,
                         uint64_t *handle, librados::WatchCtx2 *ctx);
   virtual int aio_unwatch(uint64_t handle, AioCompletionImpl *c);

diff --git a/src/test/librados_test_stub/TestMemIoCtxImpl.cc b/src/test/librados_test_stub/TestMemIoCtxImpl.cc
index 8b64786add725e99b261e1d5f434cf04588c3d29..9e160015ff066833b67e54a324f9704b7b734406 100644 (file)
--- a/src/test/librados_test_stub/TestMemIoCtxImpl.cc
+++ b/src/test/librados_test_stub/TestMemIoCtxImpl.cc
@@ -46,7 +46,7 @@ TestIoCtxImpl *TestMemIoCtxImpl::clone() {
   return new TestMemIoCtxImpl(*this);
 }
 
-int TestMemIoCtxImpl::aio_remove(const std::string& oid, AioCompletionImpl *c) {
+int TestMemIoCtxImpl::aio_remove(const std::string& oid, AioCompletionImpl *c, int flags) {
   m_client->add_aio_operation(oid, true,
                               boost::bind(&TestMemIoCtxImpl::remove, this, oid,
                                           get_snap_context()),

diff --git a/src/test/librados_test_stub/TestMemIoCtxImpl.h b/src/test/librados_test_stub/TestMemIoCtxImpl.h
index e15eee5613556f217ff4080636a5e7cd21a73ce5..f083230c89ebd04dd372be5c7ea3c31d30b21a9d 100644 (file)
--- a/src/test/librados_test_stub/TestMemIoCtxImpl.h
+++ b/src/test/librados_test_stub/TestMemIoCtxImpl.h
@@ -21,7 +21,7 @@ public:
 
   TestIoCtxImpl *clone() override;
 
-  int aio_remove(const std::string& oid, AioCompletionImpl *c) override;
+  int aio_remove(const std::string& oid, AioCompletionImpl *c, int flags = 0) override;
 
   int append(const std::string& oid, const bufferlist &bl,
              const SnapContext &snapc) override;