Merge lp:~jk0/nova/diagnostics-per-instance into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Added InstanceDiagnostics and InstanceActions DB models.

Added InstanceDiagnostics and InstanceActions DB models. I'm proposing this small merge now to get a validation before building anything on top of them yet.

[Vish Ishaya (vishvananda)]

Discussion from irc:

jk0: it's for this BP: https://blueprints.launchpad.net/nova/+spec/diagnostics-per-instance
[10:13am] vishy: jk0: this ultimately needs to be a message passed back from compute
[10:14am] vishy: jk0: I'm not convinced that we want that stuff in a database long term
[10:14am] vishy: jk0: but i suppose it can go in there initially
[10:15am] jk0: I'd have to rethink how we'd do that
[10:16am] vishy: jk0: eday is working on that piece for the distributed data model
[10:16am] jk0: do you think we should hold off on this until that is in place?
[10:17am] jk0: or would it make sense to keep going and refactor later on
[10:17am] vishy: jk0: just make sure that it is easy to pass the relevant data as a message, since we're trying to stop computes from writing directly to the database.

I think moving ahead with this is fine for now as long as we have a clear way to pass the updates through the queue so that ultimately the computes are not writing directly to the db.

review: Approve

[Jay Pipes (jaypipes)]

Hi!

23 + vbd_xvda_read = Column(Float)
24 + vbd_xvda_write = Column(Float)
25 + vbd_xvdb_read = Column(Float)
26 + vbd_xvdb_write = Column(Float)
27 + memory = Column(Float)
28 + memory_internal_free = Column(Float)
29 + cpu0 = Column(Float)
30 + vif_0_tx = Column(Float)
31 + vif_0_rx = Column(Float)

This seems very specific to the XenAPI. Any way to make it less specific? Also, adding columns for xvda and xvdb seems to be non-normalized... is this specific to the XenAPI or is this saying that 2 block devices named xvda and xvdb will *always* be present and will be the *only* block devices on an Instance?

Cheers!
jay

review: Needs Information

[Josh Kearney (jk0)]

Yeah, these columns are actually verbatim to what the XenAPI returns for an instance.

I'm not sure exactly how we're going to be setting up the block devices, so for now I can just remove those columns and give the others a more generic name.

[lp:~jk0/nova/diagnostics-per-instance]

470. By Josh Kearney on 2010-12-20

Make column names more generic

471. By Josh Kearney on 2010-12-21

Merged trunk

[Jay Pipes (jaypipes)]

w00t. :)

review: Approve

[lp:~jk0/nova/diagnostics-per-instance]

472. By Josh Kearney on 2010-12-21

PEP8 cleanup

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2010-12-03 21:50:30 +0000
+++ nova/db/sqlalchemy/models.py	2010-12-21 17:15:10 +0000
@@ -22,7 +22,7 @@
 import datetime
 
 from sqlalchemy.orm import relationship, backref, object_mapper
-from sqlalchemy import Column, Integer, String, schema
+from sqlalchemy import Column, Integer, Float, String, schema
 from sqlalchemy import ForeignKey, DateTime, Boolean, Text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
@@ -226,6 +226,32 @@
     #                     'shutdown', 'shutoff', 'crashed'])
 
 
+class InstanceDiagnostics(BASE, NovaBase):
+    """Represents a guest VM's diagnostics"""
+    __tablename__ = "instance_diagnostics"
+    id = Column(Integer, primary_key=True)
+    instance_id = Column(Integer, ForeignKey('instances.id'))
+
+    memory_available = Column(Float)
+    memory_free = Column(Float)
+    cpu_load = Column(Float)
+    disk_read = Column(Float)
+    disk_write = Column(Float)
+    net_tx = Column(Float)
+    net_rx = Column(Float)
+
+
+class InstanceActions(BASE, NovaBase):
+    """Represents a guest VM's actions and results"""
+    __tablename__ = "instance_actions"
+    id = Column(Integer, primary_key=True)
+    instance_id = Column(Integer, ForeignKey('instances.id'))
+
+    action = Column(String(255))
+    result = Column(Boolean)
+    error = Column(Text)
+
+
 class Volume(BASE, NovaBase):
     """Represents a block storage device that can be attached to a vm."""
     __tablename__ = 'volumes'
@@ -526,10 +552,11 @@
     it will never need to be called explicitly elsewhere.
     """
     from sqlalchemy import create_engine
-    models = (Service, Instance, Volume, ExportDevice, IscsiTarget, FixedIp,
-              FloatingIp, Network, SecurityGroup,
-              SecurityGroupIngressRule, SecurityGroupInstanceAssociation,
-              AuthToken, User, Project)  # , Image, Host
+    models = (Service, Instance, InstanceDiagnostics, InstanceActions,
+              Volume, ExportDevice, IscsiTarget, FixedIp, FloatingIp,
+              Network, SecurityGroup, SecurityGroupIngressRule,
+              SecurityGroupInstanceAssociation, AuthToken, User,
+              Project)  # , Image, Host
     engine = create_engine(FLAGS.sql_connection, echo=False)
     for model in models:
         model.metadata.create_all(engine)

=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py	2010-12-20 20:26:59 +0000
+++ nova/virt/xenapi/vm_utils.py	2010-12-21 17:15:10 +0000
@@ -229,11 +229,7 @@
         try:
             host = session.get_xenapi_host()
             host_ip = session.get_xenapi().host.get_record(host)["address"]
-            metrics = session.get_xenapi().VM_guest_metrics.get_record(
-                record["guest_metrics"])
-            diags = {
-                "Kernel": metrics["os_version"]["uname"],
-                "Distro": metrics["os_version"]["name"]}
+            diags = {}
             xml = get_rrd(host_ip, record["uuid"])
             if xml:
                 rrd = minidom.parseString(xml)