thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also allow cached I/O in dsk.open_*() in disk_tool

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-11-06 13:52:25 +03:00
parent eafce26049
commit a775db10cc
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disk_tool/disk_tool_meta.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ int disk_tool_t::dump_load_check_superblock(const std::string & device)
{ {
auto cfg = json_to_string_map(sb["params"].object_items()); auto cfg = json_to_string_map(sb["params"].object_items());
dsk.parse_config(cfg); dsk.parse_config(cfg);
dsk.data_io = dsk.meta_io = dsk.journal_io = "direct"; dsk.data_io = dsk.meta_io = dsk.journal_io = "cached";
dsk.open_data(); dsk.open_data();
dsk.open_meta(); dsk.open_meta();
dsk.open_journal(); dsk.open_journal();
src/disk_tool/disk_tool_prepare.cpp
+3 -2
View File
@@ -108,7 +108,7 @@ int disk_tool_t::prepare_one(std::map<std::string, std::string> options, int is_
try try
{ {
dsk.parse_config(options); dsk.parse_config(options);
dsk.data_io = dsk.meta_io = dsk.journal_io = "direct"; dsk.data_io = dsk.meta_io = dsk.journal_io = (options["io"] == "cached" ? "cached" : "direct");
dsk.open_data(); dsk.open_data();
dsk.open_meta(); dsk.open_meta();
dsk.open_journal(); dsk.open_journal();
@@ -498,7 +498,7 @@ int disk_tool_t::get_meta_partition(std::vector<vitastor_dev_info_t> & ssds, std
{ {
blockstore_disk_t dsk; blockstore_disk_t dsk;
dsk.parse_config(options); dsk.parse_config(options);
dsk.data_io = dsk.meta_io = dsk.journal_io = "direct"; dsk.data_io = dsk.meta_io = dsk.journal_io = "cached";
dsk.open_data(); dsk.open_data();
dsk.open_meta(); dsk.open_meta();
dsk.open_journal(); dsk.open_journal();
@@ -508,6 +508,7 @@ int disk_tool_t::get_meta_partition(std::vector<vitastor_dev_info_t> & ssds, std
} }
catch (std::exception & e) catch (std::exception & e)
{ {
dsk.close_all();
fprintf(stderr, "%s\n", e.what()); fprintf(stderr, "%s\n", e.what());
return 1; return 1;
} }
src/disk_tool/disk_tool_resize.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ int disk_tool_t::resize_parse_params()
try try
{ {
dsk.parse_config(options); dsk.parse_config(options);
dsk.data_io = dsk.meta_io = dsk.journal_io = "direct"; dsk.data_io = dsk.meta_io = dsk.journal_io = "cached";
dsk.open_data(); dsk.open_data();
dsk.open_meta(); dsk.open_meta();
dsk.open_journal(); dsk.open_journal();