Add request_tries option to object-expirer.conf-sample

...and update the object-expirer man page.

Change-Id: Idca1b8e3b7d5b40481af0d60477510e2557b88c0

doc/manpages/object-expirer.conf.5

@@ -194,12 +194,10 @@ This is normally \fBegg:swift#proxy_logging\fR. See proxy-server.conf-sample for
 .PD
 
 
-.SH ADDITIONAL SECTIONS
+.SH OBJECT EXPIRER SECTION
 .PD 1
 .RS 0
-The following sections are used by other swift-account services, such as replicator,
+.IP "\fB[object-expirer]\fR"
-auditor and reaper.
-.IP "\fB[account-replicator]\fR"
 .RE
 .RS 3
 .IP \fBinterval\fR
@@ -210,6 +208,9 @@ The default is ".".
 The default is 'expiring_objects'.
 .IP \fBreport_interval\fR
 The default is 300 seconds.
+.IP \fBrequest_tries\fR
+The number of times the expirer's internal client will
+attempt any given request in the event of failure. The default is 3.
 .IP \fBconcurrency\fR
 Number of expirer workers to spawn. The default is 1.
 .IP \fBprocesses\fR
@@ -227,6 +228,21 @@ up to reclaim_age seconds before it gives up and deletes the entry in the
 queue. The default is 604800 seconds.
 .IP \fBrecon_cache_path\fR
 Path to recon cache directory. The default is /var/cache/swift.
+.IP \fBnice_priority\fR
+Modify scheduling priority of server processes. Niceness values range from -20
+(most favorable to the process) to 19 (least favorable to the process).
+The default does not modify priority.
+.IP \fBionice_class\fR
+Modify I/O scheduling class of server processes. I/O niceness class values
+are IOPRIO_CLASS_RT (realtime), IOPRIO_CLASS_BE (best-effort) and IOPRIO_CLASS_IDLE (idle).
+The default does not modify class and priority.
+Work only with ionice_priority.
+.IP \fBionice_priority\fR
+Modify I/O scheduling priority of server processes. I/O niceness priority
+is a number which goes from 0 to 7. The higher the value, the lower
+the I/O priority of the process. Work only with ionice_class.
+Ignored if IOPRIO_CLASS_IDLE is set.
+
 .RE
 .PD
 

etc/object-expirer.conf-sample

@@ -42,25 +42,34 @@
 # auto_create_account_prefix = .
 # expiring_objects_account_name = expiring_objects
 # report_interval = 300
-# concurrency is the level of concurrency o use to do the work, this value
+#
+# request_tries is the number of times the expirer's internal client will
+# attempt any given request in the event of failure. The default is 3.
+# request_tries = 3
+
+# concurrency is the level of concurrency to use to do the work, this value
 # must be set to at least 1
 # concurrency = 1
+#
 # processes is how many parts to divide the work into, one part per process
-#   that will be doing the work
+# that will be doing the work
 # processes set 0 means that a single process will be doing all the work
 # processes can also be specified on the command line and will override the
-#   config value
+# config value
 # processes = 0
+#
 # process is which of the parts a particular process will work on
 # process can also be specified on the command line and will override the config
-#   value
+# value
 # process is "zero based", if you want to use 3 processes, you should run
-#  processes with process set to 0, 1, and 2
+# processes with process set to 0, 1, and 2
 # process = 0
+#
 # The expirer will re-attempt expiring if the source object is not available
 # up to reclaim_age seconds before it gives up and deletes the entry in the
 # queue.
 # reclaim_age = 604800
+#
 # recon_cache_path = /var/cache/swift
 #
 # You can set scheduling priority of processes. Niceness values range from -20
@@ -74,6 +83,11 @@
 # ionice_class =
 # ionice_priority =
 
+#
+# The following sections define the configuration of the expirer's internal
+# client pipeline
+#
+
 [pipeline:main]
 pipeline = catch_errors proxy-logging cache proxy-server