Merge pull request #123 from hinesmr/provisioning_fix

SPECCloud: Fix wrong DigitalOcean provisioning time

Author: ibmcb

lib/auxiliary/gui.py

@@ -66,6 +66,7 @@ def __init__(self, msci, base_uri, time_vars, msattrs, cloud_name) :
         self.time_vars = time_vars 
         self.base_uri = base_uri
         self.start_time = int(self.time_vars["start_time"])
+        self.pid = "none"
         self.processid = "none"
         self.cn = cloud_name
         self.msattrs = msattrs

lib/clouds/do_cloud_ops.py

@@ -30,6 +30,7 @@
 from libcloud.compute.types import NodeState
 
 import threading
+import traceback
 
 catalogs = threading.local()
 
@@ -627,6 +628,8 @@ def vmcreate(self, obj_attr_list) :
             cbwarn("Error during reservation creation: " + _fmsg)
 
         except Exception, e :
+            for line in traceback.format_exc().splitlines() :
+                cbwarn(line, True)
             _status = 23
             _fmsg = str(e)
             cbwarn("Error reaching digitalocean: " + _fmsg)
@@ -642,7 +645,7 @@ def vmcreate(self, obj_attr_list) :
                 cberr(_msg)
 
                 if "cloud_vm_uuid" in obj_attr_list :
-                    obj_attr_list["mgt_deprovisioning_request_originated"] = int(time())
+                    obj_attr_list["mgt_901_deprovisioning_request_originated"] = int(time())
                     self.vmdestroy(obj_attr_list)
                 else :
                     if _reservation :
@@ -662,14 +665,8 @@ def vmdestroy(self, obj_attr_list) :
             _status = 100
             _fmsg = "An error has occurred, but no error message was captured"
 
-            _time_mark_drs = int(time())
             _wait = int(obj_attr_list["update_frequency"])
 
-            if "mgt_901_deprovisioning_request_originated" not in obj_attr_list :
-                obj_attr_list["mgt_901_deprovisioning_request_originated"] = _time_mark_drs
-
-            obj_attr_list["mgt_902_deprovisioning_request_sent"] = _time_mark_drs - int(obj_attr_list["mgt_901_deprovisioning_request_originated"])
-
             cbdebug("Last known state: " + str(obj_attr_list["last_known_state"]))
 
             _wait = int(obj_attr_list["update_frequency"])
@@ -683,12 +680,17 @@ def vmdestroy(self, obj_attr_list) :
             _msg += "...."
             cbdebug(_msg, True)
 
+            firsttime = True
+            _time_mark_drs = int(time())
             while True :
                 _errmsg = "get_vm_instance"
                 cbdebug("Getting instance...")
                 _instance = self.get_vm_instance(obj_attr_list)
                 if not _instance :
                     cbdebug("Breaking...")
+                    if firsttime :
+                        if "mgt_901_deprovisioning_request_originated" not in obj_attr_list :
+                            obj_attr_list["mgt_901_deprovisioning_request_originated"] = _time_mark_drs
                     break
 
                 if _instance.state == NodeState.PENDING :
@@ -701,7 +703,16 @@ def vmdestroy(self, obj_attr_list) :
                     continue
 
                 try :
+                    if firsttime :
+                        if "mgt_901_deprovisioning_request_originated" not in obj_attr_list :
+                            obj_attr_list["mgt_901_deprovisioning_request_originated"] = _time_mark_drs
+
                     result = _instance.destroy()
+
+                    if firsttime :
+                        obj_attr_list["mgt_902_deprovisioning_request_sent"] = int(time()) - int(obj_attr_list["mgt_901_deprovisioning_request_originated"])
+
+                    firsttime = False
                 except :
                     pass
 
@@ -740,6 +751,8 @@ def vmdestroy(self, obj_attr_list) :
             cberr("CldOpsException: " + str(obj), True)
 
         except Exception, e :
+            for line in traceback.format_exc().splitlines() :
+                cbwarn(line, True)
             _status = 23
             _fmsg = str(e)
             cberr("Exception: " + str(e), True)
@@ -961,6 +974,9 @@ def aidefine(self, obj_attr_list, current_step) :
                 self.osci.pending_object_set(obj_attr_list["cloud_name"], "AI", \
                     obj_attr_list["uuid"], "credential_pair", credentials_pair)
 
+                # Cache libcloud objects for this daemon / process before the VMs are attached
+                self.connect(credentials_pair)
+
             _fmsg = "An error has occurred, but no error message was captured"
 
             self.take_action_if_requested("AI", obj_attr_list, current_step)