From 2b17c3c40d30ac69de36a3913d8def381a3b23e8 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 7 Jan 2009 14:38:29 +0000
Subject: [PATCH] _AssembleInstanceDisks: fix rpcresult handling
Commit 2117 changed _AssembleInstanceDisks to correctly parse the
failure status of the new RpcResult structure, but it didn't fix the
storing of only the result payload. Since RpcResult is not JSON
serializable, LUActivateInstanceDisks is failing.
Reviewed-by: ultrotter
---
lib/cmdlib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 20d7c8535..92567a729 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2402,7 +2402,7 @@ def _AssembleInstanceDisks(lu, instance, ignore_secondaries=False):
" (is_primary=True, pass=2)",
inst_disk.iv_name, node)
disks_ok = False
- device_info.append((instance.primary_node, inst_disk.iv_name, result))
+ device_info.append((instance.primary_node, inst_disk.iv_name, result.data))
# leave the disks configured for the primary node
# this is a workaround that would be fixed better by
--
GitLab