Date: Mon, 18 Mar 2024 08:49:34 -0700
From: Noah Misch <noah@leadboat.com>
To: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Cc: Michael Paquier <michael@paquier.xyz>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Subject: Re: Autogenerate some wait events code and documentation
Message-ID: <20240318154934.10.nmisch@google.com>
References: <ZGSM8oOpXsXrXy/v@paquier.xyz>
 <69588eaf-02d7-95a8-0da4-3e120de16a59@gmail.com>
 <ZGWrTn//v+WAqMpN@paquier.xyz>
 <ZKJxZrnFTxoCx8a5@paquier.xyz>
 <ZKJ0tzXSH1LyqI9V@paquier.xyz>
 <0b3cdac7-f078-61a6-76e0-99db7aae78ce@gmail.com>
 <ZKTN//NfDeP1egLW@paquier.xyz>
 <20240317183114.16@rfd.leadboat.com>
 <Zfd2gKf00dfxwi4d@paquier.xyz>
 <ZfgDrC5lW99sI8MM@ip-10-97-1-34.eu-west-3.compute.internal>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZfgDrC5lW99sI8MM@ip-10-97-1-34.eu-west-3.compute.internal>
User-Agent: Mutt/2.2.12 (2023-09-09)
Archived-At: 
 <https://www.postgresql.org/message-id/20240318154934.10.nmisch%40google.com>
Precedence: bulk

On Mon, Mar 18, 2024 at 09:04:44AM +0000, Bertrand Drouvot wrote:
> --- a/src/backend/utils/activity/wait_event_names.txt
> +++ b/src/backend/utils/activity/wait_event_names.txt
> @@ -24,7 +24,12 @@
>  #      SGML tables of wait events for inclusion in the documentation.
>  #
>  # When adding a new wait event, make sure it is placed in the appropriate
> -# ClassName section.
> +# ClassName section. If the wait event is backpatched to a version < 17 then
> +# put it under a "Backpatch" delimiter at the end of the related ClassName
> +# section.

Back-patch from v17 to pre-v17 won't use this, because v16 has hand-maintained
enums.  It's back-patch v18->v17 or v22->v17 where this will come up.

> +# Ensure that the wait events under the "Backpatch" delimiter are placed in the
> +# same order as in the pre 17 wait_event_types.h (see VERSION_FILE_SYNC as an
> +# example).

I expect the normal practice will be to put the entry in its natural position
in git master, then put it in the backpatch section for any other branch.  In
other words, the backpatch regions are always empty in git master, and the
non-backpatch regions change in master only.