9d4e67e741
The code changes are basically:
* Apply refactoring in the DiskFile class to use the new DiskWriter
abstraction
* Move and rename our diskfile module to match upstream
* ThreadPools allow us to remove the tpool usage around fsync
* Update the Ring subclass to support the get_part() method
* Update to use the 1.9.1 proxy server unit tests
* Move the DebugLogger class to test.unit
* Rebuild the Rings to use the new layout
* Remove backup ring builder files
* Update spec files to 1.9.1, and tox to use swift 1.9.1
* Updated version to 1.9.0-0
Change-Id: Ica12cac8b351627d67500723f1dbd8a54d45f7c8
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5331
72 lines
2.8 KiB
Python
72 lines
2.8 KiB
Python
# Copyright (c) 2012-2013 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
""" Object Server for Gluster for Swift """
|
|
|
|
# Simply importing this monkey patches the constraint handling to fit our
|
|
# needs
|
|
import gluster.swift.common.constraints # noqa
|
|
|
|
from swift.obj import server
|
|
|
|
from gluster.swift.obj.diskfile import DiskFile
|
|
|
|
|
|
class ObjectController(server.ObjectController):
|
|
"""
|
|
Subclass of the object server's ObjectController which replaces the
|
|
container_update method with one that is a no-op (information is simply
|
|
stored on disk and already updated by virtue of performing the file system
|
|
operations directly).
|
|
"""
|
|
|
|
def _diskfile(self, device, partition, account, container, obj, **kwargs):
|
|
"""Utility method for instantiating a DiskFile."""
|
|
kwargs.setdefault('mount_check', self.mount_check)
|
|
kwargs.setdefault('bytes_per_sync', self.bytes_per_sync)
|
|
kwargs.setdefault('disk_chunk_size', self.disk_chunk_size)
|
|
kwargs.setdefault('threadpool', self.threadpools[device])
|
|
kwargs.setdefault('obj_dir', server.DATADIR)
|
|
kwargs.setdefault('disallowed_metadata_keys',
|
|
server.DISALLOWED_HEADERS)
|
|
return DiskFile(self.devices, device, partition, account,
|
|
container, obj, self.logger, **kwargs)
|
|
|
|
def container_update(self, op, account, container, obj, request,
|
|
headers_out, objdevice):
|
|
"""
|
|
Update the container when objects are updated.
|
|
|
|
For Gluster, this is just a no-op, since a container is just the
|
|
directory holding all the objects (sub-directory hierarchy of files).
|
|
|
|
:param op: operation performed (ex: 'PUT', or 'DELETE')
|
|
:param account: account name for the object
|
|
:param container: container name for the object
|
|
:param obj: object name
|
|
:param request: the original request object driving the update
|
|
:param headers_out: dictionary of headers to send in the container
|
|
request(s)
|
|
:param objdevice: device name that the object is in
|
|
"""
|
|
return
|
|
|
|
|
|
def app_factory(global_conf, **local_conf):
|
|
"""paste.deploy app factory for creating WSGI object server apps"""
|
|
conf = global_conf.copy()
|
|
conf.update(local_conf)
|
|
return ObjectController(conf)
|