openstack/swift
Code Issues Proposed changes

Merge "Make .expiring_objects account name configurable"

Browse Source
This commit is contained in:
Jenkins 2014-02-06 18:23:17 +00:00 committed by Gerrit Code Review
commit 6d37e10844
6 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/object-expirer.conf-sample
View File

@ -26,6 +26,7 @@
[object-expirer] [object-expirer]
# interval = 300 # interval = 300
# auto_create_account_prefix = . # auto_create_account_prefix = .
# expiring_objects_account_name = expiring_objects
# report_interval = 300 # report_interval = 300
# concurrency is the level of concurrency o use to do the work, this value # concurrency is the level of concurrency o use to do the work, this value
# must be set to at least 1 # must be set to at least 1

1
etc/object-server.conf-sample
View File

@ -9,6 +9,7 @@
# mount_check = true # mount_check = true
# disable_fallocate = false # disable_fallocate = false
# expiring_objects_container_divisor = 86400 # expiring_objects_container_divisor = 86400
# expiring_objects_account_name = expiring_objects
# #
# Use an integer to override the number of pre-forked processes that will # Use an integer to override the number of pre-forked processes that will
# accept connections. # accept connections.

1
etc/proxy-server.conf-sample
View File

@ -33,6 +33,7 @@
# key_file = /etc/swift/proxy.key # key_file = /etc/swift/proxy.key
# #
# expiring_objects_container_divisor = 86400 # expiring_objects_container_divisor = 86400
# expiring_objects_account_name = expiring_objects
# #
# You can specify default log routing here if you want: # You can specify default log routing here if you want:
# log_name = swift # log_name = swift

2
swift/obj/expirer.py
View File

@ -44,7 +44,7 @@ class ObjectExpirer(Daemon):
self.interval = int(conf.get('interval') or 300) self.interval = int(conf.get('interval') or 300)
self.expiring_objects_account = \ self.expiring_objects_account = \
(conf.get('auto_create_account_prefix') or '.') + \ (conf.get('auto_create_account_prefix') or '.') + \
'expiring_objects' (conf.get('expiring_objects_account_name') or 'expiring_objects')
conf_path = conf.get('__file__') or '/etc/swift/object-expirer.conf' conf_path = conf.get('__file__') or '/etc/swift/object-expirer.conf'
request_tries = int(conf.get('request_tries') or 3) request_tries = int(conf.get('request_tries') or 3)
self.swift = InternalClient(conf_path, self.swift = InternalClient(conf_path,

2
swift/obj/server.py
View File

@ -92,7 +92,7 @@ class ObjectController(object):
self.allowed_headers.add(header) self.allowed_headers.add(header)
self.expiring_objects_account = \ self.expiring_objects_account = \
(conf.get('auto_create_account_prefix') or '.') + \ (conf.get('auto_create_account_prefix') or '.') + \
'expiring_objects' (conf.get('expiring_objects_account_name') or 'expiring_objects')
self.expiring_objects_container_divisor = \ self.expiring_objects_container_divisor = \
int(conf.get('expiring_objects_container_divisor') or 86400) int(conf.get('expiring_objects_container_divisor') or 86400)
# Initialization was successful, so now apply the network chunk size # Initialization was successful, so now apply the network chunk size

2
swift/proxy/server.py
View File

@ -109,7 +109,7 @@ class Application(object):
config_true_value(conf.get('account_autocreate', 'no')) config_true_value(conf.get('account_autocreate', 'no'))
self.expiring_objects_account = \ self.expiring_objects_account = \
(conf.get('auto_create_account_prefix') or '.') + \ (conf.get('auto_create_account_prefix') or '.') + \
'expiring_objects' (conf.get('expiring_objects_account_name') or 'expiring_objects')
self.expiring_objects_container_divisor = \ self.expiring_objects_container_divisor = \
int(conf.get('expiring_objects_container_divisor') or 86400) int(conf.get('expiring_objects_container_divisor') or 86400)
self.max_containers_per_account = \ self.max_containers_per_account = \