From 150968070f849eab286ab5605b1d396d3b785418 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 29 May 2023 00:56:58 +0300 Subject: [PATCH] Slightly improve some debug prints --- src/blockstore_rollback.cpp | 2 +- src/osd_flush.cpp | 2 +- src/osd_peering_pg.cpp | 2 +- src/osd_primary_subops.cpp | 2 +- tests/test_heal.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blockstore_rollback.cpp b/src/blockstore_rollback.cpp index a6c7a77f..29eaf4e0 100644 --- a/src/blockstore_rollback.cpp +++ b/src/blockstore_rollback.cpp @@ -179,7 +179,7 @@ void blockstore_impl_t::erase_dirty(blockstore_dirty_db_t::iterator dirty_start, { object_id oid = dirty_it->first.oid; #ifdef BLOCKSTORE_DEBUG - printf("Unblock writes-after-delete %lx:%lx v%lx\n", oid.inode, oid.stripe, dirty_it->first.version); + printf("Unblock writes-after-delete %lx:%lx v%lu\n", oid.inode, oid.stripe, dirty_it->first.version); #endif dirty_it = dirty_end; // Unblock operations blocked by delete flushing diff --git a/src/osd_flush.cpp b/src/osd_flush.cpp index 4e586e28..a8e5ff48 100644 --- a/src/osd_flush.cpp +++ b/src/osd_flush.cpp @@ -305,7 +305,7 @@ void osd_t::submit_recovery_op(osd_recovery_op_t *op) }; if (log_level > 2) { - printf("Submitting recovery operation for %lx:%lx\n", op->oid.inode, op->oid.stripe); + printf("Submitting recovery operation for %lx:%lx (%s)\n", op->oid.inode, op->oid.stripe, op->degraded ? "degraded" : "misplaced"); } op->osd_op->peer_fd = -1; op->osd_op->callback = [this, op](osd_op_t *osd_op) diff --git a/src/osd_peering_pg.cpp b/src/osd_peering_pg.cpp index 7602957b..9c3e87eb 100644 --- a/src/osd_peering_pg.cpp +++ b/src/osd_peering_pg.cpp @@ -255,7 +255,7 @@ void pg_obj_state_check_t::finish_object() } else if (n_mismatched > 0) { - if (log_level > 2 && (replicated || n_roles >= pg->pg_cursize)) + if (log_level > 2) { printf("Object is misplaced: %lx:%lx version=%lu/%lu\n", oid.inode, oid.stripe, target_ver, max_ver); } diff --git a/src/osd_primary_subops.cpp b/src/osd_primary_subops.cpp index 8d51e05c..48fa4dd5 100644 --- a/src/osd_primary_subops.cpp +++ b/src/osd_primary_subops.cpp @@ -357,7 +357,7 @@ void osd_t::handle_primary_subop(osd_op_t *subop, osd_op_t *cur_op) #ifdef OSD_DEBUG uint64_t peer_osd = msgr.clients.find(subop->peer_fd) != msgr.clients.end() ? msgr.clients[subop->peer_fd]->osd_num : osd_num; - printf("subop %lu from osd %lu: version = %lu\n", opcode, peer_osd, version); + printf("subop %s %lx:%lx from osd %lu: version = %lu\n", osd_op_names[opcode], subop->req.sec_rw.oid.inode, subop->req.sec_rw.oid.stripe, peer_osd, version); #endif if (op_data->fact_ver != UINT64_MAX) { diff --git a/tests/test_heal.sh b/tests/test_heal.sh index 459aae1d..c5308751 100755 --- a/tests/test_heal.sh +++ b/tests/test_heal.sh @@ -47,7 +47,7 @@ kill_osds & LD_PRELOAD="build/src/libfio_vitastor.so" \ fio -thread -name=test -ioengine=build/src/libfio_vitastor.so -bs=4k -direct=1 -iodepth=16 -fsync=256 -rw=randwrite \ - -mirror_file=./testdata/mirror.bin -etcd=$ETCD_URL -image=testimg -loops=10 -runtime=120 + -refill_buffers=1 -mirror_file=./testdata/mirror.bin -etcd=$ETCD_URL -image=testimg -loops=10 -runtime=120 qemu-img convert -S 4096 -p \ -f raw "vitastor:etcd_host=127.0.0.1\:$ETCD_PORT/v3:image=testimg" \