From 13959e281704d30f6e7762bdd490cdf3bf31bdff Mon Sep 17 00:00:00 2001
From: Mohammed Junaid <junaid@redhat.com>
Date: Tue, 9 Jul 2013 09:36:37 +0530
Subject: Remove extraneous system calls

Remove a number of stat() system calls that were redundant.

BUG 903396 (https://bugzilla.redhat.com/show_bug.cgi?id=903396)

Change-Id: I2e89ce8a023650cd745f136f5c697902cf2462ea
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5293
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>
---
 gluster/swift/common/DiskFile.py | 44 +++++++++++++++++++++++++---------------
 gluster/swift/common/utils.py    |  5 +++--
 2 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'gluster')

diff --git a/gluster/swift/common/DiskFile.py b/gluster/swift/common/DiskFile.py
index 0bc2778..1ae5f7c 100644
--- a/gluster/swift/common/DiskFile.py
+++ b/gluster/swift/common/DiskFile.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import os
+import stat
 import errno
 import random
 from hashlib import md5
@@ -22,7 +23,7 @@ from swift.common.utils import renamer
 from swift.common.exceptions import DiskFileNotExist, DiskFileError
 from gluster.swift.common.exceptions import AlreadyExistsAsDir
 from gluster.swift.common.fs_utils import mkdirs, do_open, do_close, \
-    do_unlink, do_chown, os_path, do_fsync, do_fchown
+    do_unlink, do_chown, os_path, do_fsync, do_fchown, do_stat
 from gluster.swift.common.utils import read_metadata, write_metadata, \
     validate_object, create_object_metadata, rmobjdir, dir_is_object
 from gluster.swift.common.utils import X_CONTENT_LENGTH, X_CONTENT_TYPE, \
@@ -123,10 +124,18 @@ class Gluster_DiskFile(DiskFile):
         # Don't store a value for data_file until we know it exists.
         self.data_file = None
         data_file = os.path.join(self.datadir, self._obj)
-        if not os_path.exists(data_file):
-            return
 
-        self.data_file = os.path.join(data_file)
+        try:
+            stats = do_stat(data_file)
+        except OSError as ose:
+            if ose.errno == errno.ENOENT or ose.errno == errno.ENOTDIR:
+                return
+            else:
+                raise
+
+        self.data_file = data_file
+        self._is_dir = stat.S_ISDIR(stats.st_mode)
+
         self.metadata = read_metadata(data_file)
         if not self.metadata:
             create_object_metadata(data_file)
@@ -138,16 +147,13 @@ class Gluster_DiskFile(DiskFile):
 
         self.filter_metadata()
 
-        if os_path.isdir(data_file):
-            self._is_dir = True
-        else:
-            if keep_data_fp:
-                # The caller has an assumption that the "fp" field of this
-                # object is an file object if keep_data_fp is set. However,
-                # this implementation of the DiskFile object does not need to
-                # open the file for internal operations. So if the caller
-                # requests it, we'll just open the file for them.
-                self.fp = do_open(data_file, 'rb')
+        if not self._is_dir and keep_data_fp:
+            # The caller has an assumption that the "fp" field of this
+            # object is an file object if keep_data_fp is set. However,
+            # this implementation of the DiskFile object does not need to
+            # open the file for internal operations. So if the caller
+            # requests it, we'll just open the file for them.
+            self.fp = do_open(data_file, 'rb')
 
     def close(self, verify_file=True):
         """
@@ -173,11 +179,17 @@ class Gluster_DiskFile(DiskFile):
         return not self.data_file
 
     def _create_dir_object(self, dir_path):
-        if not os_path.exists(dir_path):
+        stats = None
+        try:
+            stats = do_stat(dir_path)
+        except OSError:
+            pass
+
+        if not stats:
             mkdirs(dir_path)
             do_chown(dir_path, self.uid, self.gid)
             create_object_metadata(dir_path)
-        elif not os_path.isdir(dir_path):
+        elif not stat.S_ISDIR(stats.st_mode):
             raise DiskFileError("Cannot overwrite "
                                 "file %s with a directory" % dir_path)
 
diff --git a/gluster/swift/common/utils.py b/gluster/swift/common/utils.py
index 40ede7e..5547ea4 100644
--- a/gluster/swift/common/utils.py
+++ b/gluster/swift/common/utils.py
@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import os
+import stat
 import errno
 import xattr
 import random
+import logging
 from hashlib import md5
 from eventlet import sleep
 import cPickle as pickle
@@ -325,7 +326,7 @@ def _get_account_details_from_fs(acc_path):
     container_count = 0
 
     acc_stats = do_stat(acc_path)
-    is_dir = (acc_stats.st_mode & 0040000) != 0
+    is_dir = stat.S_ISDIR(acc_stats.st_mode)
     if is_dir:
         for name in do_listdir(acc_path):
             if name.lower() == TEMP_DIR \
-- 
cgit