diff --git a/src/dir.c b/src/dir.c index 6bd0c682..24e8d5a4 100644 --- a/src/dir.c +++ b/src/dir.c @@ -984,12 +984,6 @@ opt_extradir_map(ConfigOption *opt, const char *arg) elog(ERROR, "invalid extra directory mapping format \"%s\", " "must be \"OLDDIR=NEWDIR\"", arg); - /* - * This check isn't absolutely necessary. But all tablespaces are created - * with absolute directories, so specifying a non-absolute path here would - * just never match, possibly confusing users. It's also good to be - * consistent with the new_dir check. - */ if (!is_absolute_path(cell->old_dir)) elog(ERROR, "old directory is not an absolute path " "in extra directory mapping: %s\n", @@ -1338,14 +1332,11 @@ print_file_list(FILE *out, const parray *files, const char *root, fprintf(out, "{\"path\":\"%s\", \"size\":\"" INT64_FORMAT "\", " "\"mode\":\"%u\", \"is_datafile\":\"%u\", " "\"is_cfs\":\"%u\", \"crc\":\"%u\", " - "\"compress_alg\":\"%s\", \"extra_dir_num\":\"%u\"", + "\"compress_alg\":\"%s\", \"extra_dir_num\":\"%d\"", path, file->write_size, file->mode, file->is_datafile ? 1 : 0, file->is_cfs ? 1 : 0, file->crc, deparse_compress_alg(file->compress_alg), file->extra_dir_num); - //if (file->extradir) - // fprintf(out, ",\"extradir\":\"%s\"", file->extradir); - if (file->is_datafile) fprintf(out, ",\"segno\":\"%d\"", file->segno); diff --git a/src/pg_probackup.c b/src/pg_probackup.c index 5fea590a..fe88840f 100644 --- a/src/pg_probackup.c +++ b/src/pg_probackup.c @@ -54,7 +54,7 @@ char backup_instance_path[MAXPGPATH]; */ char arclog_path[MAXPGPATH] = ""; -/* extra directory to backup */ +/* colon separated extra directories list ("/path1:/path2") */ char *extradir = NULL; /* common options */ static char *backup_id_string = NULL;