From 5d6a88b0c4b6b09f5d5a2ef85dd8f865fde7e688 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 21 Mar 2015 11:02:47 +0100
Subject: [PATCH] DRBDPlugin: fix bug in status

---
 PVE/Storage/DRBDPlugin.pm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/PVE/Storage/DRBDPlugin.pm b/PVE/Storage/DRBDPlugin.pm
index 2b4cea1..6e85370 100644
--- a/PVE/Storage/DRBDPlugin.pm
+++ b/PVE/Storage/DRBDPlugin.pm
@@ -226,22 +226,26 @@ sub list_images {
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
+    my ($total, $avail, $used);
+    
     eval {
 	my $hdl = connect_drbdmanage_service();
 	my ($rc, $res) = $hdl->cluster_free_query($scfg->{redundancy});
 	check_drbd_rc($rc->[0]);
 
-	my $avail = $res;
-	my $used = 0; # fixme
-	my $total = $used + $avail;
+	$avail = $res;
+	$used = 0; # fixme
+	$total = $used + $avail;
 
-	return ($total, $avail, $used, 1);
     };
-
-    # ignore error,
-    # assume storage if offline
+    if (my $err = $@) {
+	# ignore error,
+	# assume storage if offline
     
-    return undef;
+	return undef;
+    }
+
+    return ($total, $avail, $used, 1);
 }
 
 sub activate_storage {