Teach pg_upgrade to deal with invalid databases

3 patchsets tracked - current t253678_17

v17t253678_17posted 6 days agosuccessappliesrecent 0dpg 20

basef2edf5dd0 about 18 hours ago on master

applyapplied about 16 hours ago

rebaselast tried about 16 hours ago on f2edf5dd0

pushabout 16 hours ago -> c0cc4fc41 branch diff vs base

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1049 / 1049	3m 05s / 6m 00s	`docker run ... :t253678`	about 15 hours ago
run 39723393575 executed 1049 - ccache 78 hit / 6544 miss - head c0cc4fc41 - digest sha256:8474fcd700114d... - run 39723393575
success	1	20	1049 / 1049	2m 38s / 4m 41s	`docker run ... @sha256:0df7453...`	1 day ago
run 39544795888 executed 1049 - ccache 78 hit / 6544 miss - head c83019a7b - digest sha256:0df7453830b78f... - run 39544795888
success	1	20	1049 / 1049	2m 55s / 5m 30s	`docker run ... @sha256:81ea963...`	3 days ago
run 39368858648 executed 1049 - ccache 78 hit / 6544 miss - head 39ef44dc7 - digest sha256:81ea9631cab93d... - run 39368858648
success	1	20	1049 / 1049	2m 14s / 4m 19s	`docker run ... @sha256:af4b04e...`	4 days ago
run 39197996640 executed 1049 - ccache 78 hit / 6544 miss - head 7cd5bbd60 - digest sha256:af4b04eafb2af0... - run 39197996640
success	1	20	1049 / 1049	2m 54s / 5m 17s	`docker run ... @sha256:9277d6c...`	5 days ago
run 39071090574 executed 1049 - ccache 78 hit / 6544 miss - head fd2792bed - digest sha256:9277d6c6773fb5... - run 39071090574
success	1	20	1049 / 1049	2m 17s / 4m 42s	`docker run ... @sha256:8f21c7d...`	6 days ago
run 38969509382 executed 1049 - ccache 78 hit / 6544 miss - head 77f42988e - digest sha256:8f21c7d7b7d1fd... - run 38969509382

v13t253678_13posted Sep 24, 15:37successsupersededrecent 9dpg 20

base158b6d510 Oct 13, 11:31 on master

applyapplied Oct 13, 19:27

rebaselast tried 6 days ago on af0905080

Applying: Teach pg_upgrade to skip invalid databases.
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/t/002_pg_upgrade.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/t/002_pg_upgrade.pl
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/t/002_pg_upgrade.pl
Patch failed at 0001 Teach pg_upgrade to skip invalid databases.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

conflicts on master: src/bin/pg_upgrade/t/002_pg_upgrade.pl

