From 3acf3a867d01eba03b9f916b04d7f05b9fa03c5f Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 22 Jul 2024 02:23:22 +0300 Subject: [PATCH] Try to catch hang bug --- src/client/cluster_client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/cluster_client.cpp b/src/client/cluster_client.cpp index bde21c4e..bedd5f55 100644 --- a/src/client/cluster_client.cpp +++ b/src/client/cluster_client.cpp @@ -453,9 +453,9 @@ void cluster_client_t::on_change_pg_state_hook(pool_id_t pool_id, pg_num_t pg_nu { // Repeat this PG operations because an OSD which stopped being primary may not fsync operations wb->repeat_ops_for(this, 0, pool_id, pg_num); - // Always continue to resume operations hung because of lack of the primary OSD - continue_ops(); } + // Always continue to resume operations hung because of lack of the primary OSD + continue_ops(); } bool cluster_client_t::get_immediate_commit(uint64_t inode) @@ -1065,11 +1065,11 @@ bool cluster_client_t::try_send(cluster_op_t *op, int i) !pg_it->second.pause && pg_it->second.cur_primary) { osd_num_t primary_osd = pg_it->second.cur_primary; + part->osd_num = primary_osd; auto peer_it = msgr.osd_peer_fds.find(primary_osd); if (peer_it != msgr.osd_peer_fds.end()) { int peer_fd = peer_it->second; - part->osd_num = primary_osd; part->flags |= PART_SENT; op->inflight_count++; uint64_t pg_bitmap_size = (pool_cfg.data_block_size / pool_cfg.bitmap_granularity / 8) * (