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

Commit9d52311

Browse files
committed
Avoid possible crash while finishing up a heap rewrite.
end_heap_rewrite was not careful to ensure that the target relationis open at the smgr level before performing its final smgrimmedsync.In ordinary cases this is no problem, because it would have beenopened earlier during the rewrite. However a crash can be reproducedby re-clustering an empty table with CLOBBER_CACHE_ALWAYS enabled.Although that exact scenario does not crash in v13, I think that'sa chance result of unrelated planner changes, and the problem islikely still reachable with other test cases. The true proximatecause of this failure is commitc6b9204, which replaced a call toheap_sync (which was careful about opening smgr) with a direct callto smgrimmedsync. Hence, back-patch to v13.Amul Sul, per report from Neha Sharma; cosmetic changesand test case by me.Discussion:https://postgr.es/m/CANiYTQsU7yMFpQYnv=BrcRVqK_3U3mtAzAsJCaqtzsDHfsUbdQ@mail.gmail.com
1 parent22e1943 commit9d52311

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

‎src/backend/access/heap/rewriteheap.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ end_heap_rewrite(RewriteState state)
323323
state->rs_blockno,
324324
state->rs_buffer,
325325
true);
326-
RelationOpenSmgr(state->rs_new_rel);
327326

328327
PageSetChecksumInplace(state->rs_buffer,state->rs_blockno);
329328

329+
RelationOpenSmgr(state->rs_new_rel);
330330
smgrextend(state->rs_new_rel->rd_smgr,MAIN_FORKNUM,state->rs_blockno,
331331
(char*)state->rs_buffer, true);
332332
}
@@ -339,7 +339,11 @@ end_heap_rewrite(RewriteState state)
339339
* wrote before the checkpoint.
340340
*/
341341
if (RelationNeedsWAL(state->rs_new_rel))
342+
{
343+
/* for an empty table, this could be first smgr access */
344+
RelationOpenSmgr(state->rs_new_rel);
342345
smgrimmedsync(state->rs_new_rel->rd_smgr,MAIN_FORKNUM);
346+
}
343347

344348
logical_end_heap_rewrite(state);
345349

‎src/test/regress/expected/cluster.out

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,11 @@ select * from clstr_temp;
439439

440440
drop table clstr_temp;
441441
RESET SESSION AUTHORIZATION;
442+
-- check clustering an empty table
443+
DROP TABLE clustertest;
444+
CREATE TABLE clustertest (f1 int PRIMARY KEY);
445+
CLUSTER clustertest USING clustertest_pkey;
446+
CLUSTER clustertest;
442447
-- Check that partitioned tables cannot be clustered
443448
CREATE TABLE clstrpart (a int) PARTITION BY RANGE (a);
444449
CREATE INDEX clstrpart_idx ON clstrpart (a);

‎src/test/regress/sql/cluster.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@ drop table clstr_temp;
196196

197197
RESET SESSION AUTHORIZATION;
198198

199+
-- check clustering an empty table
200+
DROPTABLE clustertest;
201+
CREATETABLEclustertest (f1intPRIMARY KEY);
202+
CLUSTER clustertest USING clustertest_pkey;
203+
CLUSTER clustertest;
204+
199205
-- Check that partitioned tables cannot be clustered
200206
CREATETABLEclstrpart (aint) PARTITION BY RANGE (a);
201207
CREATEINDEXclstrpart_idxON clstrpart (a);

0 commit comments

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