pushOct 13, 19:27 -> 27cfa4ab8 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1044 / 1044	2m 52s / 5m 32s	`docker run ... @sha256:959c58c...`	Oct 13, 19:38
run 38454940178 executed 1044 - ccache 78 hit / 6544 miss - head 27cfa4ab8 - digest sha256:959c58c8435920... - run 38454940178
success	1	20	1044 / 1044	2m 52s / 5m 25s	`docker run ... @sha256:9a07b46...`	Oct 12, 19:31
run 38297059403 executed 1044 - ccache 78 hit / 6544 miss - head 791a378cc - digest sha256:9a07b4690d8ace... - run 38297059403
success	1	20	1044 / 1044	2m 52s / 5m 33s	`docker run ... @sha256:59fc783...`	Oct 11, 16:33
run 38155207420 executed 1044 - ccache 78 hit / 6544 miss - head c2f23538d - digest sha256:59fc783dac4e26... - run 38155207420
success	1	20	1044 / 1044	2m 58s / 5m 20s	`docker run ... @sha256:d7efa37...`	Oct 10, 16:32
run 38067361776 executed 1044 - ccache 78 hit / 6544 miss - head 993cf06e3 - digest sha256:d7efa37233abc3... - run 38067361776
success	1	20	1043 / 1043	2m 47s / 5m 07s	`docker run ... @sha256:a347994...`	Oct 09, 16:35
run 37958523182 executed 1043 - ccache 78 hit / 6544 miss - head 8e0de03a8 - digest sha256:a347994799e59b... - run 37958523182
success	1	20	1042 / 1042	1m 44s / 4m 11s	`docker run ... @sha256:ae0442a...`	Oct 08, 16:27
run 37807879051 executed 1042 - ccache 78 hit / 6544 miss - head dd3ceb8a2 - digest sha256:ae0442a61a8c23... - run 37807879051
success	1	20	1042 / 1042	2m 10s / 4m 53s	`docker run ... @sha256:85a00a9...`	Oct 07, 16:26
run 37650760225 executed 1042 - ccache 78 hit / 6544 miss - head d3e43d45f - digest sha256:85a00a9e8b1851... - run 37650760225
success	1	20	1040 / 1040	2m 54s / 5m 17s	`docker run ... @sha256:a6a10ea...`	Oct 06, 16:26
run 37494159917 executed 1040 - ccache 78 hit / 6544 miss - head 97c53f48a - digest sha256:a6a10ea4a6db77... - run 37494159917
success	1	20	1039 / 1039	2m 53s / 5m 18s	`docker run ... @sha256:37916c7...`	Oct 05, 16:24
run 37339206028 executed 1039 - ccache 78 hit / 6544 miss - head f9cabf997 - digest sha256:37916c71c7af51... - run 37339206028
success	1	20	1039 / 1039	2m 52s / 5m 31s	`docker run ... @sha256:cea1bfe...`	Oct 04, 16:22
run 37215889795 executed 1039 - ccache 78 hit / 6544 miss - head 90dfd0893 - digest sha256:cea1bfef158c68... - run 37215889795
success	1	20	1039 / 1039	2m 55s / 5m 15s	`docker run ... @sha256:1c9fd6a...`	Oct 03, 16:21
run 37135868983 executed 1039 - ccache 78 hit / 6544 miss - head 11a9a6c64 - digest sha256:1c9fd6a7dc5490... - run 37135868983
success	1	20	1039 / 1039	2m 13s / 4m 29s	`docker run ... @sha256:21de433...`	Oct 02, 16:18
run 37031988650 executed 1039 - ccache 78 hit / 6544 miss - head c5de998d9 - digest sha256:21de433d1e03dd... - run 37031988650
success	1	20	1039 / 1039	2m 56s / 5m 34s	`docker run ... @sha256:00eea7e...`	Oct 01, 16:19
run 36889717466 executed 1039 - ccache 78 hit / 6544 miss - head fe8cd4e0f - digest sha256:00eea7eb33127f... - run 36889717466
success	1	20	1039 / 1039	2m 09s / 4m 35s	`docker run ... @sha256:243d88f...`	Sep 30, 16:06
run 36740616255 executed 1039 - ccache 78 hit / 6544 miss - head b1a414b8e - digest sha256:243d88f1696a51... - run 36740616255
success	1	20	1039 / 1039	2m 24s / 4m 25s	`docker run ... @sha256:b3bb8d1...`	Sep 29, 16:05
run 36593966017 executed 1039 - ccache 78 hit / 6544 miss - head 43a3a77a4 - digest sha256:b3bb8d1e4f6cd8... - run 36593966017
success	1	20	1039 / 1039	2m 49s / 5m 24s	`docker run ... @sha256:e309b05...`	Sep 28, 16:03
run 36446876086 executed 1039 - ccache 78 hit / 6544 miss - head 1d804a6a1 - digest sha256:e309b05c32d445... - run 36446876086
success	1	20	1039 / 1039	2m 37s / 4m 28s	`docker run ... @sha256:e0ac7b6...`	Sep 27, 15:57
run 36330897905 executed 1039 - ccache 78 hit / 6544 miss - head 175265109 - digest sha256:e0ac7b6eef8d5c... - run 36330897905
success	1	20	1039 / 1039	2m 49s / 5m 25s	`docker run ... @sha256:ff9ef06...`	Sep 26, 15:57
run 36253101285 executed 1039 - ccache 78 hit / 6544 miss - head 0400d2ff4 - digest sha256:ff9ef060cd8e95... - run 36253101285
success	1	20	1039 / 1039	2m 43s / 4m 38s	`docker run ... @sha256:71005c4...`	Sep 25, 15:55
run 36156325384 executed 1039 - ccache 78 hit / 6544 miss - head 60cdc1ece - digest sha256:71005c4d547bd2... - run 36156325384
success	1	20	1038 / 1038	1m 45s / 4m 05s	`docker run ... @sha256:0d51a32...`	Sep 24, 15:49
run 36022047502 executed 1038 - ccache 78 hit / 6544 miss - head faa21fb7e - digest sha256:0d51a320f79e89... - run 36022047502

v1t253678_1posted Sep 04, 17:27successsupersededrecent 28dpg 20

base4a2f5533f Sep 23, 20:37 on master

applyapplied Sep 23, 21:12

rebaselast tried Sep 23, 21:12 on 4a2f5533f

