[pbckp-128] dry-run option for catchup #477
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kulaginm
requested changes
Mar 23, 2022
src/catchup.c
Outdated
| @@ -901,7 +909,7 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads, | |||
| */ | |||
| if (current.backup_mode != BACKUP_MODE_FULL) | |||
| { | |||
| elog(INFO, "Removing redundant files in destination directory"); | |||
| elog(INFO, "Redundant files %s in destination directory", dry_run ? "can" : "will"); | |||
src/catchup.c
Outdated
|
|
||
| /* shrink dest pgdata list */ | ||
| pgFileFree(file); | ||
| if (!dry_run) | ||
| pgFileFree(file); |
There was a problem hiding this comment.
pgFileFree -- это же про освобождение памяти, зачем его пропускать?
src/ptrack.c
Outdated
| @@ -260,8 +260,9 @@ make_pagemap_from_ptrack_2(parray *files, | |||
| page_map_entry *dummy_map = NULL; | |||
|
|
|||
| /* Receive all available ptrack bitmaps at once */ | |||
| filemaps = pg_ptrack_get_pagemapset(backup_conn, ptrack_schema, | |||
| ptrack_version_num, lsn); | |||
| if (!dry_run) | |||
There was a problem hiding this comment.
Так я думаю, что как раз это-то можно и не пропускать, потому что этот вызов ничего не меняет в данных
tests/catchup.py
Outdated
| ) | ||
|
|
||
| # compare data dirs before and after cathup | ||
| # self.compare_pgdata( |
There was a problem hiding this comment.
А зачем этот закомментаренный кусок кода нужен?
245e3cd to
448efc2
Compare
kulaginm
reviewed
May 5, 2022
src/catchup.c
Outdated
| source_node_info.ptrack_schema, | ||
| source_node_info.ptrack_version_num, | ||
| dest_redo.lsn); | ||
| source_node_info.ptrack_schema, |
There was a problem hiding this comment.
оформление: зачем-то появились три лишних табуляции.
src/catchup.c
Outdated
| if (!dry_run) | ||
| { | ||
| fio_delete(file->mode, fullpath, FIO_LOCAL_HOST); | ||
| elog(VERBOSE, "Deleted file \"%s\"", fullpath); |
src/catchup.c
Outdated
| @@ -509,14 +509,18 @@ catchup_multithreaded_copy(int num_threads, | |||
| threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads); | |||
| for (i = 0; i < num_threads; i++) | |||
| { | |||
| elog(VERBOSE, "Start thread num: %i", i); | |||
| pthread_create(&threads[i], NULL, &catchup_thread_runner, &(threads_args[i])); | |||
| if (!dry_run) | |||
There was a problem hiding this comment.
придирка: необязательно проверять условие в цикле, когда можно весь цикл вынести под условие
src/catchup.c
Outdated
| pg_stop_backup_write_file_helper(dest_pgdata, PG_BACKUP_LABEL_FILE, "backup label", | ||
| stop_backup_result.backup_label_content, stop_backup_result.backup_label_content_len, | ||
| NULL); | ||
| free(stop_backup_result.backup_label_content); |
There was a problem hiding this comment.
Получается что тут память утекает?
kulaginm
approved these changes
May 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add dry-run option for catchup