MIME-Version: 1.0
References: 
 <CA+3i_M9+A5Wx_o3d3UHcxVU_yfes+a1b8za4VgmWTY_Odc7qMA@mail.gmail.com>
 <CAKx0YhxRYuWCSC3mCTJ0VRn0iM8v0G=7vku=3Wg7pyi+rN-=Jw@mail.gmail.com>
In-Reply-To: 
 <CAKx0YhxRYuWCSC3mCTJ0VRn0iM8v0G=7vku=3Wg7pyi+rN-=Jw@mail.gmail.com>
From: Lakshmi N <lakshmin.jhs@gmail.com>
Date: Fri, 10 Apr 2026 22:02:02 -0700
Message-ID: 
 <CA+3i_M_Jwy2T+L+wT_4yXKG8r1yQFJt3+Gm5wbxap5hKyy_nzA@mail.gmail.com>
Subject: Re: Add missing CHECK_FOR_INTERRUPTS in autovacuum catalog scan loops
To: Dapeng Wang <wangdp20191008@gmail.com>
Cc: pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="0000000000001f1bb1064f2827be"
Archived-At: 
 <https://www.postgresql.org/message-id/CA%2B3i_M_Jwy2T%2BL%2BwT_4yXKG8r1yQFJt3%2BGm5wbxap5hKyy_nzA%40mail.gmail.com>
Precedence: bulk

--0000000000001f1bb1064f2827be
Content-Type: multipart/alternative; boundary="0000000000001f1bb0064f2827bc"

--0000000000001f1bb0064f2827bc
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, Apr 10, 2026 at 4:57=E2=80=AFAM Dapeng Wang <wangdp20191008@gmail.c=
om>
wrote:

> Lakshmi N <lakshmin.jhs@gmail.com> =E4=BA=8E2026=E5=B9=B44=E6=9C=8810=E6=
=97=A5=E5=91=A8=E4=BA=94 16:39=E5=86=99=E9=81=93=EF=BC=9A
>
>> Hi hackers,
>>
>> I noticed CFI is missing while scanning pg_class for RELKIND_RELATION an=
d
>> RELKIND_TOASTVALUE. On a database with several thousands of tables, thes=
e
>> scans can take a noticeable amount of time. Attached a patch to address
>> this.
>>
>> Regards,
>> Lakshmi
>>
> Hi Lakshmi,
>
> The patch applies cleanly to HEAD and compiles without warnings.
> make check passes (one unrelated ICU collation diff).
>
> The two CHECK_FOR_INTERRUPTS() additions in do_autovacuum() look
> correct and are well-placed at the top of each loop iteration,
> before any resources are acquired.
>
> I noticed there are other similar catalog scan loops in
> autovacuum.c that also lack CHECK_FOR_INTERRUPTS():
>
> - The pg_database scan loop around line 1854
> - The pg_class scan loop around line 3664
>
> Should those be covered as well?
>

Updated the patch covering those two as well.


Regards,
Lakshmi

>

--0000000000001f1bb0064f2827bc
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr">Hi,</div><br><div class=3D"gmail_quote gm=
ail_quote_container"><div dir=3D"ltr" class=3D"gmail_attr">On Fri, Apr 10, =
2026 at 4:57=E2=80=AFAM Dapeng Wang &lt;<a href=3D"mailto:wangdp20191008@gm=
ail.com">wangdp20191008@gmail.com</a>&gt; wrote:<br></div><blockquote class=
=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rg=
b(204,204,204);padding-left:1ex"><div dir=3D"ltr"><div dir=3D"ltr">Lakshmi =
N &lt;<a href=3D"mailto:lakshmin.jhs@gmail.com" target=3D"_blank">lakshmin.=
jhs@gmail.com</a>&gt; =E4=BA=8E2026=E5=B9=B44=E6=9C=8810=E6=97=A5=E5=91=A8=
=E4=BA=94 16:39=E5=86=99=E9=81=93=EF=BC=9A</div><div class=3D"gmail_quote">=
<blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-=
left:1px solid rgb(204,204,204);padding-left:1ex"><div dir=3D"ltr">Hi hacke=
rs,<div><br></div><div>I noticed CFI is missing=C2=A0while scanning pg_clas=
s for RELKIND_RELATION and RELKIND_TOASTVALUE. On a database with several t=
housands of tables, these scans can take a noticeable amount of time. Attac=
hed a patch to address this.</div><div><br></div><div>Regards,</div><div>La=
kshmi</div></div></blockquote>Hi Lakshmi,<br><br>The patch applies cleanly =
to HEAD and compiles without warnings.<br>make check passes (one unrelated =
ICU collation diff).<br><br>The two CHECK_FOR_INTERRUPTS() additions in do_=
autovacuum() look<br>correct and are well-placed at the top of each loop it=
eration,<br>before any resources are acquired.<br><br>I noticed there are o=
ther similar catalog scan loops in<br>autovacuum.c that also lack CHECK_FOR=
_INTERRUPTS():<br><br>- The pg_database scan loop around line 1854<br>- The=
 pg_class scan loop around line 3664<br><br>Should those be covered as well=