pushSep 23, 21:12 -> 8da904a8e branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1036 / 1036	2m 55s / 5m 14s	`docker run ... @sha256:4e661fc...`	Sep 23, 21:23
run 35921017293 executed 1036 - ccache 98 hit / 6524 miss - head 8da904a8e - digest sha256:4e661fcfdadfe9... - run 35921017293
success	1	20	1036 / 1036	2m 55s / 5m 18s	`docker run ... @sha256:468d227...`	Sep 22, 21:20
run 35784893849 executed 1036 - ccache 98 hit / 6524 miss - head ab96e758a - digest sha256:468d227fee871b... - run 35784893849
success	1	20	1036 / 1036	1m 51s / 4m 18s	`docker run ... @sha256:4d3862c...`	Sep 21, 21:06
run 35654302755 executed 1036 - ccache 98 hit / 6524 miss - head 3d93bc9a7 - digest sha256:4d3862c67a20dc... - run 35654302755
success	1	20	1036 / 1036	1m 51s / 3m 55s	`docker run ... @sha256:715cb5c...`	Sep 20, 15:34
run 35519572835 executed 1036 - ccache 98 hit / 6524 miss - head 4d8a07812 - digest sha256:715cb5cf786301... - run 35519572835
success	1	20	1036 / 1036	2m 16s / 4m 21s	`docker run ... @sha256:71d19c1...`	Sep 19, 15:33
run 35451691692 executed 1036 - ccache 98 hit / 6524 miss - head dd9677e93 - digest sha256:71d19c1c3400ed... - run 35451691692
success	1	20	1036 / 1036	2m 50s / 5m 18s	`docker run ... @sha256:ad23e5a...`	Sep 18, 15:31
run 35361823187 executed 1036 - ccache 98 hit / 6524 miss - head c3d71b07c - digest sha256:ad23e5a315b494... - run 35361823187
success	1	20	1036 / 1036	2m 41s / 4m 42s	`docker run ... @sha256:c8f7799...`	Sep 17, 15:27
run 35239230529 executed 1036 - ccache 98 hit / 6524 miss - head c4e59fbc3 - digest sha256:c8f77993ff44a5... - run 35239230529
success	1	20	1036 / 1036	2m 56s / 5m 26s	`docker run ... @sha256:765c6a4...`	Sep 16, 15:17
run 35113127062 executed 1036 - ccache 98 hit / 6524 miss - head 38cb7a2d0 - digest sha256:765c6a40a69c76... - run 35113127062
success	1	20	1036 / 1036	2m 54s / 5m 12s	`docker run ... @sha256:ef5d626...`	Sep 15, 15:15
run 34985988947 executed 1036 - ccache 98 hit / 6523 miss - head 638d31e03 - digest sha256:ef5d62631d2a68... - run 34985988947
success	1	20	1036 / 1036	1m 55s / 4m 09s	`docker run ... @sha256:002b157...`	Sep 14, 15:11
run 34859575195 executed 1036 - ccache 98 hit / 6523 miss - head 845135c13 - digest sha256:002b157d2704fc... - run 34859575195
success	1	20	1023 / 1023	2m 57s / 5m 16s	`docker run ... @sha256:909dad7...`	Sep 13, 14:31
run 34762387080 executed 1023 - ccache 98 hit / 6523 miss - head 0b4c91899 - digest sha256:909dad7606a006... - run 34762387080
success	1	20	1023 / 1023	2m 54s / 5m 28s	`docker run ... @sha256:95384eb...`	Sep 12, 14:12
run 34698033179 executed 1023 - ccache 98 hit / 6523 miss - head 7bf20a5fc - digest sha256:95384eb8151b96... - run 34698033179
success	1	20	1022 / 1022	1m 53s / 3m 59s	`docker run ... @sha256:55b2fb1...`	Sep 11, 14:08
run 34607472174 executed 1022 - ccache 98 hit / 6523 miss - head a4d171681 - digest sha256:55b2fb13359d4e... - run 34607472174
success	1	20	1022 / 1022	2m 47s / 5m 16s	`docker run ... @sha256:da40ac2...`	Sep 10, 14:08
run 34485903457 executed 1022 - ccache 98 hit / 6523 miss - head 0aec9659a - digest sha256:da40ac25fc7ccd... - run 34485903457
success	1	20	1020 / 1020	2m 48s / 5m 22s	`docker run ... @sha256:a37260f...`	Sep 09, 14:02
run 34359729658 executed 1020 - ccache 98 hit / 6523 miss - head 401374a09 - digest sha256:a37260fabec48f... - run 34359729658
success	1	20	1020 / 1020	2m 46s / 4m 55s	`docker run ... @sha256:029f599...`	Sep 08, 14:00
run 34234312754 executed 1020 - ccache 98 hit / 6523 miss - head 8d9517a54 - digest sha256:029f599ba028c2... - run 34234312754
success	1	20	1024 / 1024	2m 52s / 5m 11s	`docker run ... @sha256:0e7a82a...`	Sep 07, 13:58
run 34129343775 executed 1024 - ccache 98 hit / 6527 miss - head 3e4c3b715 - digest sha256:0e7a82a68b52bf... - run 34129343775
success	1	20	1024 / 1024	2m 10s / 4m 48s	`docker run ... @sha256:67de302...`	Sep 05, 17:40
run 33981193817 executed 1024 - ccache 98 hit / 6527 miss - head 5c01be6d3 - digest sha256:67de302385d3da... - run 33981193817
success	1	20	1024 / 1024	2m 50s / 5m 12s	`docker run ... @sha256:417400e...`	Sep 04, 17:40
run 33900923921 executed 1024 - ccache 98 hit / 6527 miss - head f0e53878d - digest sha256:417400e43cdba0... - run 33900923921