Peter V. Saveliev has uploaded a new change for review.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call. ......................................................................
add "uptime" field to the getStats (getVdsStats in vdsClient) call.
"uptime" field, measured in seconds, contains VDSM run time since start, actually -- since first API.py import
Signed-off-by: Peter V. Saveliev peet@redhat.com Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 --- M vdsm/API.py 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/8008/1
diff --git a/vdsm/API.py b/vdsm/API.py index 566d6e5..2c21a9e 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -47,7 +47,7 @@ USER_SHUTDOWN_MESSAGE = 'System going down'
PAGE_SIZE_BYTES = os.sysconf('SC_PAGESIZE') - +STARTTIME = time.time()
class APIBase(object):
@@ -1103,6 +1103,7 @@
stats['netConfigDirty'] = str(self._cif._netConfigDirty) stats['generationID'] = self._cif._generationID + stats['uptime'] = time.time() - STARTTIME return {'status': doneCode, 'info': stats}
def setLogLevel(self, level):
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com
Peter V. Saveliev has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call. ......................................................................
Patch Set 1: Verified
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com
Ryan Harper has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call. ......................................................................
Patch Set 1: I would prefer that you didn't submit this
Please update vdsm_api/vdsmapi-schema.json as well with this patch.
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Peter V. Saveliev has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: Verified
Thanks, Ryan, I completely forgot about json scheme.
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Ryan Harper has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Dan Kenigsberg has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: I would prefer that you didn't submit this
(1 inline comment)
.................................................... Commit Message Line 6: Line 7: add "uptime" field to the getStats (getVdsStats in vdsClient) call Line 8: Line 9: "uptime" field, measured in seconds, contains VDSM run time since Line 10: start, actually -- since first API.py import would you explain why we want this field? Does Engine need it for anything? Wouldn't generationID be enough? Line 11: Line 12: Signed-off-by: Peter V. Saveliev peet@redhat.com
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com
Shu Ming has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: I would prefer that you didn't submit this
(1 inline comment)
.................................................... File vdsm/API.py Line 1102: stats['memShared'] = self._memShared() / Mbytes Line 1103: Line 1104: stats['netConfigDirty'] = str(self._cif._netConfigDirty) Line 1105: stats['generationID'] = self._cif._generationID Line 1106: stats['uptime'] = time.time() - STARTTIME I don't like STARTTIME to be a global one. Would it better to store it in some other places like self._cif.starttime? Line 1107: return {'status': doneCode, 'info': stats} Line 1108: Line 1109: def setLogLevel(self, level): Line 1110: """
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
Peter V. Saveliev has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: (2 inline comments)
.................................................... Commit Message Line 6: Line 7: add "uptime" field to the getStats (getVdsStats in vdsClient) call Line 8: Line 9: "uptime" field, measured in seconds, contains VDSM run time since Line 10: start, actually -- since first API.py import Engine, maybe, does not need it, it was invented for testing purposes and post-mortem analysis.
No, generationID is not enough, as it doesn't store uptime information, we can only know from it that VDSM was (or was not) restarted. Nor how much times it was restarted, neither how long time it runs already.
The reason of «uptime» field was just the same as the system uptime, and the next step would be some simple and reliable analogue of wtmp and last -x for VDSM. Line 11: Line 12: Signed-off-by: Peter V. Saveliev peet@redhat.com
.................................................... File vdsm/API.py Line 1102: stats['memShared'] = self._memShared() / Mbytes Line 1103: Line 1104: stats['netConfigDirty'] = str(self._cif._netConfigDirty) Line 1105: stats['generationID'] = self._cif._generationID Line 1106: stats['uptime'] = time.time() - STARTTIME Will it be enough, if starttime will be implemented as APIBase or ClientIF static member? Line 1107: return {'status': doneCode, 'info': stats} Line 1108: Line 1109: def setLogLevel(self, level): Line 1110: """
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
Gal Hammer has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: (2 inline comments)
.................................................... File vdsm/API.py Line 1102: stats['memShared'] = self._memShared() / Mbytes Line 1103: Line 1104: stats['netConfigDirty'] = str(self._cif._netConfigDirty) Line 1105: stats['generationID'] = self._cif._generationID Line 1106: stats['uptime'] = time.time() - STARTTIME I think the whole "math" should be done in the ClientIF and not in the API. Line 1107: return {'status': doneCode, 'info': stats} Line 1108: Line 1109: def setLogLevel(self, level): Line 1110: """
.................................................... File vdsm_api/vdsmapi-schema.json Line 1500: 'swapTotal': 'int', 'swapFree': 'int','vmCount': 'int', Line 1501: 'vmActive': 'int', 'vmMigrating': 'int', 'dateTime': 'str', Line 1502: 'ksmState': 'bool', 'ksmPages': 'int', 'ksmCpu': 'float', Line 1503: 'netConfigDirty': 'bool', 'generationID': 'UUID', Line 1504: 'uptime': 'float'} I don't like the field name. It is part of the host's stats so I assume this is the host's uptime and not vdsm's.
vdsmUptime will be more appropriate in my opinion. Line 1505: Line 1506: ## Line 1507: # @Host.getStats: Line 1508: #
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
Peter V. Saveliev has posted comments on this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File vdsm_api/vdsmapi-schema.json Line 1500: 'swapTotal': 'int', 'swapFree': 'int','vmCount': 'int', Line 1501: 'vmActive': 'int', 'vmMigrating': 'int', 'dateTime': 'str', Line 1502: 'ksmState': 'bool', 'ksmPages': 'int', 'ksmCpu': 'float', Line 1503: 'netConfigDirty': 'bool', 'generationID': 'UUID', Line 1504: 'uptime': 'float'} ok Line 1505: Line 1506: ## Line 1507: # @Host.getStats: Line 1508: #
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
Peter V. Saveliev has abandoned this change.
Change subject: add "uptime" field to the getStats (getVdsStats in vdsClient) call ......................................................................
Patch Set 2: Abandoned
-- To view, visit http://gerrit.ovirt.org/8008 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: abandon Gerrit-Change-Id: Ibc998117e25faff17c2f3f6d66e2a961fc93e029 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Gal Hammer ghammer@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Peter V. Saveliev peet@redhat.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
vdsm-patches@lists.fedorahosted.org