git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes for 3.0
[monitor.git]
/
reboot.py
diff --git
a/reboot.py
b/reboot.py
index
67be293
..
ba641c4
100755
(executable)
--- a/
reboot.py
+++ b/
reboot.py
@@
-296,11
+296,12
@@
class IPAL(PCUControl):
try:
# TODO: make sleep backoff, before stopping.
try:
# TODO: make sleep backoff, before stopping.
- time.sleep(
4
)
+ time.sleep(
8
)
ret = s.recv(count, socket.MSG_DONTWAIT)
except socket.error, e:
if e[0] == errno.EAGAIN:
ret = s.recv(count, socket.MSG_DONTWAIT)
except socket.error, e:
if e[0] == errno.EAGAIN:
- raise Exception(e[1])
+ #raise Exception(e[1])
+ raise ExceptionNotFound(e[1])
else:
# TODO: not other exceptions.
raise Exception(e)
else:
# TODO: not other exceptions.
raise Exception(e)
@@
-321,6
+322,8
@@
class IPAL(PCUControl):
if e[0] == errno.ECONNREFUSED:
# cannot connect to remote host
raise Exception(e[1])
if e[0] == errno.ECONNREFUSED:
# cannot connect to remote host
raise Exception(e[1])
+ elif e[0] == errno.ETIMEDOUT:
+ raise ExceptionTimeout(e[1])
else:
# TODO: what other conditions are there?
raise Exception(e)
else:
# TODO: what other conditions are there?
raise Exception(e)
@@
-343,6
+346,8
@@
class IPAL(PCUControl):
elif status == '0':
# down
power_on = False
elif status == '0':
# down
power_on = False
+ elif status == '6':
+ raise ExceptionPort("IPAL reported 'Cable Error' on %s socket %s : %s" % (self.host, node_port, ret))
else:
raise Exception("Unknown status for PCU %s socket %s : %s" % (self.host, node_port, ret))
else:
else:
raise Exception("Unknown status for PCU %s socket %s : %s" % (self.host, node_port, ret))
else:
@@
-371,6
+376,8
@@
class IPAL(PCUControl):
elif status == '0':
# down
power_on = False
elif status == '0':
# down
power_on = False
+ elif status == '6':
+ raise ExceptionPort("IPAL reported 'Cable Error' on %s socket %s : %s" % (self.host, node_port, ret))
else:
raise Exception("Unknown status for PCU %s socket %s : %s" % (self.host, node_port, ret))
else:
else:
raise Exception("Unknown status for PCU %s socket %s : %s" % (self.host, node_port, ret))
else: