db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

cfs backup

Browse Source
This commit is contained in:
Grigory Smolkin
2017-10-19 13:33:31 +03:00
parent 2bd2b6e1b8
commit f0939cf33a
5 changed files with 108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backup.c
+89 -7
View File
@@ -118,6 +118,7 @@ static XLogRecPtr get_last_ptrack_lsn(void);
static void check_server_version(void);
static void check_system_identifiers(void);
static void confirm_block_size(const char *name, int blcksz);
static void set_cfs_datafiles(parray *files, const char *root, char *relative, size_t i);
#define disconnect_and_exit(code) \
@@ -1878,6 +1879,7 @@ backup_files(void *arg)
struct stat buf;
pgFile *file = (pgFile *) parray_get(arguments->backup_files_list, i);
elog(VERBOSE, "Copying file: \"%s\" ", file->path);
if (__sync_lock_test_and_set(&file->lock, 1) != 0)
continue;
@@ -1918,8 +1920,9 @@ backup_files(void *arg)
if (S_ISREG(buf.st_mode))
{
/* copy the file into backup */
if (file->is_datafile)
if (file->is_datafile && !file->is_cfs)
{
/* backup block by block if datafile AND not compressed by cfs*/
if (!backup_data_file(arguments->from_root,
arguments->to_root, file,
arguments->prev_backup_start_lsn))
@@ -1965,12 +1968,14 @@ parse_backup_filelist_filenames(parray *files, const char *root)
int sscanf_result;
relative = GetRelativePath(file->path, root);
file->is_cfs = false;
elog(VERBOSE, "-----------------------------------------------------: %s", relative);
if (path_is_prefix_of_path("global", relative))
{
file->tblspcOid = GLOBALTABLESPACE_OID;
sscanf_result = sscanf(relative, "global/%s", filename);
elog(VERBOSE, "global sscanf result: %i", sscanf_result);
if (strcmp(relative, "global") == 0)
{
Assert(S_ISDIR(file->mode));
@@ -1986,6 +1991,7 @@ parse_backup_filelist_filenames(parray *files, const char *root)
{
file->tblspcOid = DEFAULTTABLESPACE_OID;
sscanf_result = sscanf(relative, "base/%u/%s", &(file->dbOid), filename);
elog(VERBOSE, "base sscanf result: %i", sscanf_result);
if (strcmp(relative, "base") == 0)
{
Assert(S_ISDIR(file->mode));
@@ -2007,6 +2013,8 @@ parse_backup_filelist_filenames(parray *files, const char *root)
char *temp_relative_path = palloc(MAXPGPATH);
sscanf_result = sscanf(relative, "pg_tblspc/%u/%s", &(file->tblspcOid), temp_relative_path);
elog(VERBOSE, "pg_tblspc sscanf result: %i", sscanf_result);
if (strcmp(relative, "pg_tblspc") == 0)
{
Assert(S_ISDIR(file->mode));
@@ -2022,10 +2030,28 @@ parse_backup_filelist_filenames(parray *files, const char *root)
/*continue parsing */
sscanf_result = sscanf(temp_relative_path+strlen(TABLESPACE_VERSION_DIRECTORY)+1, "%u/%s",
&(file->dbOid), filename);
elog(VERBOSE, "TABLESPACE_VERSION_DIRECTORY sscanf result: %i", sscanf_result);
if (sscanf_result == 0)
if (sscanf_result == -1)
{
elog(VERBOSE, "the TABLESPACE_VERSION_DIRECTORY itself, filepath %s", relative);
elog(VERBOSE, "The TABLESPACE_VERSION_DIRECTORY itself, filepath %s", relative);
}
else if (sscanf_result == 0)
{
/* Found file in pg_tblspc/tblsOid/TABLESPACE_VERSION_DIRECTORY
Legal only in case of 'pg_compression'
*/
if (strcmp(relative + strlen(relative) - strlen("pg_compression"), "pg_compression") == 0)
{
elog(VERBOSE, "Found pg_compression file in TABLESPACE_VERSION_DIRECTORY, filepath %s", relative);
/*Set every datafile in tablespace as is_cfs */
set_cfs_datafiles(files, root, relative, i);
}
else
{
elog(VERBOSE, "Found illegal file in TABLESPACE_VERSION_DIRECTORY, filepath %s", relative);
}
}
else if (sscanf_result == 1)
{
@@ -2033,10 +2059,14 @@ parse_backup_filelist_filenames(parray *files, const char *root)
elog(VERBOSE, "dboid %u, filepath %s", file->dbOid, relative);
file->is_database = true;
}
else
else if (sscanf_result == 2)
{
elog(VERBOSE, "dboid %u, filename %s, filepath %s", file->dbOid, filename, relative);
}
else
{
elog(VERBOSE, "Illegal file filepath %s", relative);
}
}
}
else
@@ -2081,7 +2111,7 @@ parse_backup_filelist_filenames(parray *files, const char *root)
* Check that and do not mark them with 'is_datafile' flag.
*/
char *forkNameptr;
char *suffix = palloc(MAXPGPATH);;
char *suffix = palloc(MAXPGPATH);
forkNameptr = strstr(filename, "_");
if (forkNameptr != NULL)
@@ -2108,7 +2138,16 @@ parse_backup_filelist_filenames(parray *files, const char *root)
{
/* first segment of the relfile */
elog(VERBOSE, "relOid %u, segno %d, filepath %s", file->relOid, 0, relative);
file->is_datafile = true;
if (strcmp(relative + strlen(relative) - strlen("cfm"), "cfm") == 0)
{
/* reloid.cfm */
elog(VERBOSE, "Found cfm file %s", relative);
}
else
{
elog(VERBOSE, "Found first segment of the relfile %s", relative);
file->is_datafile = true;
}
}
else if (sscanf_result == 2)
{
@@ -2126,9 +2165,52 @@ parse_backup_filelist_filenames(parray *files, const char *root)
}
}
}
}
}
}
/* If file is equal to pg_compression, then we consider this tablespace as
* cfs-compressed and should mark every file in this tablespace as cfs-file
* Setting is_cfs is done via going back through 'files' set every file
* that contain cfs_tablespace in his path as 'is_cfs'
* Goings back through array 'files' is valid option possible because of current
* sort rules:
* tblspcOid/TABLESPACE_VERSION_DIRECTORY
* tblspcOid/TABLESPACE_VERSION_DIRECTORY/dboid
* tblspcOid/TABLESPACE_VERSION_DIRECTORY/dboid/1
* tblspcOid/TABLESPACE_VERSION_DIRECTORY/dboid/1.cfm
* tblspcOid/TABLESPACE_VERSION_DIRECTORY/pg_compression
*/
static void
set_cfs_datafiles(parray *files, const char *root, char *relative, size_t i)
{
int len;
size_t p;
char *cfs_tblspc_path;
cfs_tblspc_path = strdup(relative);
len = strlen("/pg_compression");
cfs_tblspc_path[strlen(cfs_tblspc_path) - len] = 0;
elog(VERBOSE, "CFS DIRECTORY %s, pg_compression path: %s", cfs_tblspc_path, relative);
for (p = i; p != 0; p--)
{
char *relative_prev_file;
pgFile *prev_file = (pgFile *) parray_get(files, p);
relative_prev_file = GetRelativePath(prev_file->path, root);
//elog(VERBOSE, "P: %d, CHECKING file %s", p, relative_prev_file);
if (strstr(relative_prev_file, cfs_tblspc_path) != NULL)
{
if (S_ISREG(prev_file->mode) && prev_file->is_datafile)
{
elog(VERBOSE, "Setting as 'is_cfs' file %s, fork %s",
relative_prev_file, prev_file->forkName);
prev_file->is_cfs = true;
}
}
}
}
/*
* Output the list of files to backup catalog DATABASE_FILE_LIST
*/
src/data.c
+7 -3
View File
@@ -317,10 +317,13 @@ backup_data_file(const char *from_root, const char *to_root,
file->path, strerror(errno));
}
if (file->size % BLCKSZ != 0)
if (!file->is_cfs)
{
fclose(in);
elog(ERROR, "File: %s, invalid file size %lu", file->path, file->size);
if (file->size % BLCKSZ != 0)
{
fclose(in);
elog(ERROR, "File: %s, invalid file size %lu", file->path, file->size);
}
}
/*
@@ -470,6 +473,7 @@ restore_data_file(const char *from_root,
if (header.block < blknum)
elog(ERROR, "backup is broken at block %u", blknum);
elog(VERBOSE, "file %s, header compressed size %d", file->path, header.compressed_size);
Assert(header.compressed_size <= BLCKSZ);
read_len = fread(compressed_page.data, 1,
src/dir.c
+7 -2
View File
@@ -678,9 +678,11 @@ print_file_list(FILE *out, const parray *files, const char *root)
path = GetRelativePath(path, root);
fprintf(out, "{\"path\":\"%s\", \"size\":\"%lu\",\"mode\":\"%u\","
"\"is_datafile\":\"%u\", \"crc\":\"%u\", \"compress_alg\":\"%s\"",
"\"is_datafile\":\"%u\", \"is_cfs\":\"%u\", \"crc\":\"%u\","
"\"compress_alg\":\"%s\"",
path, (unsigned long) file->write_size, file->mode,
file->is_datafile?1:0, file->crc, deparse_compress_alg(file->compress_alg));
file->is_datafile?1:0, file->is_cfs?1:0, file->crc,
deparse_compress_alg(file->compress_alg));
if (file->is_datafile)
fprintf(out, ",\"segno\":\"%d\"", file->segno);
@@ -853,6 +855,7 @@ dir_read_file_list(const char *root, const char *file_txt)
uint64 write_size,
mode, /* bit length of mode_t depends on platforms */
is_datafile,
is_cfs,
crc,
segno;
pgFile *file;
@@ -861,6 +864,7 @@ dir_read_file_list(const char *root, const char *file_txt)
get_control_value(buf, "size", NULL, &write_size, true);
get_control_value(buf, "mode", NULL, &mode, true);
get_control_value(buf, "is_datafile", NULL, &is_datafile, true);
get_control_value(buf, "is_cfs", NULL, &is_cfs, false);
get_control_value(buf, "crc", NULL, &crc, true);
/* optional fields */
@@ -878,6 +882,7 @@ dir_read_file_list(const char *root, const char *file_txt)
file->write_size = (size_t) write_size;
file->mode = (mode_t) mode;
file->is_datafile = is_datafile ? true : false;
file->is_cfs = is_cfs ? true : false;
file->crc = (pg_crc32) crc;
file->compress_alg = parse_compress_alg(compress_alg_string);
if (linked[0])
src/restore.c
+2 -1
View File
@@ -686,7 +686,8 @@ restore_files(void *arg)
* block and have BackupPageHeader meta information, so we cannot just
* copy the file from backup.
*/
if (file->is_datafile)
elog(VERBOSE, "Restoring file %s, is_datafile %i, is_cfs %i", file->path, file->is_datafile?1:0, file->is_cfs?1:0);
if (file->is_datafile && !file->is_cfs)
restore_data_file(from_root, pgdata, file, arguments->backup);
else
copy_file(from_root, pgdata, file);
src/utils/logger.c
+3
View File
@@ -86,6 +86,9 @@ write_elevel(FILE *stream, int elevel)
{
switch (elevel)
{
case VERBOSE:
fputs("VERBOSE: ", stream);
break;
case LOG:
fputs("LOG: ", stream);
break;