Changeset 3040

Timestamp:

10/16/06 13:30:17 (18 years ago)

Author:

jerome

Message:

Removed parts of the locking code incompatible with a multi-server
configuration in which all servers share the same locking directory.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -140 +140 @@
                                             0600)
                 except OSError, error :                     
+                    # IMPORTANT : we don't check anymore if the other process
+                    # is still alive, otherwise we could inadvertantly delete
+                    # a lock file created by a different print server in the
+                    # same directory (load balancing).
+                    # I think the lock is removed in all cases anyway, excepted
+                    # when the admin kills -9 cupspykota.
                     if error.errno == errno.EEXIST :
-                        self.logdebug("Lock not available.")
+                        self.logdebug("Lock not available. Waiting a bit...")
                     else :    
-                        self.logdebug("Lock not available : %s" % error)
-                    try :    
-                        try :    
-                            lockfobj = open(self.lockfilename, "r")    
-                            oldpid = int(lockfobj.readline().strip())
-                        except IOError :
-                            self.logdebug("Lock file has probably been deleted in the meantime.")
-                        except ValueError :    
-                            self.logdebug("Invalid content in existing lock file.")
-                        else :    
-                            try :
-                                # Is the old process still alive ?
-                                os.kill(oldpid, 0)
-                            except OSError :    
-                                # old process is dead, we delete the lock file
-                                self.logdebug("Old process (PID %i) is dead." % oldpid)
-                                os.unlink(self.lockfilename)
-                                self.logdebug("Lock file %s removed." % self.lockfilename)
-                            else :    
-                                self.logdebug("Old process (PID %i) still alive, waiting a bit..." % oldpid)
-                                time.sleep(0.25) # No hurry :)
-                    finally :    
-                        try :
-                            lockfobj.close()
-                        except NameError :    
-                            pass
+                        self.logdebug("Lock not available : %s. Waiting a bit..." % error)
+                    time.sleep(0.25) # No hurry :)
                 else :    
                     os.write(self.lockfile, str(self.pid))
@@ -558 +540 @@
                 os.unlink(self.lockfilename)
             except :    
-                self.logdebug("Problem while removing lock file %s" % self.lockfilename)
+                self.printInfo("Problem while removing lock file %s" % self.lockfilename, "error")
             else :    
                 self.logdebug("Lock file %s removed." % self.lockfilename)

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.25alpha14 (2006-10-13) :
       
+        - Removed some locking code which would have prevented multi-server
+          configuration to work correctly with a shared lock directory.
+          
         - First useable release with the computation of ink
           usage, through the introduction of the 'ink(cspace, resolution)'