From cc0868ea41576c034bde9a30bfa16d9ab5006d8a Mon Sep 17 00:00:00 2001
From: pcherenkov <pcherenkov@gmail.com>
Date: Thu, 3 May 2012 15:48:26 +0400
Subject: [PATCH] bug988508: wal_mode documented
---
doc/user/configuration-reference.xml | 16 ++++++++++++
doc/user/persistence-architecture.xml | 37 +++------------------------
2 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index 4bbb6a7977..fe6b555b54 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -547,6 +547,22 @@ tarantool_box: primary@sessions pri:33013 sec:33014 adm:33015</programlisting>
recovery.</entry>
</row>
+ <row>
+ <entry xml:id="wal_mode" xreflabel="wal_mode">wal_mode</entry>
+ <entry>string</entry>
+ <entry>"fsync_delay"</entry>
+ <entry>no</entry>
+ <entry>yes</entry>
+ <entry>Specify fiber-WAL-disk synchronization mode as:
+ <emphasis>write:</emphasis> fibers wait for their data to
+ be written to WAL (no fsync(2)); <emphasis>fsync</emphasis>:
+ fibers wait for their data, fsync(2) follows each write(2);
+ <emphasis>fsync_delay</emphasis>: fibers wait for their
+ data, fsync(2) is called every N=<emphasis>wal_fsync_delay</emphasis>
+ seconds (N=0.0 means no fsync(2) - equivalent to
+ <emphasis>wal_mode = "write"</emphasis>);</entry>
+ </row>
+
</tbody>
</tgroup>
</table>
diff --git a/doc/user/persistence-architecture.xml b/doc/user/persistence-architecture.xml
index d9f51dd494..e1c3aa7377 100644
--- a/doc/user/persistence-architecture.xml
+++ b/doc/user/persistence-architecture.xml
@@ -70,42 +70,11 @@ by disk load.
</para>
<para>
-WAL writer ensures data consistency and synchronization
-between requesting fibers, WAL writer and disk by
-employing one the following modes of operation (designated by
-<emphasis>wal_mode</emphasis> and
-<emphasis>wal_fsync_delay</emphasis> configuration keys):
-<orderedlist>
- <listitem><para><emphasis>write</emphasis>: fibers wait for their
- data to be written to the log (no fsync(2));</para></listitem>
- <listitem><para><emphasis>fsync</emphasis>: fibers wait for their
- data, fsync(2) follows each write(2);</para></listitem>
- <listitem><para><emphasis>fsync_delay</emphasis>: fibers wait for their
- data, fsync every N=<emphasis>wal_fsync_delay</emphasis>
- seconds (N=0.0 means no fsync(2) - equivalent to
- <emphasis>wal_mode = "write"</emphasis>);</para></listitem>
-</orderedlist>
+WAL writer employs a number of modes for synchronization between
+requesting fibers, WAL writer and disk hardware, as defined
+in configuration for <olink targetptr="wal_mode"/>.
</para>
-<!--
-<para>
-WAL writer ensures data consistency and synchronization
-between requesting fibers, WAL writer and disk by
-employing one the following modes of operation (designated by
-<emphasis>wal_mode</emphasis> and
-<emphasis>wal_fsync_delay</emphasis> configuration keys):
-<orderedlist>
- <listitem><emphasis>write</emphasis>: fibers wait for their
- data to be written to the log (no fsync(2));</listitem>
- <listitem><emphasis>fsync</emphasis>: fibers wait for their
- data, fsync(2) follows each write(2);</listitem>
- <listitem><emphasis>fsync_delay</emphasis>: fibers wait for their
- data, fsync every N=<emphasis>wal_fsync_delay</emphasis>
- seconds (N=0.0 means no fsync(2) - equivalent to
- <emphasis>wal_mode = "write"</emphasis>);</listitem>
-</orderedlist>
-</para>
--->
</section>
<!--
--
GitLab