From ddfe2228618b1310621f4f636dc85c9bc20d709b Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 6 Aug 2009 13:27:27 +0200
Subject: [PATCH] Handle None result from BlockdevFind
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
daemons/ganeti-noded | 7 ++++++-
lib/cmdlib.py | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 941a25fc3..b4c0105ea 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -214,7 +214,12 @@ class NodeHttpServer(http.server.HttpServer):
"""
disk = objects.Disk.FromDict(params[0])
- return backend.BlockdevFind(disk).ToDict()
+
+ result = backend.BlockdevFind(disk)
+ if result is None:
+ return None
+
+ return result.ToDict()
@staticmethod
def perspective_blockdev_snapshot(params):
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 40c8a539d..255bfe0df 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6309,6 +6309,8 @@ class LUQueryInstanceData(NoHooksLU):
result.Raise("Can't compute disk status for %s" % instance_name)
status = result.payload
+ if status is None:
+ return None
return (status.dev_path, status.major, status.minor,
status.sync_percent, status.estimated_time,
--
GitLab