@@ -541,15 +541,15 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
541541 <firstterm>skipped</firstterm>.
542542 </para>
543543 <para>
544- When the <option>--max-tries</option> option is used, the transaction with
545- serialization or deadlock error cannot be retried if the total time of
546- all its tries is greater than <replaceable>limit</replaceable> ms. To
547- limit only the time of tries and not their number, use
548- <literal>--max-tries=0</literal>. By default option
549- <option>--max-tries</option> is set to 1 and transactions with
550- serialization/deadlock errors are not retried. See <xref
551- linkend="failures-and-retries"/> for more information about retrying
552- such transactions.
544+ When the <option>--max-tries</option> option is used, a transaction
545+ which fails due to a serialization anomaly or from a deadlock will not
546+ be retried if the total time of all its tries is greater than
547+ <replaceable> limit</replaceable> ms. To limit only the time of tries
548+ and not their number, use <literal>--max-tries=0</literal>. By
549+ default, the option <option>--max-tries</option> is set to 1 and
550+ transactions with serialization/deadlock errors are not retried. See
551+ <xref linkend="failures-and-retries"/> for more information about
552+ retrying such transactions.
553553 </para>
554554 </listitem>
555555 </varlistentry>
@@ -622,7 +622,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
622622 throttling (<option>-R</option>), the latency is computed with respect
623623 to the transaction scheduled start time, not the actual transaction
624624 beginning time, thus it also includes the average schedule lag time.
625- When <option>--max-tries</option> is used to enable transactions retries
625+ When <option>--max-tries</option> is used to enable transaction retries
626626 after serialization/deadlock errors, the report includes the number of
627627 retried transactions and the sum of all retries.
628628 </para>
@@ -818,7 +818,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
818818 <listitem>
819819 <para>
820820 Print messages about all errors and failures (errors without retrying)
821- including which limit for retries was violated and how far it was
821+ including which limit for retries was exceeded and how far it was
822822 exceeded for the serialization/deadlock failures. (Note that in this
823823 case the output can be significantly increased.).
824824 See <xref linkend="failures-and-retries"/> for more information.
@@ -2433,7 +2433,7 @@ END;
24332433 </para>
24342434
24352435 <para>
2436- If <option>--failures-detailed</option> option is used, the type of
2436+ If the <option>--failures-detailed</option> option is used, the type of
24372437 failure is reported in the <replaceable>time</replaceable> like this:
24382438<screen>
243924393 0 47423 0 1499414498 34501 3
@@ -2773,12 +2773,12 @@ statement latencies in milliseconds, failures and retries:
27732773 <listitem>
27742774 <para>
27752775 Errors of the main program. They are the most serious and always result
2776- in an immediate exit from the <application>pgbench</application> with
2777- the corresponding error message. They include:
2776+ in an immediate exit from <application>pgbench</application> with the
2777+ corresponding error message. They include:
27782778 <itemizedlist>
27792779 <listitem>
27802780 <para>
2781- errors at the beginning of the <application>pgbench</application>
2781+ errors at the beginning of <application>pgbench</application>
27822782 (e.g. an invalid option value);
27832783 </para>
27842784 </listitem>
@@ -2790,8 +2790,8 @@ statement latencies in milliseconds, failures and retries:
27902790 </listitem>
27912791 <listitem>
27922792 <para>
2793- errors before starting threads (e.g. we could not connect to the
2794- database server / the syntax error in the meta command / thread
2793+ errors before starting threads (e.g. could not connect to the
2794+ database server, syntax error in the meta command, thread
27952795 creation failure);
27962796 </para>
27972797 </listitem>
@@ -2813,7 +2813,7 @@ statement latencies in milliseconds, failures and retries:
28132813 </listitem>
28142814 <listitem>
28152815 <para>
2816- Direct client errors. They lead to immediate exit from the
2816+ Direct client errors. They lead to immediate exit from
28172817 <application>pgbench</application> with the corresponding error message
28182818 only in the case of an internal <application>pgbench</application>
28192819 error (which are supposed to never occur...). Otherwise in the worst
@@ -2829,11 +2829,11 @@ statement latencies in milliseconds, failures and retries:
28292829 </para>
28302830
28312831 <para>
2832- Client 's run is aborted in case of a serious error, for example, the
2833- connection with the database server was lost or the end of script reached
2834- without completing the last transaction. In addition, if an execution of SQL
2832+ A client 's run is aborted in case of a serious error; for example, the
2833+ connection with the database server was lost or the end of script was reached
2834+ without completing the last transaction. In addition, if execution of an SQL
28352835 or meta command fails for reasons other than serialization or deadlock errors,
2836- the client is aborted. Otherwise, if an SQL fails with serialization or
2836+ the client is aborted. Otherwise, if an SQL command fails with serialization or
28372837 deadlock errors, the client is not aborted. In such cases, the current
28382838 transaction is rolled back, which also includes setting the client variables
28392839 as they were before the run of this transaction (it is assumed that one
@@ -2845,21 +2845,21 @@ statement latencies in milliseconds, failures and retries:
28452845 time of retries (specified by the <option>--latency-limit</option> option) / the end
28462846 of benchmark (specified by the <option>--time</option> option). If
28472847 the last trial run fails, this transaction will be reported as failed but
2848- the client is not aborted and continue to work.
2848+ the client is not aborted and continues to work.
28492849 </para>
28502850
28512851 <note>
28522852 <para>
2853- Without specifying the <option>--max-tries</option> option a transaction will
2853+ Without specifying the <option>--max-tries</option> option, a transaction will
28542854 never be retried after a serialization or deadlock error because its default
2855- values is 1. Use an unlimited number of tries (<literal>--max-tries=0</literal>)
2855+ value is 1. Use an unlimited number of tries (<literal>--max-tries=0</literal>)
28562856 and the <option>--latency-limit</option> option to limit only the maximum time
28572857 of tries. You can also use the <option>--time</option> option to limit the
28582858 benchmark duration under an unlimited number of tries.
28592859 </para>
28602860 <para>
28612861 Be careful when repeating scripts that contain multiple transactions: the
2862- script is always retried completely, so the successful transactions can be
2862+ script is always retried completely, so successful transactions can be
28632863 performed several times.
28642864 </para>
28652865 <para>
@@ -2879,7 +2879,7 @@ statement latencies in milliseconds, failures and retries:
28792879 <para>
28802880 The main report contains the number of failed transactions. If the
28812881 <option>--max-tries</option> option is not equal to 1, the main report also
2882- contains the statistics related to retries: the total number of retried
2882+ contains statistics related to retries: the total number of retried
28832883 transactions and total number of retries. The per-script report inherits all
28842884 these fields from the main report. The per-statement report displays retry
28852885 statistics only if the <option>--max-tries</option> option is not equal to 1.
@@ -2890,7 +2890,7 @@ statement latencies in milliseconds, failures and retries:
28902890 aggregation logs, as well as in the main and per-script reports, use the
28912891 <option>--failures-detailed</option> option. If you also want to distinguish
28922892 all errors and failures (errors without retrying) by type including which
2893- limit for retries was violated and how far it was exceeded for the
2893+ limit for retries was exceeded and how much it was exceeded by for the
28942894 serialization/deadlock failures, use the <option>--verbose-errors</option>
28952895 option.
28962896 </para>
0 commit comments