From 146bb3ab1b90309e3719178f824a8ba8600b1335 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Fri, 5 Aug 2016 14:59:36 +0900 Subject: [PATCH] [config-ref] update Object Storage container server configuration * Split object expirer configuration into a separate file * Add description for no help options * Remove unnecessary RST markup backport: mitaka Change-Id: I1a6ab40d32222d3480c361ab76a25e640e77362e Partial-Bug: #1605040 --- .../source/object-storage.rst | 1 + .../source/object-storage/configure.rst | 26 ------------------- .../object-storage/container-server.rst | 26 +++++++++++++++++++ .../tables/swift-container-server-DEFAULT.rst | 8 +++--- ...-container-server-container-replicator.rst | 2 +- .../swift-container-server-container-sync.rst | 4 +-- ...ft-container-server-filter-healthcheck.rst | 4 +-- ...swift-container-server-filter-xprofile.rst | 14 +++++----- .../swift-container-server-pipeline-main.rst | 2 +- 9 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 doc/config-reference/source/object-storage/container-server.rst diff --git a/doc/config-reference/source/object-storage.rst b/doc/config-reference/source/object-storage.rst index cd86ccae0c..aa4ee9efed 100644 --- a/doc/config-reference/source/object-storage.rst +++ b/doc/config-reference/source/object-storage.rst @@ -9,6 +9,7 @@ Object Storage service object-storage/general-service-conf.rst object-storage/object-server.rst object-storage/object-expirer.rst + object-storage/container-server.rst object-storage/configure.rst object-storage/features.rst object-storage/configure-s3.rst diff --git a/doc/config-reference/source/object-storage/configure.rst b/doc/config-reference/source/object-storage/configure.rst index 62fd4ab2a1..7977776ba9 100644 --- a/doc/config-reference/source/object-storage/configure.rst +++ b/doc/config-reference/source/object-storage/configure.rst @@ -8,32 +8,6 @@ configurations. Default configuration options appear in the ``[DEFAULT]`` section. You can override the default values by setting values in the other sections. -Container server configuration -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Find an example container server configuration at -``etc/container-server.conf-sample`` in the source code repository. - -The available configuration options are: - -.. include:: ../tables/swift-container-server-DEFAULT.rst -.. include:: ../tables/swift-container-server-app-container-server.rst -.. include:: ../tables/swift-container-server-pipeline-main.rst -.. include:: ../tables/swift-container-server-container-replicator.rst -.. include:: ../tables/swift-container-server-container-updater.rst -.. include:: ../tables/swift-container-server-container-auditor.rst -.. include:: ../tables/swift-container-server-container-sync.rst -.. include:: ../tables/swift-container-server-filter-healthcheck.rst -.. include:: ../tables/swift-container-server-filter-recon.rst -.. include:: ../tables/swift-container-server-filter-xprofile.rst - -Sample container server configuration file ------------------------------------------- - -.. remote-code-block:: ini - - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/mitaka - Container sync realms configuration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/config-reference/source/object-storage/container-server.rst b/doc/config-reference/source/object-storage/container-server.rst new file mode 100644 index 0000000000..2d812b1efb --- /dev/null +++ b/doc/config-reference/source/object-storage/container-server.rst @@ -0,0 +1,26 @@ +============================== +Container server configuration +============================== + +Find an example container server configuration at +``etc/container-server.conf-sample`` in the source code repository. + +The available configuration options are: + +.. include:: ../tables/swift-container-server-DEFAULT.rst +.. include:: ../tables/swift-container-server-app-container-server.rst +.. include:: ../tables/swift-container-server-pipeline-main.rst +.. include:: ../tables/swift-container-server-container-replicator.rst +.. include:: ../tables/swift-container-server-container-updater.rst +.. include:: ../tables/swift-container-server-container-auditor.rst +.. include:: ../tables/swift-container-server-container-sync.rst +.. include:: ../tables/swift-container-server-filter-healthcheck.rst +.. include:: ../tables/swift-container-server-filter-recon.rst +.. include:: ../tables/swift-container-server-filter-xprofile.rst + +Sample container server configuration file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. remote-code-block:: ini + + https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/mitaka diff --git a/doc/config-reference/source/tables/swift-container-server-DEFAULT.rst b/doc/config-reference/source/tables/swift-container-server-DEFAULT.rst index 7dd0533745..e445e4d464 100644 --- a/doc/config-reference/source/tables/swift-container-server-DEFAULT.rst +++ b/doc/config-reference/source/tables/swift-container-server-DEFAULT.rst @@ -10,7 +10,7 @@ * - Configuration option = Default value - Description * - ``allowed_sync_hosts`` = ``127.0.0.1`` - - No help text available for this option. + - The list of hosts that are allowed to send syncs to. * - ``backlog`` = ``4096`` - Maximum number of allowed pending TCP connections * - ``bind_ip`` = ``0.0.0.0`` @@ -31,7 +31,7 @@ - You can set fallocate_reserve to the number of bytes you'd like fallocate to reserve, whether there is space for the given file size or not. This is useful for systems that behave badly when they completely run out of space; you can make the services pretend they're out of space early. server. For most cases, this should be * - ``log_address`` = ``/dev/log`` - Location where syslog sends the logs to - * - ``log_custom_handlers`` = `` `` + * - ``log_custom_handlers`` = - Comma-separated list of functions to call to setup custom log handlers. * - ``log_facility`` = ``LOG_LOCAL0`` - Syslog log facility @@ -45,13 +45,13 @@ - Defines the probability of sending a sample for any given event or timing measurement. * - ``log_statsd_host`` = ``localhost`` - If not set, the StatsD feature is disabled. - * - ``log_statsd_metric_prefix`` = `` `` + * - ``log_statsd_metric_prefix`` = - Value will be prepended to every metric sent to the StatsD server. * - ``log_statsd_port`` = ``8125`` - Port value for the StatsD server. * - ``log_statsd_sample_rate_factor`` = ``1.0`` - Not recommended to set this to a value less than 1.0, if frequency of logging is too high, tune the log_statsd_default_sample_rate instead. - * - ``log_udp_host`` = `` `` + * - ``log_udp_host`` = - If not set, the UDP receiver for syslog is disabled. * - ``log_udp_port`` = ``514`` - Port value for UDP receiver, if enabled. diff --git a/doc/config-reference/source/tables/swift-container-server-container-replicator.rst b/doc/config-reference/source/tables/swift-container-server-container-replicator.rst index 10981255d2..194ba874b9 100644 --- a/doc/config-reference/source/tables/swift-container-server-container-replicator.rst +++ b/doc/config-reference/source/tables/swift-container-server-container-replicator.rst @@ -34,7 +34,7 @@ * - ``recon_cache_path`` = ``/var/cache/swift`` - Directory where stats for a few items will be stored * - ``rsync_compress`` = ``no`` - - No help text available for this option. + - Allow rsync to compress data which is transmitted to destination node during sync. However, this is applicable only when destination node is in a different region than the local one. * - ``rsync_module`` = ``{replication_ip}::container`` - Format of the rsync module where the replicator will send data. The configuration value can include some variables that will be extracted from the ring. Variables must follow the format {NAME} where NAME is one of: ip, port, replication_ip, replication_port, region, zone, device, meta. See etc/rsyncd.conf-sample for some examples. uses what's set here, or what's set in the DEFAULT section, or 10 (though other sections use 3 as the final default). * - ``run_pause`` = ``30`` diff --git a/doc/config-reference/source/tables/swift-container-server-container-sync.rst b/doc/config-reference/source/tables/swift-container-server-container-sync.rst index 0067f846a0..81649fbd90 100644 --- a/doc/config-reference/source/tables/swift-container-server-container-sync.rst +++ b/doc/config-reference/source/tables/swift-container-server-container-sync.rst @@ -14,7 +14,7 @@ * - ``container_time`` = ``60`` - Maximum amount of time to spend syncing each container * - ``internal_client_conf_path`` = ``/etc/swift/internal-client.conf`` - - No help text available for this option. + - Internal client config file path * - ``interval`` = ``300`` - Minimum time for a pass to take * - ``log_address`` = ``/dev/log`` @@ -26,6 +26,6 @@ * - ``log_name`` = ``container-sync`` - Label used when logging * - ``request_tries`` = ``3`` - - No help text available for this option. + - Server errors from requests will be retried by default * - ``sync_proxy`` = ``http://10.1.1.1:8888,http://10.1.1.2:8888`` - If you need to use an HTTP proxy, set it here. Defaults to no proxy. diff --git a/doc/config-reference/source/tables/swift-container-server-filter-healthcheck.rst b/doc/config-reference/source/tables/swift-container-server-filter-healthcheck.rst index e02016f59c..b15ad6db69 100644 --- a/doc/config-reference/source/tables/swift-container-server-filter-healthcheck.rst +++ b/doc/config-reference/source/tables/swift-container-server-filter-healthcheck.rst @@ -9,7 +9,7 @@ * - Configuration option = Default value - Description - * - ``disable_path`` = `` `` - - No help text available for this option. + * - ``disable_path`` = + - An optional filesystem path, which if present, will cause the healthcheck URL to return "503 Service Unavailable" with a body of "DISABLED BY FILE" * - ``use`` = ``egg:swift#healthcheck`` - Entry point of paste.deploy in the server diff --git a/doc/config-reference/source/tables/swift-container-server-filter-xprofile.rst b/doc/config-reference/source/tables/swift-container-server-filter-xprofile.rst index c38cfc1320..f2d4e93137 100644 --- a/doc/config-reference/source/tables/swift-container-server-filter-xprofile.rst +++ b/doc/config-reference/source/tables/swift-container-server-filter-xprofile.rst @@ -10,18 +10,18 @@ * - Configuration option = Default value - Description * - ``dump_interval`` = ``5.0`` - - No help text available for this option. + - the profile data will be dumped to local disk based on above naming rule in this interval (seconds). * - ``dump_timestamp`` = ``false`` - - No help text available for this option. + - Be careful, this option will enable the profiler to dump data into the file with a time stamp which means that there will be lots of files piled up in the directory. * - ``flush_at_shutdown`` = ``false`` - - No help text available for this option. + - Clears the data when the wsgi server shutdowns. * - ``log_filename_prefix`` = ``/tmp/log/swift/profile/default.profile`` - - No help text available for this option. + - This prefix is used to combine the process ID and timestamp to name the profile data file. Make sure the executing user has permission to write into this path. Any missing path segments will be created, if necessary. When you enable profiling in more than one type of daemon, you must override it with a unique value like: /var/log/swift/profile/object.profile * - ``path`` = ``/__profile__`` - - No help text available for this option. + - This is the path of the URL to access the mini web UI. * - ``profile_module`` = ``eventlet.green.profile`` - - No help text available for this option. + - This option enables you to switch profilers which inherit from the Python standard profiler. Currently, the supported value can be 'cProfile', 'eventlet.green.profile', etc. * - ``unwind`` = ``false`` - - No help text available for this option. + - unwind the iterator of applications * - ``use`` = ``egg:swift#xprofile`` - Entry point of paste.deploy in the server diff --git a/doc/config-reference/source/tables/swift-container-server-pipeline-main.rst b/doc/config-reference/source/tables/swift-container-server-pipeline-main.rst index aeafebba4a..0fdf20e9b4 100644 --- a/doc/config-reference/source/tables/swift-container-server-pipeline-main.rst +++ b/doc/config-reference/source/tables/swift-container-server-pipeline-main.rst @@ -10,4 +10,4 @@ * - Configuration option = Default value - Description * - ``pipeline`` = ``healthcheck recon container-server`` - - No help text available for this option. + - Pipeline to use for processing operations.