andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

object-storage: use constants for directory names

Browse Source 
Change-Id: I6109ee55061eae53c4c6762ca31fb5c4b13f0071
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4140
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Tested-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Peter Portante 2012-10-24 10:30:56 -04:00 committed by Vijay Bellur
parent 6478b569c3
commit cae3216a2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/1.4.8/plugins/utils.py
View File

@ -19,6 +19,7 @@ import errno
import xattr
from hashlib import md5
from swift.common.utils import normalize_timestamp, TRUE_VALUES
from swift.obj.server import ASYNCDIR
import cPickle as pickle
from ConfigParser import ConfigParser, NoSectionError, NoOptionError
@ -40,6 +41,7 @@ MAX_XATTR_SIZE = 65536
CONTAINER = 'container'
DIR = 'dir'
MARKER_DIR = 'marker_dir'
TEMP_DIR = 'tmp'
FILE = 'file'
DIR_TYPE = 'application/directory'
FILE_TYPE = 'application/octet-stream'
@ -499,8 +501,8 @@ def _get_account_details_from_fs(acc_path, acc_stats):
is_dir = (acc_stats.st_mode & 0040000) != 0
if is_dir:
for name in do_listdir(acc_path):
if name.lower() == 'tmp' \
or name.lower() == 'async_pending' \
if name.lower() == TEMP_DIR \
or name.lower() == ASYNCDIR \
or not os.path.isdir(os.path.join(acc_path, name)):
continue
container_count += 1