Merge lp:~joetalbott/utah/cobbler-pidlock-updated into lp:utah

[Joe Talbott]

This branch is an update to Max's cobbler-pidlock branch that stores the 'pid' in the DB and uses that to check if a provisioned machine is still in use.

[lp:~joetalbott/utah/cobbler-pidlock-updated]

712. By Joe Talbott on 2012-11-15

Merge with dev.

* Added information parser for dashboard
* Updated ISO static validation to use new features of ISO class and
  work independent of script directory and image directory and image
  name
* Added support for desktop image kernel detection from bootloader
  configuration files
* Added support for automatic ISO downloading and made CustomVM the
  default provisioning method
* Updated config handling: directories now supported, as well as most
  command line options
* Dashboard integration merge
* Merged initial arm support
* Pushing version to 0.5 to create a new stable version before UDS
* phoenix - Fix comment for fetch_method.
* phoenix - Adjust default ts_control to be more informative
* Add 'run_as' to phoenix created tc_control files
* Update documentation for phoenix
* Add reboot documentation
* Allow phoenix to append new testcases to tslist.run
* Update phoenix.py output
* phoenix - Move command to the end of the tc_control file to match
  the training docs
* Update VCS revision methods for adding revision info to results

[Joe Talbott (joetalbott)]

Merged with dev and fixed state setting per Max on IRC.

review: Needs Resubmitting

[lp:~joetalbott/utah/cobbler-pidlock-updated]

713. By Joe Talbott on 2012-11-15

Remove unneeded code.

[Max Brustkern (nuclearbob)]

Looks good to me.

review: Approve

=== modified file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2012-11-08 17:23:31 +0000
+++ utah/provisioning/inventory/sqlite.py	2012-11-15 21:39:20 +0000
@@ -2,6 +2,7 @@
 
 import sqlite3
 import os
+import psutil
 from utah.provisioning.inventory.exceptions import \
         UTAHProvisioningInventoryException
 from utah.provisioning.inventory.inventory import Inventory
@@ -113,35 +114,50 @@
         else:
             for machineinfo in result:
                 cargs = dict(machineinfo)
-                machineid = cargs.pop('machineid')
-                name = cargs.pop('name')
-                state = cargs.pop('state')
-                if state == 'available':
-                    update = self.connection.execute(
-                            "UPDATE machines SET state='provisioned' "
-                            "WHERE machineid=? AND state='available'",
-                            [machineid]).rowcount
-                    if update == 1:
-                        machine = machinetype(*args, cargs=cargs,
-                                inventory=self, name=name, **kw)
-                        self.machines.append(machine)
-                        return machine
-                    elif update == 0:
-                        raise UTAHProvisioningInventoryException(
-                                'Machine was requested by another process '
-                                'before we could request it')
-                    elif update > 1:
-                        raise UTAHProvisioningInventoryException(
-                                'Multiple machines exist '
-                                'matching those criteria; '
-                                'database ' + self.db + ' may be corrupt')
-                    else:
-                        raise UTAHProvisioningInventoryException(
-                                'Negative rowcount returned '
-                                'when attempting to request machine')
+                if cargs['state'] == 'available':
+                    return self._take(cargs, *args, **kw)
+            for machineinfo in result:
+                cargs = dict(machineinfo)
+                pid = cargs['pid']
+                try:
+                    if not (psutil.pid_exists(pid) and ('utah' in 
+                            ' '.join(psutil.Process(pid).cmdline)
+                            or 'run_test_cobbler.py' in 
+                            ' '.join(psutil.Process(pid).cmdline))):
+                        return self._take(cargs, *args, **kw)
+                except ValueError:
+                    continue
+
         raise UTAHProvisioningInventoryException(
                 'All machines meeting criteria are currently unavailable')
 
+    def _take(self, cargs, *args, **kw):
+        machineid = cargs.pop('machineid')
+        name = cargs.pop('name')
+        state = cargs.pop('state')
+        pid = cargs.pop('pid')
+        update = self.connection.execute(
+                "UPDATE machines SET pid=?, state='provisioned' WHERE machineid=? AND state=?",
+                [os.getpid(), machineid, state]).rowcount
+        if update == 1:
+            machine = CobblerMachine(*args, cargs=cargs,
+                    inventory=self, name=name, **kw)
+            self.machines.append(machine)
+            return machine
+        elif update == 0:
+            raise UTAHProvisioningInventoryException(
+                    'Machine was requested by another process '
+                    'before we could request it')
+        elif update > 1:
+            raise UTAHProvisioningInventoryException(
+                    'Multiple machines exist '
+                    'matching those criteria; '
+                    'database ' + self.db + ' may be corrupt')
+        else:
+            raise UTAHProvisioningInventoryException(
+                    'Negative rowcount returned '
+                    'when attempting to request machine')
+
     def release(self, machine=None, name=None):
         if machine is not None:
             name = machine.name
@@ -173,6 +189,7 @@
     # CREATE TABLE machines (machineid INTEGER PRIMARY KEY,
     #                        name TEXT NOT NULL UNIQUE,
     #                        state TEXT default 'available',
+    #                        pid TEXT,
     #                        [mac-address] TEXT NOT NULL UNIQUE,
     #                        [power-address] TEXT DEFAULT '10.97.0.13',
     #                        [power-id] TEXT,