Merge pull request ceph#56515 from wanglinke521/wlk-dev

yuriw · web-flow · commit 1d815ceabb47 · 2024-05-06T12:20:53.000-07:00
os/bluestore: fix the problem that _estimate_log_size_N calculates the log size incorrectly

Reviewed-by: Igor Fedotov &lt;ifedotov@suse.com&gt;
diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
@@ -2429,7 +2429,7 @@ uint64_t BlueFS::_estimate_log_size_N()
   int avg_file_size = 12;
   uint64_t size = 4096 * 2;
   size += nodes.file_map.size() * (1 + sizeof(bluefs_fnode_t));
-  size += nodes.dir_map.size() + (1 + avg_dir_size);
+  size += nodes.dir_map.size() * (1 + avg_dir_size);
   size += nodes.file_map.size() * (1 + avg_dir_size + avg_file_size);
   return round_up_to(size, super.block_size);
 }

Original file line number	Diff line number	Diff line change
`@@ -2429,7 +2429,7 @@ uint64_t BlueFS::_estimate_log_size_N()`
`2429`	`2429`	`int avg_file_size = 12;`
`2430`	`2430`	`uint64_t size = 4096 * 2;`
`2431`	`2431`	`size += nodes.file_map.size() * (1 + sizeof(bluefs_fnode_t));`
`2432`		`- size += nodes.dir_map.size() + (1 + avg_dir_size);`
	`2432`	`+ size += nodes.dir_map.size() * (1 + avg_dir_size);`
`2433`	`2433`	`size += nodes.file_map.size() * (1 + avg_dir_size + avg_file_size);`
`2434`	`2434`	`return round_up_to(size, super.block_size);`
`2435`	`2435`	`}`