Changeset 24788

Timestamp:

Jul 14, 2009, 1:56:39 PM (17 years ago)

Author:

bills

Message:

Fix a couple of race conditions with regard to fileset state changes

Location:

trunk/ippTools/share

Files:

• receivetool_pendingfile.sql (modified) (1 diff)
• receivetool_pendingfileset.sql (modified) (1 diff)

trunk/ippTools/share/receivetool_pendingfile.sql

@@ -18 +18 @@
     ON receiveResult.file_id = receiveFile.file_id
 WHERE
-    ((receiveFileset.state = 'new') OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo'))
+    ((receiveFileset.state = 'new')
+    OR (receiveFileset.state = 'listed' AND receiveFile.component = 'dirinfo' AND receiveFileset.dirinfo IS NULL))
     AND receiveFileset.fault = 0
     AND receiveResult.file_id IS NULL

trunk/ippTools/share/receivetool_pendingfileset.sql

@@ -1 +1 @@
 SELECT *
 FROM receiveFileset
-WHERE state = 'reg'
-    AND fault = 0
+JOIN receiveSource USING(source_id)
+LEFT JOIN receiveFile USING(fileset_id)
+WHERE receiveFileset.state = 'reg'
+    AND receiveFileset.fault = 0
+    AND receiveFile.fileset_id IS NULL