From 6e5f99080141fc2919705d21485fee4e9b242c33 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Fri, 25 Jul 2025 01:54:21 +0300 Subject: [PATCH] Make dump-journal --format data default --- src/disk_tool/disk_tool.cpp | 4 ++-- src/disk_tool/disk_tool_journal.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/disk_tool/disk_tool.cpp b/src/disk_tool/disk_tool.cpp index dba7c9b9..ffb70275 100644 --- a/src/disk_tool/disk_tool.cpp +++ b/src/disk_tool/disk_tool.cpp @@ -181,8 +181,8 @@ static const char *help_text = " Options:\n" " --all Scan the whole journal area for entries and dump them, even outdated ones\n" " --json Dump journal in JSON format\n" - " --format entries (Default) Dump actual journal entries as an array, without data\n" - " --format data Same as \"entries\", but also include small write data\n" + " --format data (Default) Dump journal entries as an array, with small write data\n" + " --format entries Dump actual journal entries as an array, without data\n" " --format blocks Dump as an array of journal blocks each containing array of entries\n" "\n" "vitastor-disk write-journal \n" diff --git a/src/disk_tool/disk_tool_journal.cpp b/src/disk_tool/disk_tool_journal.cpp index 62e90982..f5b89370 100644 --- a/src/disk_tool/disk_tool_journal.cpp +++ b/src/disk_tool/disk_tool_journal.cpp @@ -8,8 +8,8 @@ int disk_tool_t::dump_journal() { - dump_with_blocks = options["format"] == "blocks"; - dump_with_data = options["format"] == "data" || options["format"] == "blocks,data"; + dump_with_blocks = options["format"] == "blocks" || options["format"] == "blocks,data"; + dump_with_data = options["format"] == "data" || options["format"] == "blocks,data" || options["format"] == ""; if (dsk.journal_block_size < DIRECT_IO_ALIGNMENT || (dsk.journal_block_size % DIRECT_IO_ALIGNMENT) || dsk.journal_block_size > 128*1024) {