Update repo

This is a squashed commit imported from this repo:
https://github.com/openstack/swiftonfile/tree/icehouse

Contains the follwing commits from above mentioned repo:

eb50236 Merge "Backport: Fix metadata overall limits bug" into icehouse
79ea52a Backport: Fix metadata overall limits bug
bc43f0b Fix inconsistent data being returned on GET
ad0bb79 Import HTTPBadRequest from swift's module
74d02e6 Exclude .trashcan dir from container listing
b2dbc15 Catch ESTALE in addition to ENOENT
8d60b48 Properly handle read_metadata() exceptions
6762fc6 Fix object server leaking file descriptors
2842e82 Fix API incompatibility in update_metadata()
2beeef6 Merge "Remove swiftkerbauth code" into icehouse
93dbcb5 Update object-expirer.conf with explanations
c9d2f09 Merge "Check if /etc/swift exists in ring builder" into icehouse
d66c14c Remove swiftkerbauth code
3142ed2 Add object expiration functests
97153d1 Merge "Cleanup functest and undo old patch" into icehouse
bc234d0 Remove old travis config file and fix typo
260c8ef Check if /etc/swift exists in ring builder
637dac9 Cleanup functest and undo old patch
051e068 Merge pull request #35 from prashanthpai/backport-1
be104a3 Merge pull request #36 from prashanthpai/backport-2
ff76f42 fix issue with GET on large object (icehouse-backport)
04d0a99 Fix unlink call after successful rename
4c6ca1d updating README file with project name change
10b2680 Merge pull request #18 from thiagol11/icehouse
5bcab8f Updating version on __init__ file
5c2cba2 Merge pull request #15 from thiagol11/update_spec
52b00a8 updating spec file to add dependency on swift icehouse
ae7c93b Merge pull request #6 from prashanthpai/rebase
191e55b Revert: allow non-root user to run functests
cb7e968 Modify unit tests and func tests
d23fd1b Sync with OpenStack Swift v1.13.1
b6d1671 Merge pull request #12 from pushpesh/functionalnosetestremove
962622b Merge pull request #8 from thiagol11/update_readme
4560857 Merge pull request #9 from prashanthpai/spec-expirer
be0ae7e Minor update
65000f1 Removing functionalnosetests
8ab1069 Fix object-expirer.conf-gluster RPM build error
afee30f added new support filesystem section
527b01f updated README.md to Swift-On-File
9a240c7 Merge pull request #3 from thiagol11/add_jenkins_to_travis
34b5a8b removing blank lines
3568b64 fixing missing fi
d8f5b0f adding support to run jenkins triggered by travis
6f4a88c Removing functionalnosetests
8041944 Update README.md
c015148 Merge pull request #2 from thiagol11/master
3ddd952 fixing travis file to run correct unit test
c582669 adding travis status badge to README
8093096 adding py26 unit testing to travis
37835fd trigger travis build
cb6332a adding travis ci testing

All tests have been run sucessfully against this.
tox -e p2p8,py27,functest

Change-Id: I096b611da852d3eb3913844034b443b8272c2ac4
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/13188

1 files changed, 24 insertions, 8 deletions

diff --git a/gluster/swift/common/utils.py b/gluster/swift/common/utils.py
index 145add3..95c8739 100644
--- a/gluster/swift/common/utils.py
+++ b/gluster/swift/common/utils.py
@@ -47,6 +47,7 @@ DIR_NON_OBJECT = 'dir'
 DIR_OBJECT = 'marker_dir'
 TEMP_DIR = 'tmp'
 ASYNCDIR = 'async_pending'  # Keep in sync with swift.obj.server.ASYNCDIR
+TRASHCAN = '.trashcan'
 FILE = 'file'
 FILE_TYPE = 'application/octet-stream'
 OBJECT = 'Object'
@@ -212,7 +213,7 @@ def validate_account(metadata):
     return False
 
 
-def validate_object(metadata):
+def validate_object(metadata, stat=None):
     if not metadata:
         return False
 
@@ -224,6 +225,12 @@ def validate_object(metadata):
        X_OBJECT_TYPE not in metadata.keys():
         return False
 
+    if stat and (int(metadata[X_CONTENT_LENGTH]) != stat.st_size):
+        # File length has changed.
+        # TODO: Handle case where file content has changed but the length
+        # remains the same.
+        return False
+
     if metadata[X_TYPE] == OBJECT:
         return True
 
@@ -242,8 +249,16 @@ def _update_list(path, cont_path, src_list, reg_file=True, object_count=0,
         if not reg_file and not Glusterfs._implicit_dir_objects:
             # Now check if this is a dir object or a gratuiously crated
             # directory
-            metadata = \
-                read_metadata(os.path.join(cont_path, obj_path, obj_name))
+            try:
+                metadata = \
+                    read_metadata(os.path.join(cont_path, obj_path, obj_name))
+            except GlusterFileSystemIOError as err:
+                if err.errno in (errno.ENOENT, errno.ESTALE):
+                    # object might have been deleted by another process
+                    # since the src_list was originally built
+                    continue
+                else:
+                    raise err
             if not dir_is_object(metadata):
                 continue
 
@@ -304,6 +319,7 @@ def get_account_details(acc_path):
         for name in do_listdir(acc_path):
             if name.lower() == TEMP_DIR \
                     or name.lower() == ASYNCDIR \
+                    or name.lower() == TRASHCAN \
                     or not do_isdir(os.path.join(acc_path, name)):
                 continue
             container_count += 1
@@ -476,7 +492,7 @@ def rmobjdir(dir_path):
     try:
         do_rmdir(dir_path)
     except OSError as err:
-        if err.errno == errno.ENOENT:
+        if err.errno in (errno.ENOENT, errno.ESTALE):
             # No such directory exists
             return False
         if err.errno != errno.ENOTEMPTY:
@@ -494,8 +510,8 @@ def rmobjdir(dir_path):
 
             try:
                 metadata = read_metadata(fullpath)
-            except OSError as err:
-                if err.errno == errno.ENOENT:
+            except GlusterFileSystemIOError as err:
+                if err.errno in (errno.ENOENT, errno.ESTALE):
                     # Ignore removal from another entity.
                     continue
                 raise
@@ -513,7 +529,7 @@ def rmobjdir(dir_path):
                 if err.errno == errno.ENOTEMPTY:
                     # Directory is not empty, it might have objects in it
                     return False
-                if err.errno == errno.ENOENT:
+                if err.errno in (errno.ENOENT, errno.ESTALE):
                     # No such directory exists, already removed, ignore
                     continue
                 raise
@@ -524,7 +540,7 @@ def rmobjdir(dir_path):
         if err.errno == errno.ENOTEMPTY:
             # Directory is not empty, race with object creation
             return False
-        if err.errno == errno.ENOENT:
+        if err.errno in (errno.ENOENT, errno.ESTALE):
             # No such directory exists, already removed, ignore
             return True
         raise