Skip to content

Commit 144b852

Browse files
za-arthurza-arthur
committed
Merge branch 'pgpro-1693-squashed'
2 parents 6d91234 + ab86cb5 commit 144b852

File tree

5 files changed

+127
-9
lines changed

5 files changed

+127
-9
lines changed

‎src/catalog.c‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ readBackupControlFile(const char *path)
479479
char *program_version = NULL;
480480
char *server_version = NULL;
481481
char *compress_alg = NULL;
482+
int parsed_options;
482483

483484
pgut_option options[] =
484485
{
@@ -508,10 +509,28 @@ readBackupControlFile(const char *path)
508509
};
509510

510511
if (access(path, F_OK) != 0)
512+
{
513+
elog(WARNING, "control file \"%s\" doesn't exist", path);
514+
pgBackupFree(backup);
511515
return NULL;
516+
}
512517

513518
pgBackup_init(backup);
514-
pgut_readopt(path, options, ERROR);
519+
parsed_options = pgut_readopt(path, options, WARNING);
520+
521+
if (parsed_options == 0)
522+
{
523+
elog(WARNING, "control file \"%s\" is empty", path);
524+
pgBackupFree(backup);
525+
return NULL;
526+
}
527+
528+
if (backup->start_time == 0)
529+
{
530+
elog(WARNING, "invalid ID/start-time, control file \"%s\" is corrupted", path);
531+
pgBackupFree(backup);
532+
return NULL;
533+
}
515534

516535
if (backup_mode)
517536
{

‎src/utils/pgut.c‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,20 +1095,22 @@ key_equals(const char *lhs, const char *rhs)
10951095

10961096
/*
10971097
* Get configuration from configuration file.
1098+
* Return number of parsed options
10981099
*/
1099-
void
1100+
int
11001101
pgut_readopt(const char *path, pgut_option options[], int elevel)
11011102
{
11021103
FILE *fp;
11031104
char buf[1024];
11041105
char key[1024];
11051106
char value[1024];
1107+
int parsed_options = 0;
11061108

11071109
if (!options)
1108-
return;
1110+
return parsed_options;
11091111

11101112
if ((fp = pgut_fopen(path, "rt", true)) == NULL)
1111-
return;
1113+
return parsed_options;
11121114

11131115
while (fgets(buf, lengthof(buf), fp))
11141116
{
@@ -1127,18 +1129,23 @@ pgut_readopt(const char *path, pgut_option options[], int elevel)
11271129
{
11281130
if (opt->allowed < SOURCE_FILE &&
11291131
opt->allowed != SOURCE_FILE_STRICT)
1130-
elog(elevel, "option %s cannot specified in file", opt->lname);
1132+
elog(elevel, "option %s cannot be specified in file", opt->lname);
11311133
else if (opt->source <= SOURCE_FILE)
1134+
{
11321135
assign_option(opt, value, SOURCE_FILE);
1136+
parsed_options++;
1137+
}
11331138
break;
11341139
}
11351140
}
11361141
if (!options[i].type)
1137-
elog(elevel, "invalid option \"%s\"", key);
1142+
elog(elevel, "invalid option \"%s\" in file \"%s\"", key, path);
11381143
}
11391144
}
11401145

11411146
fclose(fp);
1147+
1148+
return parsed_options;
11421149
}
11431150

11441151
static const char *

‎src/utils/pgut.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extern bool in_cleanup;
110110
extern bool in_password; /* User prompts password */
111111

112112
extern int pgut_getopt(int argc, char **argv, pgut_option options[]);
113-
extern void pgut_readopt(const char *path, pgut_option options[], int elevel);
113+
extern int pgut_readopt(const char *path, pgut_option options[], int elevel);
114114
extern void pgut_getopt_env(pgut_option options[]);
115115
extern void pgut_atexit_push(pgut_atexit_callback callback, void *userdata);
116116
extern void pgut_atexit_pop(pgut_atexit_callback callback, void *userdata);

‎tests/option_test.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ def test_options_5(self):
199199
self.add_instance(backup_dir, 'node', node)
200200

201201
# invalid option in pg_probackup.conf
202-
with open(os.path.join(backup_dir, "backups", "node", "pg_probackup.conf"), "a") as conf:
202+
pbconf_path = os.path.join(backup_dir, "backups", "node", "pg_probackup.conf")
203+
with open(pbconf_path, "a") as conf:
203204
conf.write("TIMELINEID=1\n")
204205

205206
try:
@@ -209,7 +210,7 @@ def test_options_5(self):
209210
repr(self.output), self.cmd))
210211
except ProbackupException as e:
211212
self.assertEqual(e.message,
212-
'ERROR: invalid option "TIMELINEID"\n',
213+
'ERROR: invalid option "TIMELINEID" in file "{0}"\n'.format(pbconf_path),
213214
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
214215

215216
# Clean after yourself

‎tests/show_test.py‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,94 @@ def test_corrupt_2(self):
110110

111111
# Clean after yourself
112112
self.del_test_dir(module_name, fname)
113+
114+
# @unittest.skip("skip")
115+
def test_no_control_file(self):
116+
"""backup.control doesn't exist"""
117+
fname = self.id().split('.')[3]
118+
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
119+
node = self.make_simple_node(
120+
base_dir="{0}/{1}/node".format(module_name, fname),
121+
initdb_params=['--data-checksums'],
122+
pg_options={'wal_level': 'replica'}
123+
)
124+
125+
self.init_pb(backup_dir)
126+
self.add_instance(backup_dir, 'node', node)
127+
self.set_archiving(backup_dir, 'node', node)
128+
node.start()
129+
130+
backup_id = self.backup_node(backup_dir, 'node', node)
131+
132+
# delete backup.control file
133+
file = os.path.join(
134+
backup_dir, "backups", "node",
135+
backup_id, "backup.control")
136+
os.remove(file)
137+
138+
self.assertIn('control file "{0}" doesn\'t exist'.format(file), self.show_pb(backup_dir, 'node', as_text=True))
139+
140+
# Clean after yourself
141+
self.del_test_dir(module_name, fname)
142+
143+
# @unittest.skip("skip")
144+
def test_empty_control_file(self):
145+
"""backup.control is empty"""
146+
fname = self.id().split('.')[3]
147+
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
148+
node = self.make_simple_node(
149+
base_dir="{0}/{1}/node".format(module_name, fname),
150+
initdb_params=['--data-checksums'],
151+
pg_options={'wal_level': 'replica'}
152+
)
153+
154+
self.init_pb(backup_dir)
155+
self.add_instance(backup_dir, 'node', node)
156+
self.set_archiving(backup_dir, 'node', node)
157+
node.start()
158+
159+
backup_id = self.backup_node(backup_dir, 'node', node)
160+
161+
# truncate backup.control file
162+
file = os.path.join(
163+
backup_dir, "backups", "node",
164+
backup_id, "backup.control")
165+
fd = open(file, 'w')
166+
fd.close()
167+
168+
self.assertIn('control file "{0}" is empty'.format(file), self.show_pb(backup_dir, 'node', as_text=True))
169+
170+
# Clean after yourself
171+
self.del_test_dir(module_name, fname)
172+
173+
# @unittest.skip("skip")
174+
# @unittest.expectedFailure
175+
def test_corrupt_control_file(self):
176+
"""backup.control contains invalid option"""
177+
fname = self.id().split('.')[3]
178+
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
179+
node = self.make_simple_node(
180+
base_dir="{0}/{1}/node".format(module_name, fname),
181+
initdb_params=['--data-checksums'],
182+
pg_options={'wal_level': 'replica'}
183+
)
184+
185+
self.init_pb(backup_dir)
186+
self.add_instance(backup_dir, 'node', node)
187+
self.set_archiving(backup_dir, 'node', node)
188+
node.start()
189+
190+
backup_id = self.backup_node(backup_dir, 'node', node)
191+
192+
# corrupt backup.control file
193+
file = os.path.join(
194+
backup_dir, "backups", "node",
195+
backup_id, "backup.control")
196+
fd = open(file, 'a')
197+
fd.write("statuss = OK")
198+
fd.close()
199+
200+
self.assertIn('invalid option "statuss" in file'.format(file), self.show_pb(backup_dir, 'node', as_text=True))
201+
202+
# Clean after yourself
203+
self.del_test_dir(module_name, fname)

0 commit comments

Comments
 (0)