Fix slave_cleanup() so that partial files are not prematurely removed.
authorMartin Pihlak <martin.pihlak@gmail.com>
Fri, 5 Feb 2010 13:56:19 +0000 (15:56 +0200)
committerMartin Pihlak <martin.pihlak@gmail.com>
Fri, 5 Feb 2010 13:56:19 +0000 (15:56 +0200)
python/walmgr.py

index 4aa7a11902b48bdafc03a4cc636ddc23ed97fd31..58eb73e61c6453e2c4530f63dbd2156be0ec44b2 100755 (executable)
@@ -1653,14 +1653,14 @@ restore_command = '%s %s %s'
         partial_wals = self.cf.get("partial_wals")
 
         self.log.debug("cleaning completed wals before %s" % last_applied)
-        last = self.del_wals(completed_wals, last_applied)
-        if last:
-            if os.path.isdir(partial_wals):
-                self.log.debug("cleaning partial wals before %s" % last)
-                self.del_wals(partial_wals, last)
-            else:
-                self.log.warning("partial_wals dir does not exist: %s"
-                              % partial_wals)
+        self.del_wals(completed_wals, last_applied)
+
+        if os.path.isdir(partial_wals):
+            self.log.debug("cleaning partial wals before %s" % last_applied)
+            self.del_wals(partial_wals, last_applied)
+        else:
+            self.log.warning("partial_wals dir does not exist: %s" % partial_wals)
+
         self.log.debug("cleaning done")
 
     def del_wals(self, path, last):