diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/memcache.conf-sample | 10 | ||||
| -rw-r--r-- | etc/object-server.conf-sample | 7 | ||||
| -rw-r--r-- | etc/proxy-server.conf-sample | 14 | ||||
| -rw-r--r-- | etc/swift-rsyslog.conf-sample | 5 |
4 files changed, 13 insertions, 23 deletions
diff --git a/etc/memcache.conf-sample b/etc/memcache.conf-sample index b375eb402..f85e49edc 100644 --- a/etc/memcache.conf-sample +++ b/etc/memcache.conf-sample @@ -5,16 +5,6 @@ # (IPv6 addresses must follow rfc3986 section-3.2.2, i.e. [::1]:11211) # memcache_servers = 127.0.0.1:11211 # -# Sets how memcache values are serialized and deserialized: -# 0 = older, insecure pickle serialization -# 1 = json serialization but pickles can still be read (still insecure) -# 2 = json serialization only (secure and the default) -# To avoid an instant full cache flush, existing installations should -# upgrade with 0, then set to 1 and reload, then after some time (24 hours) -# set to 2 and reload. -# In the future, the ability to use pickle serialization will be removed. -# memcache_serialization_support = 2 -# # Sets the maximum number of connections to each memcached server per worker # memcache_max_connections = 2 # diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample index 2c93e23fd..ee8e58104 100644 --- a/etc/object-server.conf-sample +++ b/etc/object-server.conf-sample @@ -297,6 +297,13 @@ use = egg:swift#recon # ring_check_interval = 15.0 # recon_cache_path = /var/cache/swift # +# By default, per-file rsync transfers are logged at debug if successful and +# error on failure. During large rebalances (which both increase the number +# of diskfiles transferred and increases the likelihood of failures), this +# can overwhelm log aggregation while providing little useful insights. +# Change this to false to disable per-file logging. +# log_rsync_transfers = true +# # limits how long rsync error log lines are # 0 means to log the entire line # rsync_error_log_line_length = 0 diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index ef49c430f..d0ec52b01 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -740,18 +740,6 @@ use = egg:swift#memcache # follow rfc3986 section-3.2.2, i.e. [::1]:11211) # memcache_servers = 127.0.0.1:11211 # -# Sets how memcache values are serialized and deserialized: -# 0 = older, insecure pickle serialization -# 1 = json serialization but pickles can still be read (still insecure) -# 2 = json serialization only (secure and the default) -# If not set here, the value for memcache_serialization_support will be read -# from /etc/swift/memcache.conf (see memcache.conf-sample). -# To avoid an instant full cache flush, existing installations should -# upgrade with 0, then set to 1 and reload, then after some time (24 hours) -# set to 2 and reload. -# In the future, the ability to use pickle serialization will be removed. -# memcache_serialization_support = 2 -# # Sets the maximum number of connections to each memcached server per worker # memcache_max_connections = 2 # @@ -944,7 +932,7 @@ use = egg:swift#tempurl # # The digest algorithm(s) supported for generating signatures; # whitespace-delimited. -# allowed_digests = sha1 sha256 sha512 +# allowed_digests = sha256 sha512 # Note: Put formpost just before your auth filter(s) in the pipeline [filter:formpost] diff --git a/etc/swift-rsyslog.conf-sample b/etc/swift-rsyslog.conf-sample index 7ded4ba25..4d9c2f3ea 100644 --- a/etc/swift-rsyslog.conf-sample +++ b/etc/swift-rsyslog.conf-sample @@ -25,10 +25,15 @@ if $programname contains 'proxy' then /var/log/swift/proxy.log #if $programname == 'container-updater' then /var/log/swift/container-updater.log #if $programname == 'container-auditor' then /var/log/swift/container-auditor.log #if $programname == 'container-sync' then /var/log/swift/container-sync.log +#if $programname == 'container-sharder' then /var/log/swift/container-sharder.log +#if $programname == 'container-reconciler' then /var/log/swift/container-reconciler.log #if $programname == 'object-server' then /var/log/swift/object-server.log #if $programname == 'object-replicator' then /var/log/swift/object-replicator.log #if $programname == 'object-updater' then /var/log/swift/object-updater.log #if $programname == 'object-auditor' then /var/log/swift/object-auditor.log +#if $programname == 'object-expirer' then /var/log/swift/object-expirer.log +#if $programname == 'object-reconstructor' then /var/log/swift/object-reconstructor.log +#if $programname == 'object-relinker' then /var/log/swift/object-relinker.log # Use the following to discard logs that don't match any of the above to avoid # them filling up /var/log/messages. |