Merge lp:~doanac/utah/bug1158743 into lp:utah

[Andy Doan]

This should add the logging Javier was suggesting to understand what processes are actually using a machine.

[Javier Collado (javier.collado)]

I see that you fixed the bug in a branch based on trunk and created the merge
for dev (which actually reveals an entry in debian/changelog that isn't in
dev). Is this the expected way to work with bugs?

[Javier Collado (javier.collado)]

The use of a static private method suggests that `_in_use` is a utility method,
so I believe it should be moved to the `process` module which is expected to
have that kind of methods.

[Andy Doan (doanac)]

On 03/25/2013 04:16 AM, Javier Collado wrote:
> I see that you fixed the bug in a branch based on trunk and created the merge
> for dev (which actually reveals an entry in debian/changelog that isn't in
> dev). Is this the expected way to work with bugs?
>
Nope - that was a mechanical error. I'll correct

[lp:~doanac/utah/bug1158743]

270. By Andy Doan on 2013-03-25

move pid _in_use to process.py

As per Javier's review comment this moves the function to become a
generic helper. I also added some unit-testing logic for it

271. By Andy Doan on 2013-04-10

fix pep257 issues

272. By Andy Doan on 2013-04-10

add changelog entry

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-21 08:27:02 +0000
+++ debian/changelog	2013-03-22 21:18:28 +0000
@@ -2259,6 +2259,12 @@
 
  -- Max Brustkern <[e-mail]>  Mon, 02 Jul 2012 10:13:46 -0400
 
+utah (0.2ubuntu365) quantal; urgency=low
+
+  * Updated to add CustomKVM provisioning
+
+ -- Max Brustkern <[e-mail]>  Mon, 02 Jul 2012 10:13:09 -0400
+
 utah (0.2ubuntu364) quantal; urgency=low
 
   * Updated script to warn user should logout and back in to pick up
 
=== added file 'utah-client_0.1_all.deb'
 Binary files utah-client_0.1_all.deb	1970-01-01 00:00:00 +0000 and utah-client_0.1_all.deb	2013-03-22 21:18:28 +0000 differ
=== modified file 'utah/provisioning/baremetal/inventory.py'
--- utah/provisioning/baremetal/inventory.py	2013-01-22 14:13:17 +0000
+++ utah/provisioning/baremetal/inventory.py	2013-03-22 21:18:28 +0000
@@ -17,8 +17,10 @@
 Provide inventory functions specific to bare metal deployments.
 """
 
+import logging
 import os
 import psutil
+
 from utah.provisioning.inventory.exceptions import \
     UTAHProvisioningInventoryException
 from utah.provisioning.inventory.sqlite import SQLiteInventory
@@ -47,6 +49,19 @@
             raise UTAHProvisioningInventoryException('No machines in database')
         self.machines = []
 
+    @staticmethod
+    def _in_use(pid):
+        try:
+            proc = psutil.Process(pid)
+        except (psutil.error.NoSuchProcess, TypeError, ValueError):
+            return None
+
+        cmdline = ' '.join(proc.cmdline)
+        if 'utah' in cmdline or 'run_test' in cmdline:
+            return proc
+
+        return None 
+
     def request(self, machinetype, name=None, *args, **kw):
         query = 'SELECT * FROM machines'
         queryvars = []
@@ -65,15 +80,11 @@
             for minfo in result:
                 machineinfo = dict(minfo)
                 pid = machineinfo['pid']
-                try:
-                    if not (psutil.pid_exists(pid) and ('utah' in
-                            ' '.join(psutil.Process(pid).cmdline)
-                            or 'run_test' in
-                            ' '.join(psutil.Process(pid).cmdline))):
-                        return self._take(machineinfo, machinetype,
-                                          *args, **kw)
-                except ValueError:
-                    continue
+                proc = self._in_use(pid)
+                if not proc:
+                    return self._take(machineinfo, machinetype, *args, **kw)
+                else:
+                    logging.info('machine in use by: %s', proc.cmdline)
 
         raise UTAHProvisioningInventoryException(
             'All machines meeting criteria are currently unavailable')