Attachment 643977 Details for Bug 874397 – upstream version of proposed patch

[patch] upstream version of proposed patch

1316_1315.diff (text/plain), 2.02 KB, created by Jan Kaluža on 2012-11-13 07:33:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-11-13 07:33:59 UTC

Size: 2.02 KB

patch

obsolete

>=== modified file 'Mailman/MailList.py'
>--- Mailman/MailList.py	2011-02-07 19:59:23 +0000
>+++ Mailman/MailList.py	2011-09-29 23:39:46 +0000
>@@ -599,8 +599,16 @@
>             # file doesn't exist, we'll get an EnvironmentError with errno set
>             # to ENOENT (EnvironmentError is the base class of IOError and
>             # OSError).
>+            # We test strictly less than here because the resolution is whole
>+            # seconds and we have seen cases of the file being updated by
>+            # another process in the same second.
>+            # Even this is not sufficient in shared file system environments
>+            # if there is time skew between servers.  In those cases, the test
>+            # could be
>+            # if mtime + MAX_SKEW < self.__timestamp:
>+            # or the "if ...: return" just deleted.
>             mtime = os.path.getmtime(dbfile)
>-            if mtime <= self.__timestamp:
>+            if mtime < self.__timestamp:
>                 # File is not newer
>                 return None, None
>             fp = open(dbfile)
>@@ -618,8 +626,9 @@
>                 return None, e
>         finally:
>             fp.close()
>-        # Update timestamp
>-        self.__timestamp = mtime
>+        # Update the timestamp.  We use current time here rather than mtime
>+        # so the test above might succeed the next time.
>+        self.__timestamp = int(time.time())
>         return dict, None
> 
>     def Load(self, check_version=True):
>
>=== modified file 'NEWS'
>--- NEWS	2011-09-16 00:21:55 +0000
>+++ NEWS	2011-09-29 23:39:46 +0000
>@@ -66,6 +66,12 @@
> 
>   Bug Fixes and other patches
> 
>+    - A problem with the logic avoiding unnecessarily reloading a current list
>+      object from the config.pck arises if the list is updated by another
>+      process within the same second that it was last read/written.  That can
>+      cause the reading of latest version of the list to be skipped.  This has
>+      been fixed.  Bug #862675.
>+
>     - Fixed bin/export.py to accept case insensitive password schemes.
>       Bug #833134.
> 
>

Actions: View | Diff

Attachments on bug 874397: 641569 | 643977