=== Applying patches on top of PostgreSQL commit ID f11674f8dfe811390dfeaf6f3c3a554dbeb790e1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 06:01:24 UTC 2025
On branch cf/5492
nothing to commit, working tree clean
=== applying patch ./v7-0001-Remove-wal_-sync-write-_time-from-pg_stat_wal.patch
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/monitoring.sgml' with conflicts.
Applied patch to 'doc/src/sgml/wal.sgml' with conflicts.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_wal.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/pgstat.h' cleanly.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U doc/src/sgml/monitoring.sgml
U doc/src/sgml/wal.sgml
diff --cc doc/src/sgml/monitoring.sgml
index 71c4f96d05,e645591ce5..0000000000
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@@ -2931,13 -2931,44 +2931,54 @@@ description | Waiting for a newly initi
    </para>
  
    <para>
++<<<<<<< ours
 +   For the <varname>object</varname> <literal>wal</literal>,
 +   <varname>fsyncs</varname> and <varname>fsync_time</varname> track the
 +   fsync activity of WAL files done in <function>issue_xlog_fsync</function>.
 +   <varname>writes</varname> and <varname>write_time</varname>
 +   track the write activity of WAL files done in
 +   <function>XLogWrite</function>.
 +   See <xref linkend="wal-configuration"/> for more information.
++=======
+    For the <literal>wal</literal> <structfield>object</structfield>:
+    <itemizedlist>
+     <listitem>
+      <para>
+       <structfield>writes</structfield> is the number of times WAL buffers were
+        written out to disk via <function>XLogWrite</function> request (See <xref linkend="wal-configuration"/>
+        for more information about the internal WAL function <function>XLogWrite</function>).
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <structfield>fsyncs</structfield> is the number of times WAL files were
+        synced to disk via <function>issue_xlog_fsync</function> request (if <xref linkend="guc-fsync"/>
+        is <literal>on</literal> and <xref linkend="guc-wal-sync-method"/> is either
+        <literal>fdatasync</literal>, <literal>fsync</literal> or <literal>fsync_writethrough</literal>,
+        otherwise zero) (See <xref linkend="wal-configuration"/> for more information about
+        the internal WAL function <function>issue_xlog_fsync</function>).
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <structfield>write_time</structfield> is the total amount of time spent writing
+        WAL buffers to disk via <function>XLogWrite</function> request (if <xref linkend="guc-track-wal-io-timing"/>
+        is enabled, otherwise zero). This includes the sync time when <varname>wal_sync_method</varname>
+        is either <literal>open_datasync</literal> or <literal>open_sync</literal>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <structfield>sync_time</structfield> is the total amount of time spent syncing
+        WAL files to disk via <function>issue_xlog_fsync</function> request (if
+        <varname>track_wal_io_timing</varname> is enabled, <varname>fsync</varname> is
+        <literal>on</literal>, and <varname>wal_sync_method</varname> is either
+        <literal>fdatasync</literal>, <literal>fsync</literal> or <literal>fsync_writethrough</literal>,
+        otherwise zero).
+      </para>
+     </listitem>
+    </itemizedlist>
++>>>>>>> theirs
    </para>
  
    <para>
diff --cc doc/src/sgml/wal.sgml
index 52b5b8f793,bb4892413f..0000000000
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@@ -810,12 -810,11 +810,17 @@@
    <para>
     There are two internal functions to write WAL data to disk:
     <function>XLogWrite</function> and <function>issue_xlog_fsync</function>.
 -   When <xref linkend="guc-track-wal-io-timing"/> is enabled, the total
 +   When <xref linkend="guc-track-io-timing"/> is enabled, the total
     amounts of time <function>XLogWrite</function> writes and
     <function>issue_xlog_fsync</function> syncs WAL data to disk are counted as
++<<<<<<< ours
 +   <varname>write_time</varname> and <varname>fsync_time</varname> in
 +   <xref linkend="pg-stat-io-view"/> for the <varname>object</varname>
 +   <literal>wal</literal>, respectively.
++=======
+    <literal>write_time</literal> and <literal>sync_time</literal> in
+    <xref linkend="pg-stat-io-view"/> for the wal <literal>object</literal>, respectively.
++>>>>>>> theirs
     <function>XLogWrite</function> is normally called by
     <function>XLogInsertRecord</function> (when there is no space for the new
     record in WAL buffers), <function>XLogFlush</function> and the WAL writer,
@@@ -830,12 -829,12 +835,18 @@@
     <literal>fsync</literal>, or <literal>fsync_writethrough</literal>,
     the write operation moves WAL buffers to kernel cache and
     <function>issue_xlog_fsync</function> syncs them to disk. Regardless
 -   of the setting of <varname>track_wal_io_timing</varname>, the number
 +   of the setting of <varname>track_io_timing</varname>, the number
     of times <function>XLogWrite</function> writes and
     <function>issue_xlog_fsync</function> syncs WAL data to disk are also
++<<<<<<< ours
 +   counted as <varname>writes</varname> and <varname>fsyncs</varname>
 +   in <structname>pg_stat_io</structname> for the <varname>object</varname>
 +   <literal>wal</literal>, respectively.
++=======
+    counted as <literal>write</literal> and <literal>sync</literal>
+    in <structname>pg_stat_io</structname> for the <literal>wal</literal> object
+    respectively.
++>>>>>>> theirs
    </para>
  
    <para>