Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sRva7-0027Vh-WE for pgsql-hackers@arkaria.postgresql.org; Thu, 11 Jul 2024 15:19:40 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1sRva6-00FFHL-Ml for pgsql-hackers@arkaria.postgresql.org; Thu, 11 Jul 2024 15:19:38 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sRva6-00FFHD-At for pgsql-hackers@lists.postgresql.org; Thu, 11 Jul 2024 15:19:38 +0000 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1sRva4-001Zrt-64 for pgsql-hackers@postgresql.org; Thu, 11 Jul 2024 15:19:37 +0000 Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3d94293f12fso409372b6e.3 for ; Thu, 11 Jul 2024 08:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720711174; x=1721315974; darn=postgresql.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=iZUxKQSVu5S1SHwKOeB0+9u6j9/6gWaOixroOmq6SGo=; b=DBcT+VdoTW/9pB63EL96KxcWtZPh6mal4qe4zI4oZHpOGaEc8PgBJkIbh/m425/QrX DoFnvxFkyjJ0sD+Zp67sMpmy4eArqbM2ntV62IrqNnVxkdoaO1P9ojIKSNopnVoWC7C7 VBS1RrQXMs35wnn6bgjTPz3Qh6gE+lVfHTUhTo73xrGa0MANM3gA151D3wzFe5iGNIqx vT+NEerHN5ywXWu7Z9s9Vq8cW2n/MQ2mG4kVDr4UqO60sWEAKx1F10mI2yx/Agj0Euy7 Kez0zkNS/j9Rb+bn7JAb0Pb2kpy2qW4jGt3SWiphEn/vLzwvKcPtueVBwXSmYwI7oLXH TQAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720711174; x=1721315974; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iZUxKQSVu5S1SHwKOeB0+9u6j9/6gWaOixroOmq6SGo=; b=rUtKeuECmyyyOBcvoELbYpDjoVGbsyPE1bTqitFBHbr3VX8qwyMhM4rXkFPOVZrSLv xLRqf7AWnIxQ34C6M6jq6CGwPiSiIus3RlmeStSwfydWT+P7xASkRmFOBRzZbAicRgV3 J0rkleyM5c6h19PioKPkkR1ESIz1yayoMGrz1xPsGzgJ9BPXZCMRkJiv8N5sRkjoHIcq JESCV++ECUO5lmZAtMuQ+hcsYTnz6yVODPkybVIFbJzDjPL1ajBB3KH/0+nNDNPbdZ2i /ucXKeIol4Xc8os3yYg7dTybc2gczmEGfAlNkeGYuj0uqNFlBjyHBzFlcCbaYx0Puljb VSEA== X-Forwarded-Encrypted: i=1; AJvYcCXcm4tRKDlF7UlbU/cANt6kd/t9yeTwCXS48b3tTtC7ZBlQz6zQDtlYjuRIDJRSG2j9k6zFSQ2811YheslBrJbldMTy2tM50PtlO3mO X-Gm-Message-State: AOJu0Yzcw42/pmq7891khAjRqn2iV2rhwSGEhS2MsaFoMgJnO2e3plUk VOO2yVaUJfIGsCeulGgVoL4GzTWog+Vlt+lZJco+geMLueXhA48K X-Google-Smtp-Source: AGHT+IEw2iveoSWa8BYBgvT3OT37gTr5XMmq33qmhZLZXZAqiCGhT6hehkl0dVKsHG4bBNo1FMO8pg== X-Received: by 2002:a05:6808:2012:b0:3d9:dd2c:f1fc with SMTP id 5614622812f47-3d9dd2cf80bmr5780641b6e.14.1720711173958; Thu, 11 Jul 2024 08:19:33 -0700 (PDT) Received: from smtpclient.apple ([52.95.4.23]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79f18ff6903sm302537485a.25.2024.07.11.08.19.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jul 2024 08:19:33 -0700 (PDT) From: Sami Imseih Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_183F117F-8A25-4971-86EF-4C05FC0F6D5A" Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: Re: Restart pg_usleep when interrupted Date: Thu, 11 Jul 2024 10:19:22 -0500 In-Reply-To: <3712E898-03DA-4E03-AF51-D3E24DE68216@gmail.com> Cc: Tom Lane , Robert Haas , "pgsql-hackers@postgresql.org" To: Bertrand Drouvot References: <152895F3-6B22-45ED-8038-9E14A72AAC88@amazon.com> <01000190606e3d2a-116ead16-84d2-4449-8d18-5053da66b1f4-000000@email.amazonses.com> <7D50DC5B-80C6-47B5-8DA8-A6C68A115EE5@gmail.com> <2100439.1719610468@sss.pgh.pa.us> <373D199B-2312-431D-8018-F2808913F979@gmail.com> <3712E898-03DA-4E03-AF51-D3E24DE68216@gmail.com> X-Mailer: Apple Mail (2.3774.600.62) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --Apple-Mail=_183F117F-8A25-4971-86EF-4C05FC0F6D5A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii >=20 > Correct I attached a v2 of this patch that uses instr_time to check = the elapsed > time and break out of the loop. It needs some more benchmarking. My email client has an issue sending attachments it seems. Reattaching=20= --Apple-Mail=_183F117F-8A25-4971-86EF-4C05FC0F6D5A Content-Disposition: attachment; filename=v2-0001-vaccum_delay-with-absolute-time-nanosleep.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="v2-0001-vaccum_delay-with-absolute-time-nanosleep.patch" Content-Transfer-Encoding: quoted-printable =46rom=20f0b21250875726bd429bb9657b4037be41f745e4=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Ubuntu=20=0A= Date:=20Thu,=2011=20Jul=202024=2015:05:37=20+0000=0ASubject:=20[PATCH=20= 1/1]=20vaccum_delay=20with=20absolute=20time=20nanosleep=0A=0A---=0A=20= src/backend/commands/vacuum.c=20|=2049=20= ++++++++++++++++++++++++++++++++++-=0A=201=20file=20changed,=2048=20= insertions(+),=201=20deletion(-)=0A=0Adiff=20--git=20= a/src/backend/commands/vacuum.c=20b/src/backend/commands/vacuum.c=0A= index=2048f8eab202..a65295b2ff=20100644=0A---=20= a/src/backend/commands/vacuum.c=0A+++=20b/src/backend/commands/vacuum.c=0A= @@=20-116,6=20+116,53=20@@=20static=20bool=20vacuum_rel(Oid=20relid,=20= RangeVar=20*relation,=20VacuumParams=20*params,=0A=20static=20double=20= compute_parallel_delay(void);=0A=20static=20VacOptValue=20= get_vacoptval_from_boolean(DefElem=20*def);=0A=20static=20bool=20= vac_tid_reaped(ItemPointer=20itemptr,=20void=20*state);=0A+static=20void=20= vacuum_sleep(double=20msec);=0A+=0A+static=0A+void=20vacuum_sleep(double=20= msec)=0A+{=0A+=09long=20microsec=20=3D=20msec=20*=201000;=0A+=0A+=09if=20= (microsec=20>=200)=0A+=09{=0A+#ifndef=20WIN32=0A+=09=09/*=0A+=09=09=20*=20= We=20allow=20nanosleep=20to=20handle=20interrupts=20and=20retry=20with=20= the=20remaining=20time.=0A+=09=09=20*=20However,=20since=20nanosleep=20= is=20susceptible=20to=20time=20drift=20when=20interrupted=0A+=09=09=20*=20= frequently,=20we=20add=20a=20safeguard=20to=20break=20out=20of=20the=20= nanosleep=20whenever=20the=0A+=09=09=20*=20total=20time=20of=20the=20= sleep=20exceeds=20the=20requested=20sleep=20time.=20Using=20nanosleep=0A= +=09=09=20*=20is=20a=20more=20portable=20approach=20than=20= clock_nanosleep.=0A+=09=09=20*/=0A+=09=09struct=20timespec=20delay;=0A+=09= =09struct=20timespec=20remain;=0A+=09=09struct=20instr_time=20= start_time;=0A+=0A+=09=09INSTR_TIME_SET_CURRENT(start_time);=0A+=0A+=09=09= delay.tv_sec=20=3D=20microsec=20/=201000000L;=0A+=09=09delay.tv_nsec=20=3D= =20(microsec=20%=201000000L)=20*=201000;=0A+=0A+=09=09= while(nanosleep(&delay,=20&remain)=20=3D=3D=20-1=20&&=20errno=20=3D=3D=20= EINTR)=0A+=09=09{=0A+=09=09=09struct=20instr_time=20current_time;=0A+=09=09= =09struct=20instr_time=20elapsed_time;=0A+=0A+=09=09=09= INSTR_TIME_SET_CURRENT(current_time);=0A+=0A+=09=09=09= INSTR_TIME_SET_ZERO(elapsed_time);=0A+=09=09=09= INSTR_TIME_ACCUM_DIFF(elapsed_time,=20current_time,=20start_time);=0A+=0A= +=09=09=09if=20(INSTR_TIME_GET_MICROSEC(elapsed_time)=20>=3D=20microsec)=0A= +=09=09=09=09break;=0A+=0A+=09=09=09delay=20=3D=20remain;=0A+=09=09}=0A+=0A= +#else=0A+=09=09SleepEx((microsec=20<=20500=20?=201=20:=20(microsec=20+=20= 500)=20/=201000),=20FALSE);=0A+#endif=0A+=09}=0A+}=0A=20=0A=20/*=0A=20=20= *=20GUC=20check=20function=20to=20ensure=20GUC=20value=20specified=20is=20= within=20the=20allowable=0A@@=20-2384,7=20+2431,7=20@@=20= vacuum_delay_point(void)=0A=20=09=09=09msec=20=3D=20vacuum_cost_delay=20= *=204;=0A=20=0A=20=09=09= pgstat_report_wait_start(WAIT_EVENT_VACUUM_DELAY);=0A-=09=09= pg_usleep(msec=20*=201000);=0A+=09=09vacuum_sleep(msec);=0A=20=09=09= pgstat_report_wait_end();=0A=20=0A=20=09=09/*=0A--=20=0A2.43.0=0A=0A= --Apple-Mail=_183F117F-8A25-4971-86EF-4C05FC0F6D5A Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Regards, Sami --Apple-Mail=_183F117F-8A25-4971-86EF-4C05FC0F6D5A--