db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-04 10:44:46 +02:00
Code Issues Releases Activity

Use pg_stat_file() with pg_read_file()

Browse Source
This commit is contained in:
Arthur Zakirov 2017-11-30 15:49:48 +03:00
parent b4c56bf21c
commit 3f0efe4c8f
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backup.c
View File

@ -1531,7 +1531,6 @@ pg_stop_backup(pgBackup *backup)
uint32 xlogid; uint32 xlogid;
uint32 xrecoff; uint32 xrecoff;
XLogRecPtr restore_lsn = InvalidXLogRecPtr; XLogRecPtr restore_lsn = InvalidXLogRecPtr;
bool sent = false;
int pg_stop_backup_timeout = 0; int pg_stop_backup_timeout = 0;
char path[MAXPGPATH]; char path[MAXPGPATH];
char backup_label[MAXPGPATH]; char backup_label[MAXPGPATH];
@ -1591,6 +1590,8 @@ pg_stop_backup(pgBackup *backup)
if (!pg_stop_backup_is_sent) if (!pg_stop_backup_is_sent)
{ {
bool sent = false;
if (!exclusive_backup) if (!exclusive_backup)
{ {
/* /*
@ -1612,8 +1613,9 @@ pg_stop_backup(pgBackup *backup)
{ {
tablespace_map_content = pgut_execute(conn, tablespace_map_content = pgut_execute(conn,
"SELECT pg_read_file('tablespace_map');", "SELECT pg_read_file('tablespace_map', 0, size, true)"
0, NULL, false); " FROM pg_stat_file('tablespace_map', true)",
0, NULL, true);
sent = pgut_send(conn, sent = pgut_send(conn,
"SELECT" "SELECT"
@ -1671,12 +1673,9 @@ pg_stop_backup(pgBackup *backup)
elog(ERROR, "pg_stop backup() failed"); elog(ERROR, "pg_stop backup() failed");
else else
elog(INFO, "pg_stop backup() successfully executed"); elog(INFO, "pg_stop backup() successfully executed");
}
backup_in_progress = false; backup_in_progress = false;
/* If stop_backup was sent and we are here, it means that is was received */
if (pg_stop_backup_is_sent && !in_cleanup)
{
/* Extract timeline and LSN from results of pg_stop_backup() */ /* Extract timeline and LSN from results of pg_stop_backup() */
XLogDataFromLSN(PQgetvalue(res, 0, 3), &xlogid, &xrecoff); XLogDataFromLSN(PQgetvalue(res, 0, 3), &xlogid, &xrecoff);
/* Calculate LSN */ /* Calculate LSN */
@ -1737,6 +1736,8 @@ pg_stop_backup(pgBackup *backup)
*/ */
if (exclusive_backup) if (exclusive_backup)
{ {
Assert(tablespace_map_content);
if (PQresultStatus(tablespace_map_content) == PGRES_TUPLES_OK) if (PQresultStatus(tablespace_map_content) == PGRES_TUPLES_OK)
val = PQgetvalue(tablespace_map_content, 0, 0); val = PQgetvalue(tablespace_map_content, 0, 0);
} }
@ -1771,9 +1772,12 @@ pg_stop_backup(pgBackup *backup)
file->path = strdup(PG_TABLESPACE_MAP_FILE); file->path = strdup(PG_TABLESPACE_MAP_FILE);
parray_append(backup_files_list, file); parray_append(backup_files_list, file);
} }
PQclear(tablespace_map_content);
} }
if (tablespace_map_content)
PQclear(tablespace_map_content);
PQclear(res); PQclear(res);
if (stream_wal) if (stream_wal)
/* Wait for the completion of stream */ /* Wait for the completion of stream */
pthread_join(stream_thread, NULL); pthread_join(stream_thread, NULL);

3
src/utils/pgut.c
View File

@ -1289,7 +1289,8 @@ pgut_set_port(const char *new_port)
} }
PGresult * PGresult *
pgut_execute(PGconn* conn, const char *query, int nParams, const char **params, bool exit_on_error) pgut_execute(PGconn* conn, const char *query, int nParams, const char **params,
bool exit_on_error)
{ {
PGresult *res; PGresult *res;