Changeset fd556d1

Timestamp:

Sep 6, 2009 3:11:36 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

e19b75c

Parents:

2b7d768

Message:

Properly communicate errors

Location:

fedd/federation

Files:

• access.py (modified) (2 diffs)
• experiment_control.py (modified) (9 diffs)

fedd/federation/access.py

@@ -1353 +1353 @@
         self.generate_ns2(topo, expfile, 
                 "/proj/%s/software/%s/" % (proj, ename), master)
-        starter = self.start_segment(keyfile=self.ssh_privkey_file, debug=self.create_debug)
-        starter(self, ename, proj, user, expfile, tmpdir)
-
-        return { 'allocID': req['allocID'] }
+        starter = self.start_segment(keyfile=self.ssh_privkey_file, 
+                debug=self.create_debug)
+        rv = starter(self, ename, proj, user, expfile, tmpdir)
+        if rv:
+            return { 'allocID': req['allocID'] }
+        else:
+            raise service_error(service_error.federant, "Swapin failed")
 
     def TerminateSegment(self, req, fid):
@@ -1392 +1395 @@
             raise service_error(service_error.internal, 
                     "Can't find experiment name for %s" % aid)
-        stopper = self.stop_segment(keyfile=self.ssh_privkey_file, debug=self.create_debug)
+        stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
+                debug=self.create_debug)
         stopper(self, user, proj, ename)
-        print { 'allocID': req['allocID'] }
         return { 'allocID': req['allocID'] }

fedd/federation/experiment_control.py

@@ -2143 +2143 @@
 
     class new_start_segment:
-        def __init__(self, debug=False, log=None, cert_file=None,
+        def __init__(self, debug=False, log=None, testbed="", cert_file=None,
                 cert_pwd=None, trusted_certs=None, caller=None):
             self.log = log
@@ -2151 +2151 @@
             self.trusted_certs = None
             self.caller = caller
+            self.testbed = testbed
 
         def __call__(self, uri, aid, topo, master, attrs=None):
@@ -2163 +2164 @@
                 req['fedAttr'] = attrs
 
-            print req
-            r = self.caller(uri, req, self.cert_file, self.cert_pwd,
-                    self.trusted_certs)
-            print r
-            return True
+            try:
+                r = self.caller(uri, req, self.cert_file, self.cert_pwd,
+                        self.trusted_certs)
+                return True
+            except service_error, e:
+                self.log.error("Start segment failed on %s: %s" % \
+                        (self.testbed, e))
+                return False
 
 
 
     class new_terminate_segment:
-        def __init__(self, debug=False, log=None, cert_file=None,
+        def __init__(self, debug=False, log=None, testbed="", cert_file=None,
                 cert_pwd=None, trusted_certs=None, caller=None):
             self.log = log
@@ -2180 +2184 @@
             self.trusted_certs = None
             self.caller = caller
+            self.testbed = testbed
 
         def __call__(self, uri, aid ):
@@ -2186 +2191 @@
                     'allocID': aid , 
                 }
-            r = self.caller(uri, req, self.cert_file, self.cert_pwd,
-                    self.trusted_certs)
-            return True
+            try:
+                r = self.caller(uri, req, self.cert_file, self.cert_pwd,
+                        self.trusted_certs)
+                return True
+            except service_error, e:
+                self.log.error("Terminate segment failed on %s: %s" % \
+                        (self.testbed, e))
+                return False
 
 
@@ -2224 +2234 @@
             t  = self.pooled_thread(\
                     target=self.new_start_segment(log=log, debug=self.debug,
-                        cert_file=self.cert_file, cert_pwd=self.cert_pwd,
+                        testbed=tb, cert_file=self.cert_file,
+                        cert_pwd=self.cert_pwd,
                         trusted_certs=self.trusted_certs,
                         caller=self.call_StartSegment), 
@@ -2251 +2262 @@
                     "No alloc id for testbed %s !?" % master)
             starter = self.new_start_segment(log=log, debug=self.debug,
-                    cert_file=self.cert_file, cert_pwd=self.cert_pwd,
-                    trusted_certs=self.trusted_certs,
+                    testbed=master, cert_file=self.cert_file,
+                    cert_pwd=self.cert_pwd, trusted_certs=self.trusted_certs,
                     caller=self.call_StartSegment)
             if not starter(uri, aid, topo[master], True, attrs):
@@ -2267 +2278 @@
                     t  = self.pooled_thread(\
                             target=self.stop_segment(log=log,
+                                testbed=tb,
                                 keyfile=self.ssh_privkey_file,
                                 debug=self.debug), 
@@ -3358 +3370 @@
                     t  = self.pooled_thread(\
                             target=self.new_terminate_segment(log=dealloc_log,
+                                testbed=tb,
                                 cert_file=self.cert_file, 
                                 cert_pwd=self.cert_pwd,