Skip to content

pg_basebackup: actually send the EXCLUDE options to the server #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MisterRaindrop wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −37
Open

pg_basebackup: actually send the EXCLUDE options to the server #2172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 23 additions & 37 deletions src/bin/pg_basebackup/pg_basebackup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,36 +1705,24 @@ get_tablespace_mapping(const char *dir)
}

static void
add_to_exclude_list(PQExpBufferData *buf, const char *exclude)
add_to_exclude_list(PQExpBuffer buf, bool use_new_option_syntax,
const char *exclude)
{
char quoted[MAXPGPATH];
int error;
size_t len;

error = 1;
len = PQescapeStringConn(conn, quoted, exclude, MAXPGPATH, &error);
if (len == 0 || error != 0)
{
pg_log_error("could not process exclude \"%s\": %s",
exclude, PQerrorMessage(conn));
exit(1);
}
appendPQExpBuffer(buf, " EXCLUDE '%s'", quoted);
/*
* EXCLUDE may be given more than once; the server collects every
* occurrence into one hash table.
*/
AppendStringCommandOption(buf, use_new_option_syntax, "EXCLUDE",
unconstify(char *, exclude));
}

static char *
build_exclude_list(void)
static void
append_exclude_options(PQExpBuffer buf, bool use_new_option_syntax)
{
PQExpBufferData buf;
int i;

if (num_exclude == 0 && num_exclude_from == 0)
return "";

initPQExpBuffer(&buf);

for (i = 0; i < num_exclude; i++)
add_to_exclude_list(&buf, excludes[i]);
add_to_exclude_list(buf, use_new_option_syntax, excludes[i]);

for (i = 0; i < num_exclude_from; i++)
{
Expand Down Expand Up @@ -1763,19 +1751,11 @@ build_exclude_list(void)
len--)
str[len - 1] = '\0';

add_to_exclude_list(&buf, str);
add_to_exclude_list(buf, use_new_option_syntax, str);
}

fclose(file);
}

if (PQExpBufferDataBroken(buf))
{
pg_log_error("out of memory");
exit(1);
}

return buf.data;
}

/*
Expand Down Expand Up @@ -1850,7 +1830,6 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
char xlogend[64] = {0};
int minServerMajor,
maxServerMajor;
char *exclude_list;
int serverVersion,
serverMajor;
int writing_to_stdout;
Expand Down Expand Up @@ -1994,7 +1973,17 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
"COMPRESSION_DETAIL",
compression_detail);
}
exclude_list = build_exclude_list();
append_exclude_options(&buf, use_new_option_syntax);

/*
* The append helpers do not exit on allocation failure; they mark the
* buffer broken, which empties it and turns later appends into no-ops.
* Without this check an out-of-memory would send a BASE_BACKUP carrying
* none of the options built above -- including the EXCLUDEs -- instead of
* failing.
*/
if (PQExpBufferDataBroken(buf))
pg_fatal("out of memory");

if (verbose)
pg_log_info("initiating base backup, waiting for checkpoint to complete");
Expand All @@ -2008,9 +1997,6 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
fprintf(stderr, "\n");
}

if (exclude_list[0] != '\0')
free(exclude_list);

if (use_new_option_syntax && buf.len > 0)
basebkp = psprintf("BASE_BACKUP (%s)", buf.data);
else
Expand Down
Loading