[NEW PATCH] BZ#732765 - Don't return empty strings for 'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo (via gerrit-bot)
6:06 a.m.
New patch submitted by Igor Lvovsky (ilvovsky(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/862
commit d9e65876c7e35379a535762505692001c2b7387a
Author: Igor Lvovsky <ilvovsky(a)redhat.com>
Date: Mon Aug 29 12:54:56 2011 +0300
BZ#732765 - Don't return empty strings for 'disktotal'/'diskfree'
on unreachable domains during getStoragePoolInfo
Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 4fbf95f..b381936 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -1072,11 +1072,13 @@ class StoragePool:
try:
stats.update(SDF.produce(item).getStats())
except:
- self.log.error("Could get information for domain
`%s`", item, exc_info=True)
+ self.log.error("Could not get information for domain
%s", item, exc_info=True)
# Domain is unavailable and we have nothing in the cache
- # Return defaults
- stats['disktotal'] = ""
- stats['diskfree'] = ""
+ try:
+ del(stats['disktotal'])
+ del(stats['diskfree'])
+ except KeyError:
+ pass
stats['alerts'] = alerts
stats['status'] = domDict[item]
9:50 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Saggi Mizrahi has submitted this change and it was merged.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
BZ#732765 - Don't return empty strings for 'disktotal'/'diskfree' on
unreachable domains during getStoragePoolInfo
Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
---
M vdsm/storage/sp.py
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Saggi Mizrahi: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
9:50 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Saggi Mizrahi has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 3: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
8:07 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Igor Lvovsky has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 2: (1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1080: stats.pop('diskfree', None)
Ooops, you are right. forgot remove it
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
7:53 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Saggi Mizrahi has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 2: (1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1080: stats.pop('diskfree', None)
The default value is on purpose. If the value exists pop it, if not, all the better
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
7:50 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Eduardo Warszawski has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 2: I would prefer that you didn't submit this
(1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1080: stats.pop('diskfree', None)
If you use pop() with default value None, there is no KeyError.
Remove the case.
This except clause is confuse, why not split the main try clause?
Shorter is better.
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Ayal Baron
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
6:18 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Saggi Mizrahi has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 2: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
3:10 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Igor Lvovsky has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 2: Verified
verified by omri
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
7:40 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Igor Lvovsky has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: (1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1078: del(stats['disktotal'])
1. OK, I'll change del/pop behavior
2. According to RHEV-M they preferred or both values or nothing, they can't handle
partial situation
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
6 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: (1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1078: del(stats['disktotal'])
I meant
stats.pop('disktotal', None)
sorry.
current implementation may keep 'diskfree' if it was the only one.
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
3:21 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Igor Lvovsky has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: (1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1078: del(stats['disktotal'])
First, stats.pop for non-existing key will raise same KeyError exeption, so I still need
try-except.
Second, I don't want to return only 'disktotal' or 'diskfree'. I am
preferred to returned both of them or no-one
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
6:18 p.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: I would prefer that you didn't submit this
(1 inline comment)
....................................................
File vdsm/storage/sp.py
Line 1078: del(stats['disktotal'])
I think
stats.pop('disktotal')
is nicer (no need for try-except) and a bit safer, since the 'disktotal' could be
missing while 'diskfree' remain.
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
6:50 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Igor Lvovsky has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: Verified
Verified by Omri
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
6:41 a.m.
New subject: Change in vdsm[master]: BZ#732765 - Don't return empty strings for 'disktotal'/'disk...
Saggi Mizrahi has posted comments on this change.
Change subject: BZ#732765 - Don't return empty strings for
'disktotal'/'diskfree' on unreachable domains during getStoragePoolInfo
......................................................................
Patch Set 1: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.usersys.redhat.com/862
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I64ae55b4942cf5748d3d8ada445a3381498ea258
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
4647
days inactive
4649
days old
vdsm-patches@lists.fedorahosted.org
13 comments
4 participants
participants (4)
-
Dan Kenigsberg -
ewarszaw＠redhat.com -
Igor Lvovsky -
smizrahi＠redhat.com