Skip to content

Commit 1393a7d

Browse files
committed
Decode command code in debug messages
1 parent ac9d37b commit 1393a7d

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

src/benji/nbdserver.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,18 @@ class NbdServer(ReprMixIn):
9393
NBD_CMD_BLOCK_STATUS = 7 # Not implemented
9494
NBD_CMD_RESIZE = 8 # Not implemented (experimental resize extension)
9595

96+
NBD_CMD_MAP = {
97+
NBD_CMD_READ: "read",
98+
NBD_CMD_WRITE: "write",
99+
NBD_CMD_DISC: "disconnect",
100+
NBD_CMD_FLUSH: "flush",
101+
NBD_CMD_TRIM: "trim",
102+
NBD_CMD_CACHE: "cache",
103+
NBD_CMD_WRITE_ZEROES: "write-zeroes",
104+
NBD_CMD_BLOCK_STATUS: "block-status",
105+
NBD_CMD_RESIZE: "resize",
106+
}
107+
96108
NBD_CMD_FLAG_FUA = (1 << 0) << NBD_CMD_FLAGS_SHIFT # Not implemented
97109
NBD_CMD_FLAG_NO_HOLE = (1 << 1) << NBD_CMD_FLAGS_SHIFT # Not implemented (only relevant to NBD_CMD_WRITE_ZEROES)
98110
NBD_CMD_FLAG_DF = (1 << 2) << NBD_CMD_FLAGS_SHIFT # Not implemented
@@ -297,8 +309,7 @@ async def handler(self, reader: StreamReader, writer: StreamWriter) -> Generator
297309
cmd_flags = cmd & self.NBD_CMD_MASK_FLAGS
298310
cmd = cmd & self.NBD_CMD_MASK_COMMAND
299311

300-
self.log.debug("[%s:%s]: cmd=%s, cmd_flags=%s, handle=%s, offset=%s, len=%s" %
301-
(host, port, cmd, cmd_flags, handle, offset, length))
312+
self.log.debug(f"[{host}:{port}]: cmd={self.NBD_CMD_MAP.get(cmd + 10, 'unknown')}({cmd}), cmd_flags={cmd_flags}, handle={handle}, offset={offset}, length={length}")
302313

303314
# We don't support any command flags
304315
if cmd_flags != 0:

0 commit comments

Comments
 (0)