Merge lp:~greglange/swift/lp759572 into lp:~hudson-openstack/swift/trunk

[Greg Lange]

Update get_hashes in objrep to use utils.write_pickle

=== modified file 'swift/common/utils.py'
--- swift/common/utils.py	2011-03-30 20:04:15 +0000
+++ swift/common/utils.py	2011-04-14 20:57:28 +0000
@@ -776,7 +776,7 @@
     return conf
 
 
-def write_pickle(obj, dest, tmp):
+def write_pickle(obj, dest, tmp, pickle_protocol=0):
     """
     Ensure that a pickle file gets written to disk.  The file
     is first written to a tmp location, ensure it is synced to disk, then
@@ -785,10 +785,11 @@
     :param obj: python object to be pickled
     :param dest: path of final destination file
     :param tmp: path to tmp to use
+    :param pickle_protocol: protocol to pickle the obj with, defaults to 0
     """
-    fd, tmppath = mkstemp(dir=tmp)
+    fd, tmppath = mkstemp(dir=tmp, suffix='.tmp')
     with os.fdopen(fd, 'wb') as fo:
-        pickle.dump(obj, fo)
+        pickle.dump(obj, fo, pickle_protocol)
         fo.flush()
         os.fsync(fd)
         renamer(tmppath, dest)
 
=== modified file 'swift/obj/replicator.py'
--- swift/obj/replicator.py	2011-04-11 23:06:20 +0000
+++ swift/obj/replicator.py	2011-04-14 20:57:28 +0000
@@ -30,7 +30,7 @@
 
 from swift.common.ring import Ring
 from swift.common.utils import whataremyips, unlink_older_than, lock_path, \
-        renamer, compute_eta, get_logger
+        compute_eta, get_logger, write_pickle
 from swift.common.bufferedhttp import http_connect
 from swift.common.daemon import Daemon
 
@@ -105,9 +105,7 @@
         except Exception:
             return
         hashes[suffix] = None
-        with open(hashes_file + '.tmp', 'wb') as fp:
-            pickle.dump(hashes, fp, PICKLE_PROTOCOL)
-        renamer(hashes_file + '.tmp', hashes_file)
+        write_pickle(hashes, hashes_file, partition_dir, PICKLE_PROTOCOL)
 
 
 def get_hashes(partition_dir, recalculate=[], do_listdir=False,
@@ -157,9 +155,7 @@
                 modified = True
                 sleep()
         if modified:
-            with open(hashes_file + '.tmp', 'wb') as fp:
-                pickle.dump(hashes, fp, PICKLE_PROTOCOL)
-            renamer(hashes_file + '.tmp', hashes_file)
+            write_pickle(hashes, hashes_file, partition_dir, PICKLE_PROTOCOL)
         return hashed, hashes