?<br></div></div></blockquote><div><br></div><div>Updated the patch coverin=
g those two as well.</div><div><br></div><div><br></div><div>Regards,</div>=
<div>Lakshmi</div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px=
 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
</blockquote></div></div>

--0000000000001f1bb0064f2827bc--

--0000000000001f1bb1064f2827be
Content-Type: application/octet-stream;
	name="v2-0001-Add-CHECK_FOR_INTERRUPTS-in-autovacuum-table-scannin.patch"
Content-Disposition: attachment;
	filename="v2-0001-Add-CHECK_FOR_INTERRUPTS-in-autovacuum-table-scannin.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mntvb6pz0>
X-Attachment-Id: f_mntvb6pz0

RnJvbSBkMmQzMTk4N2QyZTQ3OWE4ZDkyNDk0NjQ0YzE4M2M4YmQyZjc0OWIyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBMYWtzaG1pIE4gPGxha3NobWluLmpoc0BnbWFpbC5jb20+CkRh
dGU6IEZyaSwgMTAgQXByIDIwMjYgMDE6Mzk6MDQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBBZGQg
Q0hFQ0tfRk9SX0lOVEVSUlVQVFMgaW4gYXV0b3ZhY3V1bSB0YWJsZS1zY2FubmluZyBsb29wcwoK
LS0tCiBzcmMvYmFja2VuZC9wb3N0bWFzdGVyL2F1dG92YWN1dW0uYyB8IDggKysrKysrKysKIDEg
ZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9w
b3N0bWFzdGVyL2F1dG92YWN1dW0uYyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvYXV0b3ZhY3V1
bS5jCmluZGV4IDgyMDYxMjQ3OTg4Li41ZTM2MTM3OTI1YSAxMDA2NDQKLS0tIGEvc3JjL2JhY2tl
bmQvcG9zdG1hc3Rlci9hdXRvdmFjdXVtLmMKKysrIGIvc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9h
dXRvdmFjdXVtLmMKQEAgLTE4NTksNiArMTg1OSw4IEBAIGdldF9kYXRhYmFzZV9saXN0KHZvaWQp
CiAJCWF2d19kYmFzZSAgKmF2ZGI7CiAJCU1lbW9yeUNvbnRleHQgb2xkY3h0OwogCisJCUNIRUNL
X0ZPUl9JTlRFUlJVUFRTKCk7CisKIAkJLyoKIAkJICogSWYgZGF0YWJhc2UgaGFzIHBhcnRpYWxs
eSBiZWVuIGRyb3BwZWQsIHdlIGNhbid0LCBub3IgbmVlZCB0bywKIAkJICogdmFjdXVtIGl0LgpA
QCAtMjA0Miw2ICsyMDQ0LDggQEAgZG9fYXV0b3ZhY3V1bSh2b2lkKQogCQlib29sCQl3cmFwYXJv
dW5kOwogCQlBdXRvVmFjdXVtU2NvcmVzIHNjb3JlczsKIAorCQlDSEVDS19GT1JfSU5URVJSVVBU
UygpOworCiAJCWlmIChjbGFzc0Zvcm0tPnJlbGtpbmQgIT0gUkVMS0lORF9SRUxBVElPTiAmJgog
CQkJY2xhc3NGb3JtLT5yZWxraW5kICE9IFJFTEtJTkRfTUFUVklFVykKIAkJCWNvbnRpbnVlOwpA
QCAtMjE0Niw2ICsyMTUwLDggQEAgZG9fYXV0b3ZhY3V1bSh2b2lkKQogCQlib29sCQl3cmFwYXJv
dW5kOwogCQlBdXRvVmFjdXVtU2NvcmVzIHNjb3JlczsKIAorCQlDSEVDS19GT1JfSU5URVJSVVBU
UygpOworCiAJCS8qCiAJCSAqIFdlIGNhbm5vdCBzYWZlbHkgcHJvY2VzcyBvdGhlciBiYWNrZW5k
cycgdGVtcCB0YWJsZXMsIHNvIHNraXAgJ2VtLgogCQkgKi8KQEAgLTM2NjksNiArMzY3NSw4IEBA
IHBnX3N0YXRfZ2V0X2F1dG92YWN1dW1fc2NvcmVzKFBHX0ZVTkNUSU9OX0FSR1MpCiAJCURhdHVt
CQl2YWxzWzEwXTsKIAkJYm9vbAkJbnVsbHNbMTBdID0ge2ZhbHNlfTsKIAorCQlDSEVDS19GT1Jf
SU5URVJSVVBUUygpOworCiAJCS8qIHNraXAgaW5lbGlnaWJsZSBlbnRyaWVzICovCiAJCWlmIChm
b3JtLT5yZWxraW5kICE9IFJFTEtJTkRfUkVMQVRJT04gJiYKIAkJCWZvcm0tPnJlbGtpbmQgIT0g
UkVMS0lORF9NQVRWSUVXICYmCi0tIAoyLjQzLjAKCg==
--0000000000001f1bb1064f2827be--