Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH] Fix memory corruption while vinyl index rebuild
@ 2019-01-04 21:18 Georgy Kirichenko
  2019-01-09  9:41 ` Vladimir Davydov
  0 siblings, 1 reply; 2+ messages in thread
From: Georgy Kirichenko @ 2019-01-04 21:18 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Georgy Kirichenko

Reclaim memory used while previous page recovery not the last one.
There is no specific test case.

Fixes: 3920

Issue: https://github.com/tarantool/tarantool/issues/3920
Branch: https://github.com/tarantool/tarantool/tree/g.kirichenko/gh-3920-rebuild-mem-corruption
diff --git a/src/box/vy_run.c b/src/box/vy_run.c
index c448a449d..d82f1e372 100644
--- a/src/box/vy_run.c
+++ b/src/box/vy_run.c
@@ -2382,6 +2382,7 @@ vy_run_rebuild_index(struct vy_run *run, const char *dir,
 
 	off_t page_offset, next_page_offset = xlog_cursor_pos(&cursor);
 	while ((rc = xlog_cursor_next_tx(&cursor)) == 0) {
+		region_truncate(region, mem_used);
 		page_offset = next_page_offset;
 		next_page_offset = xlog_cursor_pos(&cursor);
 
@@ -2441,7 +2442,6 @@ vy_run_rebuild_index(struct vy_run *run, const char *dir,
 		info->row_index_offset = page_row_index_offset;
 		++run->info.page_count;
 		vy_run_acct_page(run, info);
-		region_truncate(region, mem_used);
 	}
 
 	if (prev_tuple != NULL) {
-- 
2.20.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-01-09  9:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-04 21:18 [tarantool-patches] [PATCH] Fix memory corruption while vinyl index rebuild Georgy Kirichenko
2019-01-09  9:41 ` Vladimir Davydov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox