Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5b570d7

Browse files
committed
Un-break parallel pg_upgrade.
Commitb3f8401 changed pg_upgrade so that it'd actually drop andre-create the template1 and postgres databases in the new cluster.That works fine, serially. With the -j option it's not so fine, becauseother per-database jobs might be launched while the template1 database isdropped. Since they attempt to connect there to start up, kaboom.This is the cause of the intermittent failures buildfarm member jacanahas been showing for the last month; evidently it is the only BF memberconfigured to run the pg_upgrade test with parallelism enabled.Fix by processing template1 separately before we get into the parallelsub-job launch loop. (We could alternatively have made the postgres DBbe the special case, but it seems likely that template1 will containless stuff and so we lose less parallelism with this choice.)
1 parent1316417 commit5b570d7

File tree

1 file changed

+48
-11
lines changed

1 file changed

+48
-11
lines changed

‎src/bin/pg_upgrade/pg_upgrade.c

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,21 @@ create_new_objects(void)
302302

303303
prep_status("Restoring database schemas in the new cluster\n");
304304

305+
/*
306+
* We cannot process the template1 database concurrently with others,
307+
* because when it's transiently dropped, connection attempts would fail.
308+
* So handle it in a separate non-parallelized pass.
309+
*/
305310
for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)
306311
{
307312
charsql_file_name[MAXPGPATH],
308313
log_file_name[MAXPGPATH];
309314
DbInfo*old_db=&old_cluster.dbarr.dbs[dbnum];
310315
constchar*create_opts;
311-
constchar*starting_db;
316+
317+
/* Process only template1 in this pass */
318+
if (strcmp(old_db->db_name,"template1")!=0)
319+
continue;
312320

313321
pg_log(PG_STATUS,"%s",old_db->db_name);
314322
snprintf(sql_file_name,sizeof(sql_file_name),DB_DUMP_FILE_MASK,old_db->db_oid);
@@ -320,26 +328,55 @@ create_new_objects(void)
320328
* otherwise we would fail to propagate their database-level
321329
* properties.
322330
*/
323-
if (strcmp(old_db->db_name,"template1")==0||
324-
strcmp(old_db->db_name,"postgres")==0)
325-
create_opts="--clean --create";
326-
else
327-
create_opts="--create";
331+
create_opts="--clean --create";
332+
333+
exec_prog(log_file_name,
334+
NULL,
335+
true,
336+
true,
337+
"\"%s/pg_restore\" %s %s --exit-on-error --verbose "
338+
"--dbname postgres \"%s\"",
339+
new_cluster.bindir,
340+
cluster_conn_opts(&new_cluster),
341+
create_opts,
342+
sql_file_name);
328343

329-
/* When processing template1, we can't connect there to start with */
344+
break;/* done once we've processed template1 */
345+
}
346+
347+
for (dbnum=0;dbnum<old_cluster.dbarr.ndbs;dbnum++)
348+
{
349+
charsql_file_name[MAXPGPATH],
350+
log_file_name[MAXPGPATH];
351+
DbInfo*old_db=&old_cluster.dbarr.dbs[dbnum];
352+
constchar*create_opts;
353+
354+
/* Skip template1 in this pass */
330355
if (strcmp(old_db->db_name,"template1")==0)
331-
starting_db="postgres";
356+
continue;
357+
358+
pg_log(PG_STATUS,"%s",old_db->db_name);
359+
snprintf(sql_file_name,sizeof(sql_file_name),DB_DUMP_FILE_MASK,old_db->db_oid);
360+
snprintf(log_file_name,sizeof(log_file_name),DB_DUMP_LOG_FILE_MASK,old_db->db_oid);
361+
362+
/*
363+
* template1 and postgres databases will already exist in the target
364+
* installation, so tell pg_restore to drop and recreate them;
365+
* otherwise we would fail to propagate their database-level
366+
* properties.
367+
*/
368+
if (strcmp(old_db->db_name,"postgres")==0)
369+
create_opts="--clean --create";
332370
else
333-
starting_db="template1";
371+
create_opts="--create";
334372

335373
parallel_exec_prog(log_file_name,
336374
NULL,
337375
"\"%s/pg_restore\" %s %s --exit-on-error --verbose "
338-
"--dbname%s \"%s\"",
376+
"--dbnametemplate1 \"%s\"",
339377
new_cluster.bindir,
340378
cluster_conn_opts(&new_cluster),
341379
create_opts,
342-
starting_db,
343380
sql_file_name);
344381
}
345382

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp