Changeset d5e3b8e for fedd


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    r4ea1e22 rd5e3b8e  
    586586                    return sub.wait() == 0
    587587            else:
    588                 return True
     588                if timeout == 0:
     589                    self.log.debug("debug timeout raised on %s " % sh_str)
     590                    raise self.ssh_cmd_timeout()
     591                else:
     592                    return True
    589593
    590594    class start_segment(emulab_segment):
     
    724728
    725729                if timedout:
    726                     state = self.get_state(user, host, self.ssh_privkey_file,
    727                             tb, eid, pid)
     730                    state = self.get_state(user, host, tb, eid, pid)
    728731                    if state != "swapped":
    729732                        return False
     
    795798                    return False
    796799            except self.ssh_cmd_timeout:
    797                 print "modexp timeout"
     800                self.log.error("Modify command failed to complete in time")
    798801                # There's really no way to see if this succeeded or failed, so
    799802                # if it hangs, assume the worst.
     
    815818                # report success.
    816819                if timedout:
    817                     state = self.get_state(user, host, self.ssh_privkey_file,
    818                             tb, eid, pid)
    819                     self.log.debug("[start_segment]: swapin timed out (state)")
     820                    self.log.debug("[start_segment]: swapin timed out " +\
     821                            "checking state")
     822                    state = self.get_state(user, host, tb, eid, pid)
     823                    self.log.debug("[start_segment]: state is %s" % state)
    820824                    return state == 'active'
    821825            # Everything has gone OK.
Note: See TracChangeset for help on using the changeset viewer.