Merge lp:~patrick-crews/drizzle/dbqp_bug713802 into lp:drizzle/7.0

[Patrick Crews]

Fixed port management - we now write per-port files to /tmp that we clean up post-run.
This allows different access-having users to all use the system (we only see if a port file exists to know it is 'locked') We also clean up after ourselves to be a good citizen : )

[lp:~patrick-crews/drizzle/dbqp_bug713802]

2150. By Patrick Crews on 2011-02-07

Minor tweak to start-and-exit (report server info prior to exit) and update of port_file_naming

2151. By Patrick Crews on 2011-02-07

Further port_management work. Blow away unused port files on --start-and-exit. Also removed previous references to port catalog (old method). Tweaked when we report server information on --start-and-exit

=== modified file 'tests/lib/sys_mgmt/port_management.py'
--- tests/lib/sys_mgmt/port_management.py	2011-02-04 20:41:08 +0000
+++ tests/lib/sys_mgmt/port_management.py	2011-02-07 18:13:20 +0000
@@ -37,7 +37,8 @@
         self.skip_keys = [ 'port_file_delimiter'
                          , 'system_manager'
                          ]
-        self.port_catalog = "/tmp/drizzle_test_port_catalog.dat"
+        self.working_dir = "/tmp"
+        self.file_prefix = "dbqp_port"
         self.port_file_delimiter = ':' # what we use to separate port:owner 
         self.debug = debug
         self.logging = system_manager.logging
@@ -96,7 +97,7 @@
         sys.exit(1)
 
     def check_port_status(self, port):
-        """ Check if a port is in use, via the catalog file 
+        """ Check if a port is in use, via the port files
             which all copies of dbqp.py should use
 
             Not *really* sure how well this works with multiple
@@ -104,9 +105,9 @@
             to work 
 
         """
-        # read the catalog file
-        port_catalog = self.process_port_catalog()
-        if port not in port_catalog and not self.is_port_used(port):
+        # check existing ports dbqp has created
+        dbqp_ports = self.check_dbqp_ports()
+        if port not in dbqp_ports and not self.is_port_used(port):
             return 1
         else:
             return 0
@@ -143,59 +144,51 @@
                         return 1
         return 0
 
-    def process_port_catalog(self):
-        """ Read in the catalog file so that we can see
-            if the port is in use or not
+    
+
+    def check_dbqp_ports(self):
+        """ Scan the files in /tmp for those files named
+            dbqp_port_NNNN.  Existence indicates said port is 'locked'
 
         """
-        port_catalog = {}
-        delimiter = ':'
-        if os.path.exists(self.port_catalog):
-            try:
-                port_file = open(self.port_catalog,'r')
-                for line in port_file:
-                    line = line.strip()
-                    port, owner = line.split(self.port_file_delimiter)
-                    port_catalog[port] = owner
-                port_file.close()
-            except IOError, e:
-                self.logging.error("Problem opening port catalog file: %s" %(self.port_catalog))
-                self.logging.error("%s" %e)
-                sys.exit(1)
-        return port_catalog
+        used_ports = []
+        tmp_files = os.listdir('/tmp')
+        for tmp_file in tmp_files:
+            if tmp_file.startswith('dbqp_port'):
+                used_ports.append(int(tmp_file.split('_')[-1]))
+        return used_ports
 
     def assign_port(self, owner, port):
-        """Assigns a port - logs it in the port_catalog file"""
-
-        data_string = "%d:%s\n" %(port, owner)
-        try:
-            port_file = open(self.port_catalog,'a')
-            port_file.write(data_string)
-            port_file.close()
-        except IOError, e:
-            self.logging.error("Problem opening port catalog file: %s" %(self.port_catalog))
-            self.logging.error("%s" %e)
-            sys.exit(1)
+        """Assigns a port - create a tmpfile
+           with a name that 'logs' the port
+           as being used
+
+        """
+
+        out_file = open(self.get_file_name(port),'w')
+        out_file.write("%s:%d\n" %(owner, port))
+        out_file.close()
 
     def free_ports(self, portlist):
-       """ Clean up our port catalog """
+       """ Clean up our ports """
        for port in portlist:
           self.free_port(port)
 
     def free_port(self, port):
-       """ Free a single port from the catalog """
+       """ Free a single port - we delete the file
+           that 'locks' it
+
+       """
+      
        if self.debug:
            self.logging.debug("Freeing port %d" %(port))
-       port_catalog = self.process_port_catalog()
-       port_catalog.pop(str(port),None)
-       self.write_port_catalog(port_catalog)
-
-    def write_port_catalog(self, port_catalog):
-        port_file = open(self.port_catalog, 'w')
-        for key, value in port_catalog.items():
-            port_file.write(("%s:%s\n" %(key, value)))
-        port_file.close()
-
+       os.remove(self.get_file_name(port))
+
+    def get_file_name(self, port):
+        """ We generate a file name for the port """
+      
+        port_file_name = "%s_%s_%d" %(self.file_prefix, self.system_manager.cur_user, port )
+        return os.path.join(self.working_dir, port_file_name)
         
        
        
 
=== modified file 'tests/lib/test_mgmt/test_execution.py'
--- tests/lib/test_mgmt/test_execution.py	2011-02-04 20:41:08 +0000
+++ tests/lib/test_mgmt/test_execution.py	2011-02-07 18:13:20 +0000
@@ -111,7 +111,16 @@
         else:
             if start_and_exit:
                 # TODO:  Report out all started servers via server_manager/server objects?
-                self.logging.info("User specified --start-and-exit.  dbqp.py exiting and leaving servers running...")
+                self.current_servers[0].report()
+                self.logging.info("User specified --start-and-exit.  dbqp.py exiting and leaving servers running...") 
+                # We blow away any port_management files for our ports
+                # Technically this won't let us 'lock' any ports that 
+                # we aren't explicitly using (visible to netstat scan)
+                # However one could argue that if we aren't using it, 
+                # We shouldn't hog it ; )
+                # We might need to do this better later
+                for server in current_servers:
+                    server.cleanup() # this only removes any port files
                 sys.exit(0)
         if self.initial_run:
             self.initial_run = 0