ba39ade716
This commit only removes code that is not required when swiftonfile will be used as Storage Policy in Swift. This commit does NOT: * include code changes to support SP * fix functional tests * update documentation related to SP This commit removes the following: * Gen builders script and its man page. * Authentication guide, user guide and other docs. * Swiftkerbauth code, unit tests, func tests and doc. * gswauth code, unit tests, func tests and doc. * Object expirer code modifications, unit tests and doc. * Conf files of account, container, proxy. * Account, container and proxy server code - server.py of each. * Account, container and proxy unit and functional tests. * DiskDir class and corresponding unit tests. * Our overridden ring.py (enforces account = volume = device) and tests. * Functional tests for authentication filters. * modules/swift and test/deploy directories. * Proxy base controllers unit tests. NOTE: We may have to reintroduce some of the above functional and unit tests after SP related code changes - during fixing functional tests. This commit modifies: * setup.py to reflect the above code removals. * constraints.py to remove references to ring.py * object server.py to remove object-expirer changes * tox.ini to remove ksfunctest and swfunctest Signed-off-by: Prashanth Pai <ppai@redhat.com>
90 lines
3.2 KiB
Python
90 lines
3.2 KiB
Python
# Copyright (c) 2012-2014 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.common.swob import HTTPConflict
|
|
from swift.common.utils import public, timing_stats
|
|
from gluster.swift.common.exceptions import AlreadyExistsAsFile, \
|
|
AlreadyExistsAsDir
|
|
from swift.common.request_helpers import split_and_validate_path
|
|
|
|
from swift.obj import server
|
|
|
|
from gluster.swift.obj.diskfile import OnDiskManager
|
|
|
|
|
|
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 setup(self, conf):
|
|
"""
|
|
Implementation specific setup. This method is called at the very end
|
|
by the constructor to allow a specific implementation to modify
|
|
existing attributes or add its own attributes.
|
|
|
|
:param conf: WSGI configuration parameter
|
|
"""
|
|
# Common on-disk hierarchy shared across account, container and object
|
|
# servers.
|
|
self._ondisk_mgr = OnDiskManager(conf, self.logger)
|
|
self.swift_dir = conf.get('swift_dir', '/etc/swift')
|
|
|
|
def get_diskfile(self, device, partition, account, container, obj,
|
|
**kwargs):
|
|
"""
|
|
Utility method for instantiating a DiskFile object supporting a given
|
|
REST API.
|
|
|
|
An implementation of the object server that wants to use a different
|
|
DiskFile class would simply over-ride this method to provide that
|
|
behavior.
|
|
"""
|
|
return self._ondisk_mgr.get_diskfile(device, account, container, obj,
|
|
**kwargs)
|
|
|
|
def container_update(self, *args, **kwargs):
|
|
"""
|
|
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).
|
|
"""
|
|
return
|
|
|
|
@public
|
|
@timing_stats()
|
|
def PUT(self, request):
|
|
try:
|
|
return server.ObjectController.PUT(self, request)
|
|
except (AlreadyExistsAsFile, AlreadyExistsAsDir):
|
|
device = \
|
|
split_and_validate_path(request, 1, 5, True)
|
|
return HTTPConflict(drive=device, request=request)
|
|
|
|
|
|
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)
|