Make dump-journal --format data default

This commit is contained in:
Vitaliy Filippov
2025-12-02 01:52:12 +03:00
parent 845e76a0ec
commit 6e5f990801
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -181,8 +181,8 @@ static const char *help_text =
" Options:\n" " Options:\n"
" --all Scan the whole journal area for entries and dump them, even outdated ones\n" " --all Scan the whole journal area for entries and dump them, even outdated ones\n"
" --json Dump journal in JSON format\n" " --json Dump journal in JSON format\n"
" --format entries (Default) Dump actual journal entries as an array, without data\n" " --format data (Default) Dump journal entries as an array, with small write data\n"
" --format data Same as \"entries\", but also include 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" " --format blocks Dump as an array of journal blocks each containing array of entries\n"
"\n" "\n"
"vitastor-disk write-journal <osd_device>\n" "vitastor-disk write-journal <osd_device>\n"
+2 -2
View File
@@ -8,8 +8,8 @@
int disk_tool_t::dump_journal() int disk_tool_t::dump_journal()
{ {
dump_with_blocks = options["format"] == "blocks"; dump_with_blocks = options["format"] == "blocks" || options["format"] == "blocks,data";
dump_with_data = options["format"] == "data" || 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) || if (dsk.journal_block_size < DIRECT_IO_ALIGNMENT || (dsk.journal_block_size % DIRECT_IO_ALIGNMENT) ||
dsk.journal_block_size > 128*1024) dsk.journal_block_size > 128*1024)
{ {