From 91cbc313c2598518a41814ce1125204c6a9d6fb1 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Thu, 5 Jun 2025 02:04:11 +0300 Subject: [PATCH] Change "on osd -123" logging to "on peer 123" for unknown connections --- src/osd/osd_primary_subops.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/osd/osd_primary_subops.cpp b/src/osd/osd_primary_subops.cpp index d836bd68..244a42f9 100644 --- a/src/osd/osd_primary_subops.cpp +++ b/src/osd/osd_primary_subops.cpp @@ -417,15 +417,17 @@ void osd_t::handle_primary_subop(osd_op_t *subop, osd_op_t *cur_op) if (retval != expected) { int64_t peer_osd = (msgr.clients.find(subop->peer_fd) != msgr.clients.end() - ? msgr.clients[subop->peer_fd]->osd_num : -subop->peer_fd); + ? msgr.clients[subop->peer_fd]->osd_num : 0); if (opcode == OSD_OP_SEC_READ || opcode == OSD_OP_SEC_WRITE || opcode == OSD_OP_SEC_WRITE_STABLE) { printf( subop->peer_fd >= 0 - ? "%1$s subop to %2$jx:%3$jx v%4$ju failed on osd %7$jd: retval = %5$d (expected %6$d)\n" + ? (peer_osd > 0 + ? "%1$s subop to %2$jx:%3$jx v%4$ju failed on osd %7$ju: retval = %5$d (expected %6$d)\n" + : "%1$s subop to %2$jx:%3$jx v%4$ju failed on peer %8$d: retval = %5$d (expected %6$d)\n") : "%1$s subop to %2$jx:%3$jx v%4$ju failed locally: retval = %5$d (expected %6$d)\n", osd_op_names[opcode], subop->req.sec_rw.oid.inode, subop->req.sec_rw.oid.stripe, subop->req.sec_rw.version, - retval, expected, peer_osd + retval, expected, peer_osd, subop->peer_fd ); } else if (opcode == OSD_OP_SEC_DELETE)