diff options
author | Prashanth Pai <ppai@redhat.com> | 2015-09-08 15:44:09 +0530 |
---|---|---|
committer | Prashanth Pai <ppai@redhat.com> | 2016-01-11 20:47:23 -0800 |
commit | c5d76cdd2e2e99d4ac65b645b17cf8a43e4ccab4 (patch) | |
tree | 9266f8a8419d48ab6f19a2bb5ca0988e72f501da /gluster/swift/common/Glusterfs.py | |
parent | ac33dc6dbf1f982cf522556aa938ebfb0e6ddded (diff) |
Do not use pickle: Use json
Change-Id: Iffdd56704330897fbde21f101c9b2ed03c2ae296
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Thiago da Silva <tdasilva@redhat.com>
Tested-by: Thiago da Silva <tdasilva@redhat.com>
Reviewed-on: http://review.gluster.org/13221
Diffstat (limited to 'gluster/swift/common/Glusterfs.py')
-rw-r--r-- | gluster/swift/common/Glusterfs.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gluster/swift/common/Glusterfs.py b/gluster/swift/common/Glusterfs.py index 0098bff..6a2fdb2 100644 --- a/gluster/swift/common/Glusterfs.py +++ b/gluster/swift/common/Glusterfs.py @@ -37,6 +37,7 @@ _allow_mount_per_server = False _implicit_dir_objects = False _container_update_object_count = False _account_update_container_count = False +_read_pickled_metadata = True if _fs_conf.read(os.path.join(SWIFT_DIR, 'fs.conf')): try: @@ -97,6 +98,13 @@ if _fs_conf.read(os.path.join(SWIFT_DIR, 'fs.conf')): except (NoSectionError, NoOptionError): pass + try: + _read_pickled_metadata = _fs_conf.get('DEFAULT', + 'read_pickled_metadata', + "on") in TRUE_VALUES + except (NoSectionError, NoOptionError): + pass + NAME = 'glusterfs' |