Convert test_delay rpc to new style result

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a96087e..50544fb 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6841,13 +6841,11 @@ class LUTestDelay(NoHooksLU):
         raise errors.OpExecError("Error during master delay test")
     if self.op.on_nodes:
       result = self.rpc.call_test_delay(self.op.on_nodes, self.op.duration)
         raise errors.OpExecError("Error during master delay test")
     if self.op.on_nodes:
       result = self.rpc.call_test_delay(self.op.on_nodes, self.op.duration)

-      if not result:
-        raise errors.OpExecError("Complete failure from rpc call")

       for node, node_result in result.items():
       for node, node_result in result.items():

-        node_result.Raise()
-        if not node_result.data:
-          raise errors.OpExecError("Failure during rpc call to node %s,"
-                                   " result: %s" % (node, node_result.data))
+        msg = node_result.RemoteFailMsg()
+        if msg:
+          raise errors.OpExecError("Failure during rpc call to node %s: %s"
+                                   % (node, msg))

 
 
 class IAllocator(object):
 
 
 class IAllocator(object):

diff --git a/lib/utils.py b/lib/utils.py
index 49f4c99..89436d8 100644 (file)
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1387,9 +1387,9 @@ def TestDelay(duration):
 
   """
   if duration < 0:
 
   """
   if duration < 0:

-    return False
+    return False, "Invalid sleep duration"

   time.sleep(duration)
   time.sleep(duration)

-  return True
+  return True, None

 
 
 def _CloseFDNoErr(fd, retries=5):
 
 
 def _CloseFDNoErr(fd, retries=5):