summaryrefslogtreecommitdiffstats
path: root/doc/coding-standard.tex
diff options
context:
space:
mode:
authorMeghana <mmadhusu@redhat.com>2014-03-11 14:52:34 +0000
committerAnand Avati <avati@redhat.com>2014-03-12 14:28:21 -0700
commit79d2a9e5b83b4d773e5b821c5c55f24718745cb7 (patch)
treedcf541a0fa4e1ba28fd8f2ce1ba48599307b3e16 /doc/coding-standard.tex
parent40b0bf5fc01a17e9a1628cd9ff537b7e15353958 (diff)
Changing the errno in glfs_h_rename
Change-Id: I006215d910ee854aee488f3880f39ed425f294cc BUG: 1075488 Reviewed-on: http://review.gluster.org/7226 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'doc/coding-standard.tex')
0 files changed, 0 insertions, 0 deletions
generated by cgit (git 2.34.1) at 2025-11-16 21:17:03 +0000
tr>-rw-r--r--swift/1.4.8/plugins/conf/container-server/1.conf-gluster (renamed from swift/1.4.8/plugins/conf/container-server/1.conf)5
-rw-r--r--swift/1.4.8/plugins/conf/fs.conf-gluster (renamed from swift/1.4.8/plugins/conf/fs.conf)0
-rw-r--r--swift/1.4.8/plugins/conf/object-server/1.conf-gluster (renamed from swift/1.4.8/plugins/conf/object-server/1.conf)5
-rw-r--r--swift/1.4.8/plugins/conf/proxy-server.conf-gluster (renamed from swift/1.4.8/plugins/conf/proxy-server.conf)0
-rw-r--r--swift/1.4.8/plugins/conf/swift.conf-gluster (renamed from swift/1.4.8/plugins/conf/swift.conf)0
-rw-r--r--swift/1.4.8/plugins/fs_utils.py157
-rw-r--r--swift/1.4.8/plugins/middleware/glusterfs.py55
-rw-r--r--swift/1.4.8/plugins/utils.py199
-rw-r--r--swift/1.4.8/swift.diff212
-rw-r--r--swift/1.4.8/test/unit/plugins/test_utils.py24
16 files changed, 429 insertions, 495 deletions
diff --git a/swift/1.4.8/gluster-swift-plugin.spec b/swift/1.4.8/gluster-swift-plugin.spec
index 181666a3608..50731bc844f 100644
--- a/swift/1.4.8/gluster-swift-plugin.spec
+++ b/swift/1.4.8/gluster-swift-plugin.spec
@@ -13,7 +13,7 @@
%define _confdir /etc/swift
%define _swiftdir /usr/lib/python2.6/site-packages/swift
%define _ufo_version 1.0
-%define _ufo_release 5
+%define _ufo_release 6
Summary : GlusterFS Unified File and Object Storage.
Name : gluster-swift-plugin
@@ -51,10 +51,10 @@ cp DiskFile.py %{buildroot}/%{_swiftdir}/plugins
cp Glusterfs.py %{buildroot}/%{_swiftdir}/plugins
cp __init__.py %{buildroot}/%{_swiftdir}/plugins
cp utils.py %{buildroot}/%{_swiftdir}/plugins
+cp fs_utils.py %{buildroot}/%{_swiftdir}/plugins
cp middleware/__init__.py %{buildroot}/%{_swiftdir}/plugins/middleware
cp middleware/gluster.py %{buildroot}/%{_swiftdir}/plugins/middleware
-cp middleware/glusterfs.py %{buildroot}/%{_swiftdir}/plugins/middleware
cp -r conf/* %{buildroot}/%{_confdir}/
diff --git a/swift/1.4.8/gluster-swift.spec b/swift/1.4.8/gluster-swift.spec
index 640b944e8cb..47fafcb3203 100644
--- a/swift/1.4.8/gluster-swift.spec
+++ b/swift/1.4.8/gluster-swift.spec
@@ -4,7 +4,7 @@
Name: gluster-swift
Version: 1.4.8
-Release: 3%{?dist}
+Release: 6%{?dist}
Summary: OpenStack Object Storage (swift)
Group: Development/Languages
diff --git a/swift/1.4.8/plugins/DiskDir.py b/swift/1.4.8/plugins/DiskDir.py
index e8024768d8b..e057dff956d 100644
--- a/swift/1.4.8/plugins/DiskDir.py
+++ b/swift/1.4.8/plugins/DiskDir.py
@@ -28,15 +28,13 @@ from swift.plugins.utils import X_CONTENT_TYPE, X_CONTENT_LENGTH, X_TIMESTAMP,\
X_PUT_TIMESTAMP, X_TYPE, X_ETAG, X_OBJECTS_COUNT, X_BYTES_USED, \
X_CONTAINER_COUNT, CONTAINER
-from swift import plugins
-def strip_obj_storage_path(path, string='/mnt/gluster-object'):
- """
- strip /mnt/gluster-object
- """
- return path.replace(string, '').strip('/')
-
DATADIR = 'containers'
+# Create a dummy db_file in /etc/swift
+_db_file = '/etc/swift/db_file.db'
+if not os.path.exists(_db_file):
+ file(_db_file, 'w+')
+
def _read_metadata(dd):
""" Filter read metadata so that it always returns a tuple that includes
@@ -148,7 +146,7 @@ class DiskDir(DiskCommon):
"""
def __init__(self, path, device, partition, account, container, logger,
- uid=DEFAULT_UID, gid=DEFAULT_GID, fs_object=None):
+ uid=DEFAULT_UID, gid=DEFAULT_GID):
self.root = path
device = account
if container:
@@ -162,15 +160,12 @@ class DiskDir(DiskCommon):
self.account = account
self.device_path = os.path.join(path, device)
if not check_mount(path, device):
- check_valid_account(account, fs_object)
+ check_valid_account(account)
self.logger = logger
self.metadata = {}
self.uid = int(uid)
self.gid = int(gid)
- # Create a dummy db_file in /etc/swift
- self.db_file = '/etc/swift/db_file.db'
- if not os.path.exists(self.db_file):
- file(self.db_file, 'w+')
+ self.db_file = _db_file
self.dir_exists = os.path.exists(self.datadir)
if self.dir_exists:
try:
@@ -319,9 +314,10 @@ class DiskDir(DiskCommon):
for obj in objects:
list_item = []
list_item.append(obj)
- metadata = read_metadata(self.datadir + '/' + obj)
+ obj_path = os.path.join(self.datadir, obj)
+ metadata = read_metadata(obj_path)
if not metadata or not validate_object(metadata):
- metadata = create_object_metadata(self.datadir + '/' + obj)
+ metadata = create_object_metadata(obj_path)
if metadata:
list_item.append(metadata[X_TIMESTAMP])
list_item.append(int(metadata[X_CONTENT_LENGTH]))
@@ -420,12 +416,12 @@ class DiskDir(DiskCommon):
class DiskAccount(DiskDir):
- de