Changeset 58e5a4f

Timestamp:

Oct 7, 2011 5:30:13 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

451fb96

Parents:

05c41f5 (diff), 1fed67b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

Location:

fedd/federation

Files:

• emulab_access.py (modified) (5 diffs)
• emulab_segment.py (modified) (1 diff)
• experiment_control.py (modified) (1 diff)
• local_emulab_segment.py (modified) (2 diffs)
• proxy_emulab_segment.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -933 +933 @@
         user = None
         alloc_log = None
+        nonce_experiment = False
         vchars_re = '[^' + string.ascii_letters + string.digits  + '-]'
 
@@ -973 +974 @@
             for i in range(0,5):
                 ename += random.choice(string.ascii_letters)
+            nonce_experiment = True
             self.log.warn("No experiment name or suggestion too long: " + \
                     "picked one randomly: %s" % ename)
@@ -988 +990 @@
             user = self.allocation[aid].get('user', None)
             self.allocation[aid]['experiment'] = ename
+            self.allocation[aid]['nonce'] = nonce_experiment
             self.allocation[aid]['log'] = [ ]
             # Create a logger that logs to the experiment's state object as
@@ -1162 +1165 @@
             user = self.allocation[aid].get('user', None)
             ename = self.allocation[aid].get('experiment', None)
+            nonce = self.allocation[aid].get('nonce', False)
         else:
             proj = None
             user = None
             ename = None
+            nonce = False
         self.state_lock.release()
 
@@ -1183 +1188 @@
         stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
                 debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert)
-        stopper(self, user, proj, ename, gid)
+        stopper(self, user, proj, ename, gid, nonce)
         return { 'allocID': req['allocID'], 'proof': proof.to_dict() }

fedd/federation/emulab_segment.py

@@ -156 +156 @@
         return code == 0
 
+    def terminate_exp(self, pid, eid, wait=True):
+        """
+        Completely terminate experiment
+        """
+        if self.debug:
+            if self.log:
+                self.log.info("[swap_exp]: (debug) terminate %s" %  eid)
+            return True
+        else:
+            if self.log:
+                self.log.info("[swap_exp]: Terminating %s" % (eid)
+            params = {
+                    'proj': pid,
+                    'exp': eid,
+                    'wait': wait,
+                    }
+            code, value = self.emulab_call('experiment.endexp', params)
+
+            if self.log:
+                if code == 0: self.log.info('[swap_exp]: Terminate succeeded')
+                else: self.log.error('[swap_exp]: Terminate failed: %s' % value)
+
+        return code == 0
+
     def modify_exp(self, pid, eid, tcl, wait=True):
         if self.debug:

fedd/federation/experiment_control.py

@@ -789 +789 @@
 
         os.remove(dotname)
-        if rv == 0 : return vis
+        # XXX: graphviz seems to use low return codes for warnings, like
+        # "couldn't find font"
+        if rv < 2 : return vis
         else: return None
 

fedd/federation/local_emulab_segment.py

@@ -103 +103 @@
         emulab_segment.__init__(self, boss=boss, cert=cert)
 
-    def __call__(self, parent, user, pid, eid, gid=None):
+    def __call__(self, parent, user, pid, eid, gid=None, terminate=False):
         """
         Stop a sub experiment by calling swapexp on the federant
@@ -114 +114 @@
             self.cmd_with_timeout("rm -rf /proj/%s/software/%s" % (pid, eid))
             rv = self.swap_exp(pid, eid, 'out')
+            if terminate:
+                rv = self.terminate_exp(pid, eid)
         except self.cmd_timeout:
             rv = False

fedd/federation/proxy_emulab_segment.py

@@ -330 +330 @@
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
 
-    def __call__(self, parent, user, pid, eid, gid=None):
+    def __call__(self, parent, user, pid, eid, gid=None, terminate=False):
         """
         Stop a sub experiment by calling swapexp on the federant
@@ -343 +343 @@
             rv = self.ssh_cmd(user, host,
                     "/usr/testbed/bin/swapexp -w %s %s out" % (pid, eid))
+            if terminate:
+                rv = self.ssh_cmd(user, host,
+                        "/usr/testbed/bin/endexp -w %s %s" % (pid, eid))
         except self.ssh_cmd_timeout:
             rv = False