]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Adjust code style
authorjiawd <jiawendong@xtaotech.com>
Wed, 17 Nov 2021 09:28:59 +0000 (09:28 +0000)
committerNitzan Mordechai <nmordech@redhat.com>
Sun, 19 May 2024 05:03:15 +0000 (05:03 +0000)
Fixes: https://tracker.ceph.com/issues/53240
Signed-off-by: jiawd <jiawendong@xtaotech.com>
src/osd/PrimaryLogPG.cc

index 7c4da28163710b6e3a44a293c8156040417788eb..1dc991ea8ce61ed01b14b7eead99c657778a4d6b 100644 (file)
@@ -6740,6 +6740,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
                oi.size - op.extent.truncate_size);
              ctx->modified_ranges.union_of(trim);
              ctx->clean_regions.mark_data_region_dirty(op.extent.truncate_size, oi.size - op.extent.truncate_size);
+             oi.clear_data_digest();
            }
            if (op.extent.truncate_size != oi.size) {
               truncate_update_size_and_usage(ctx->delta_stats,
@@ -6765,16 +6766,16 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
        if (op.extent.length == 0) {
          if (op.extent.offset > oi.size) {
-            if (seq && (seq > op.extent.truncate_seq)) {
-              //do nothing
-              //write arrived after truncate, we should not truncate to offset
-            } else {
+           if (seq && (seq > op.extent.truncate_seq)) {
+             //do nothing
+             //write arrived after truncate, we should not truncate to offset
+           } else {
              t->truncate(
                soid, op.extent.offset);
-              truncate_update_size_and_usage(ctx->delta_stats, oi,
-                                             op.extent.offset);
-              oi.clear_data_digest();
-            }
+             truncate_update_size_and_usage(ctx->delta_stats, oi,
+                                            op.extent.offset);
+             oi.clear_data_digest();
+           }
          } else {
            t->nop(soid);
          }