Clarifying swift memcache configuration docs

fixes bug 994338

There was previously no reference to the fact that memcache_servers
could be in a separate config file, and the filter:cache section
of configuration options was missing from the proxy config section

Patchset 2 indicates what changed in the bk (book) file in the
revision history table.

Change-Id: I07b9d5e4b5ee0eca867e4bc645728ab637c8d5b6
This commit is contained in:
Tom Fifield
2012-08-19 12:51:47 +10:00
committed by annegentle
parent a5b15d6ef6
commit cb02b10b31
3 changed files with 68 additions and 7 deletions

View File

@@ -229,14 +229,16 @@ EOF
</screen>
</listitem>
</orderedlist>
<para>
..note:
</para>
<screen>
<note><title>Note</title><para>
If you run multiple memcache servers, put the multiple IP:port listings
in the [filter:cache] section of the proxy-server.conf file like:
`10.1.2.3:11211,10.1.2.4:11211`. Only the proxy server uses memcache.
</screen>
</para></note>
<note><title>Note</title><para>
The memcache_servers variable can also be set in a separate file:
/etc/swift/memcache.conf. If it is set there, it will override
the value in proxy-server.conf
</para></note>
<orderedlist>
<listitem>
<para>

View File

@@ -26,7 +26,7 @@
</copyright>
<releaseinfo>trunk</releaseinfo>
<productname>OpenStack Object Storage</productname>
<pubdate>2012-06-05</pubdate>
<pubdate>2012-08-21</pubdate>
<legalnotice role="apache2">
<annotation>
<remark>Copyright details are filled in by the template.</remark>
@@ -38,6 +38,24 @@
managing, and understanding the software that runs OpenStack Object Storage. </para>
</abstract>
<revhistory>
<revision>
<date>2012-08-21</date>
<revdescription>
<itemizedlist spacing="compact">
<listitem>
<para>Add note to the [filter:cache]
section of the proxy-server.conf file
reference indicating that the
memcache_servers value is ignored if
it is specified in
/etc/swift/memcache.conf.</para>
</listitem>
<listitem>
<para>Update Cyberduck tutorial.</para>
</listitem>
</itemizedlist>
</revdescription>
</revision>
<revision>
<date>2012-06-05</date>
<revdescription>

View File

@@ -1158,7 +1158,9 @@ can be overridden in any of the other sections.</para>
<tr>
<td>memcache_servers</td>
<td>127.0.0.1:11211</td>
<td>Comma separated list of memcached servers ip:port</td>
<td>Comma separated list of memcached servers ip:port. Note: the value
in proxy-server.conf will be ignored if it is specified in
/etc/swift/memcache.conf</td>
</tr>
<tr>
<td>node_timeout</td>
@@ -1264,6 +1266,45 @@ can be overridden in any of the other sections.</para>
</tr>
</tbody>
</table>
<table rules="all">
<caption>proxy-server.conf Server Options in the [filter:cache] section</caption>
<tbody>
<tr>
<td>Option</td>
<td>Default</td>
<td>Description</td>
</tr>
<tr>
<td>log_name</td>
<td>cache</td>
<td>Label used when logging</td>
</tr>
<tr>
<td>log_facility</td>
<td>LOG_LOCAL0</td>
<td>Syslog log facility</td>
</tr>
<tr>
<td>log_level</td>
<td>INFO</td>
<td>Log level</td>
</tr>
<tr>
<td>log_headers</td>
<td>False</td>
<td>If True, log headers in each request</td>
</tr>
<tr>
<td>memcache_servers</td>
<td>127.0.0.1:11211</td>
<td>Comma separated list of memcached servers ip:port. Note: the value
in proxy-server.conf will be ignored if it is specified in
/etc/swift/memcache.conf</td>
</tr>
</tbody>
</table>
</section>
</section>
<section xml:id="considerations-and-tuning">