crimson/osd: skip empty transaction in ShardServices::dispatch_context_transaction

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 45ae1875b2be552e966ce056c309cc9437f6ff60..736e512c3703321ee1cd7aeeb80173417e00078f 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -130,7 +130,7 @@ PG::PG(
 PG::~PG() {}
 
 bool PG::try_flush_or_schedule_async() {
-  logger().debug("PG::try_flush_or_schedule_async: do_transaction...");
+  logger().debug("PG::try_flush_or_schedule_async: flush ...");
   (void)shard_services.get_store().flush(
     coll_ref
   ).then(

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index 17192e65d76a85e618d3ce95231906d464ce4714..b9d97b2b283b95ad5655c5691ce2a83ec88d35d8 100644 (file)
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -106,7 +106,12 @@ seastar::future<> ShardServices::send_to_osd(
 
 seastar::future<> ShardServices::dispatch_context_transaction(
   crimson::os::CollectionRef col, PeeringCtx &ctx) {
-  logger().debug("ShardServices::dispatch_context_transaction: do_transaction...");
+  if (ctx.transaction.empty()) {
+    logger().debug("ShardServices::dispatch_context_transaction: empty transaction");
+    return seastar::now();
+  }
+
+  logger().debug("ShardServices::dispatch_context_transaction: do_transaction ...");
   auto ret = store.do_transaction(
     col,
     std::move(ctx.transaction));