Changeset d5e3b8e

Timestamp:

Jul 28, 2009 9:38:22 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

3c20a31

Parents:

4ea1e22

Message:

Hopefully fixed a timeout bug

File:

• fedd/federation/experiment_control.py (modified) (4 diffs)

fedd/federation/experiment_control.py

@@ -586 +586 @@
                     return sub.wait() == 0
             else:
-                return True
+                if timeout == 0:
+                    self.log.debug("debug timeout raised on %s " % sh_str)
+                    raise self.ssh_cmd_timeout()
+                else:
+                    return True
 
     class start_segment(emulab_segment):
@@ -724 +728 @@
 
                 if timedout:
-                    state = self.get_state(user, host, self.ssh_privkey_file, 
-                            tb, eid, pid)
+                    state = self.get_state(user, host, tb, eid, pid)
                     if state != "swapped":
                         return False
@@ -795 +798 @@
                     return False
             except self.ssh_cmd_timeout:
-                print "modexp timeout"
+                self.log.error("Modify command failed to complete in time")
                 # There's really no way to see if this succeeded or failed, so
                 # if it hangs, assume the worst.
@@ -815 +818 @@
                 # report success.
                 if timedout:
-                    state = self.get_state(user, host, self.ssh_privkey_file,
-                            tb, eid, pid)
-                    self.log.debug("[start_segment]: swapin timed out (state)")
+                    self.log.debug("[start_segment]: swapin timed out " +\
+                            "checking state")
+                    state = self.get_state(user, host, tb, eid, pid)
+                    self.log.debug("[start_segment]: state is %s" % state)
                     return state == 'active'
             # Everything has gone OK.