openstack/openstack-manuals
Code Issues Proposed changes

Purge dead file-backed scrubber queue code

Browse Source 
message:
remove the scrubber_datadir, cleanup_scrubber, and
cleanup_scrubber_time options.

Change-Id: I1ff2106ecb544f8a86365bc874b980ae663f21e2
Closes-Bug: #1474604
This commit is contained in:
Danny 2015-07-23 10:57:56 +08:00 committed by dannyh
parent d4b0e3f012
commit 1298204e8e
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/common/tables/glance-imagecache.xml
View File

@ -17,14 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
<td><option>cleanup_scrubber</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. A boolean that determines if the scrubber should clean up the files it uses for taking data. Only one server in your deployment should be designated the cleanup host.</td>
</tr>
<tr>
<td><option>cleanup_scrubber_time</option> = <replaceable>86400</replaceable></td>
<td>(IntOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. Items must have a modified time that is older than this value in order to be candidates for cleanup.</td>
</tr>
<tr>
<td><option>delayed_delete</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Turn on/off delayed delete.</td>
@ -53,10 +45,6 @@
<td><option>scrub_time</option> = <replaceable>0</replaceable></td>
<td>(IntOpt) The amount of time in seconds to delay before performing a delete.</td>
</tr>
<tr>
<td><option>scrubber_datadir</option> = <replaceable>/var/lib/glance/scrubber</replaceable></td>
<td>(StrOpt) Directory that the scrubber will use to track information about what to delete. Make sure this is set in glance-api.conf and glance-scrubber.conf.</td>
</tr>
</tbody>
</table>
</para>

10
doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
View File

@ -48,16 +48,8 @@
</section>
<section xml:id="section_glance-scrubber.conf">
<title>glance-scrubber.conf</title>
<para><command>glance-scrubber</command> is a utility for the Image service that cleans
up images that have been deleted; its configuration is stored in the
<para><command>glance-scrubber</command> is a utility for the Image service that cleans up images that have been deleted; its configuration is stored in the
<filename>glance-scrubber.conf</filename> file.</para>
<para>Multiple instances of <systemitem>glance-scrubber</systemitem> can be run in a single
deployment, but only one of them can be designated as the
<systemitem>cleanup_scrubber</systemitem> in the
<filename>glance-scrubber.conf</filename> file. The
<systemitem>cleanup_scrubber</systemitem> coordinates other
<systemitem>glance-scrubber</systemitem> instances by maintaining the master queue
of images that need to be removed.</para>
<programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></programlisting>
</section>
<section xml:id="section_glance-policy.json">

3
tools/autogenerate-config-flagmappings/glance.flagmappings
View File

@ -17,8 +17,6 @@ bind_port common
ca_file ca
cert_file ca
chunksize replicator
cleanup_scrubber imagecache
cleanup_scrubber_time imagecache
client_socket_timeout api
command replicator
control_exchange amqp
@ -104,7 +102,6 @@ rpc_zmq_matchmaker zeromq
rpc_zmq_port zeromq
rpc_zmq_topic_backlog zeromq
scrub_time imagecache
scrubber_datadir imagecache
send_identity_headers api
show_image_direct_url common
show_multiple_locations api