Change in vdsm[master]: mom: Report the status of the mom threads - vdsm-patches - Fedora mailing-lists

16 Nov 2012

Adam Litke has uploaded a new change for review.
Change subject: mom: Report the status of the mom threads
......................................................................
mom: Report the status of the mom threads
It will be useful to check on the status of the MOM threads.  Add a new field to
the HostStats structure to provide this information.
Change-Id: Ibd36a5c3a91abfa3fa29c811ce9b3586bf0bda36
Signed-off-by: Adam Litke agl@us.ibm.com
---
M vdsm/API.py
M vdsm/momIF.py
M vdsm_api/vdsmapi-schema.json
3 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/9287/1

diff --git a/vdsm/API.py b/vdsm/API.py
index 202afc8..cb1f4cc 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1120,8 +1120,10 @@
         stats['dateTime'] = '%02d-%02d-%02dT%02d:%02d:%02d GMT' % (
                 tm_year, tm_mon, tm_day, tm_hour, tm_min, tm_sec)
         if self._cif.mom:
+            stats['momStatus'] = self._cif.mom.getStatus()
             stats.update(self._cif.mom.getKsmStats())
         else:
+            stats['momStatus'] = 'disabled'
             stats['ksmState'] = self._cif.ksmMonitor.state
             stats['ksmPages'] = self._cif.ksmMonitor.pages
             stats['ksmCpu'] = self._cif.ksmMonitor.cpuUsage
diff --git a/vdsm/momIF.py b/vdsm/momIF.py
index 827e9e4..cbe94d0 100644
--- a/vdsm/momIF.py
+++ b/vdsm/momIF.py
@@ -55,3 +55,9 @@
         if self._mom is not None:
             self.log.info("Shutting down MOM")
             self._mom.shutdown()
+
+    def getStatus(self):
+        if self.isAlive():
+            return 'active'
+        else:
+            return 'stopped'
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index 6591410..149bfef 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -1420,6 +1420,22 @@
  'key': 'str', 'value': 'PathStats'}
##
+# @MOMStatus:
+#
+# An enumeration of possible MOM statuses.
+#
+# @disabled:  MOM is not enabled on this host
+#
+# @active:    MOM is enabled and running
+#
+# @stopped:   MOM has terminated
+#
+# Since: 4.10.1
+##
+{'enum': 'MOMStatus', 'data': ['disabled', 'active', 'stopped']}
+
+
+##
 # @HostStats:
 #
 # Statistics about this host.
@@ -1490,6 +1506,8 @@
 #
 # @generationID:    A @UUID that is refreshed each time vdsm starts
 #
+# @momStatus:       The current status of the MOM policy engine
+#
 # Since: 4.10.0
 ##
 {'type': 'HostStats',
@@ -1506,7 +1524,8 @@
            'swapTotal': 'int', 'swapFree': 'int','vmCount': 'int',
            'vmActive': 'int', 'vmMigrating': 'int', 'dateTime': 'str',
            'ksmState': 'bool', 'ksmPages': 'int', 'ksmCpu': 'float',
-           'netConfigDirty': 'bool', 'generationID': 'UUID'}
+           'netConfigDirty': 'bool', 'generationID': 'UUID',
+           'momStatus': 'MOMStatus'}
##
 # @Host.getStats:
--
To view, visit http://gerrit.ovirt.org/9287
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd36a5c3a91abfa3fa29c811ce9b3586bf0bda36
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke agl@us.ibm.com

    