Merge pull request #2 from cloudify-incubator/memory_fixes

Memory fixes

Author: 0lvin

cloudify_libvirt/domain_tasks.py

@@ -29,6 +29,8 @@
 def create(**kwargs):
     ctx.logger.info("create")
     get_libvirt_params(**kwargs)
+    # dont need to run anything, we attach disc's in preconfigure state
+    # so we will define domain later
 
 
 @operation
@@ -64,18 +66,21 @@ def configure(**kwargs):
 
     if not template_params.get("resource_id"):
         template_params["resource_id"] = ctx.instance.id
-    if (not template_params.get("memmory_minsize") and
-            template_params.get('memmory_size')):
-        template_params["memmory_minsize"] = int(
-            template_params['memmory_size']) / 2
+    if (not template_params.get("memory_minsize") and
+            template_params.get('memory_size')):
+        # if have no minimal memory size, set current as minimum
+        # and twised memory as maximum
+        memory_size = int(template_params['memory_size'])
+        template_params["memory_minsize"] = memory_size
+        template_params['memory_size'] = memory_size * 2
     if not template_params.get("instance_uuid"):
         template_params["instance_uuid"] = str(uuid.uuid4())
 
     params = {"ctx": ctx}
     params.update(template_params)
     xmlconfig = template_engine.render(params)
 
-    ctx.logger.info(xmlconfig)
+    ctx.logger.info(repr(xmlconfig))
 
     dom = conn.defineXML(xmlconfig)
     if dom is None:
@@ -96,6 +101,54 @@ def configure(**kwargs):
     ctx.instance.runtime_properties['params'] = template_params
 
 
+@operation
+def start(**kwargs):
+    ctx.logger.info("start")
+
+    resource_id = ctx.instance.runtime_properties.get('resource_id')
+
+    if not resource_id:
+        ctx.logger.info("No servers for start")
+        return
+
+    libvirt_auth, _ = get_libvirt_params(**kwargs)
+    conn = libvirt.open(libvirt_auth)
+    if conn is None:
+        raise cfy_exc.NonRecoverableError(
+            'Failed to open connection to the hypervisor'
+        )
+
+    try:
+        try:
+            dom = conn.lookupByName(resource_id)
+        except Exception as e:
+            dom = None
+            ctx.logger.info("Non critical error: {}".format(str(e)))
+
+        if dom is None:
+            raise cfy_exc.NonRecoverableError(
+                'Failed to find the domain'
+            )
+
+        state, reason = dom.state()
+        for i in xrange(10):
+            state, reason = dom.state()
+
+            if state == libvirt.VIR_DOMAIN_RUNNING:
+                ctx.logger.info("Looks as running.")
+                return
+
+            ctx.logger.info("Tring to start vm {}/10".format(i))
+            if dom.create() < 0:
+                raise cfy_exc.NonRecoverableError(
+                    'Can not start guest domain.'
+                )
+            time.sleep(30)
+            state, reason = dom.state()
+    finally:
+        conn.close()
+
+
 @operation
 def stop(**kwargs):
     ctx.logger.info("stop")
@@ -290,3 +343,62 @@ def delete(**kwargs):
                 )
     finally:
         conn.close()
+
+
+def _current_use(dom):
+    total_list = dom.getCPUStats(True)
+    if len(total_list):
+        total = total_list[0]
+    else:
+        total = {}
+    return (
+        total.get('user_time', 0) + total.get('system_time', 0) +
+        total.get('cpu_time', 0)
+    ) / 1000000000.0
+
+
+@operation
+def perfomance(**kwargs):
+    ctx.logger.info("update statistics")
+    resource_id = ctx.instance.runtime_properties.get('resource_id')
+
+    if not resource_id:
+        ctx.logger.info("No servers for statistics.")
+        return
+
+    libvirt_auth, template_params = get_libvirt_params(**kwargs)
+    conn = libvirt.open(libvirt_auth)
+    if conn is None:
+        raise cfy_exc.NonRecoverableError(
+            'Failed to open connection to the hypervisor'
+        )
+
+    try:
+        try:
+            dom = conn.lookupByName(resource_id)
+        except Exception as e:
+            dom = None
+            ctx.logger.info("Non critical error: {}".format(str(e)))
+
+        if dom is None:
+            raise cfy_exc.NonRecoverableError(
+                'Failed to find the domain'
+            )
+
+        statistics = ctx.instance.runtime_properties.get('stat', {})
+
+        before_usage = _current_use(dom)
+
+        # usage generated by compare cpu_time before
+        # and after sleep for 5 seconds.
+        ctx.logger.debug("Used: {} seconds.".format(before_usage))
+        time.sleep(5)
+        statistics['cpu'] = 100 * (_current_use(dom) - before_usage) / 5
+
+        memory = dom.memoryStats()
+        statistics['memory'] = memory.get('actual', 0) / 1024.0
+        ctx.instance.runtime_properties['stat'] = statistics
+
+        ctx.logger.info("Statistics: {}".format(repr(statistics)))
+    finally:
+        conn.close()

cloudify_libvirt/templates/domain.xml

@@ -3,7 +3,7 @@
     <partition>/machine</partition>
   </resource>
   <uuid>{{ instance_uuid }}</uuid>
-  <currentMemory unit="KiB">{{ memmory_minsize }}</currentMemory>
+  <currentMemory unit="KiB">{{ memory_minsize }}</currentMemory>
   <on_poweroff>destroy</on_poweroff>
   <devices>
     <console type="pty" tty="/dev/pts/1">
@@ -56,7 +56,7 @@
     <acpi/>
     <apic/>
   </features>
-  <memory unit="KiB">{{ memmory_size }}</memory>
+  <memory unit="KiB">{{ memory_size }}</memory>
   <os>
     <type machine="pc" arch="x86_64">hvm</type>
     <boot dev="hd"/>

examples/cluster.yaml

@@ -110,7 +110,7 @@ node_templates:
           inputs:
             params:
               vcpu: 2
-              memmory_size: 1048576
+              memory_size: 1048576
               networks:
                 - network: { get_attribute: [common_network, resource_id] }
                   dev: vnet0

examples/templates/domain-arm.xml

@@ -3,7 +3,7 @@
     <partition>/machine</partition>
   </resource>
   <uuid>{{ instance_uuid }}</uuid>
-  <currentMemory unit="KiB">{{ memmory_minsize }}</currentMemory>
+  <currentMemory unit="KiB">{{ memory_minsize }}</currentMemory>
   <on_poweroff>destroy</on_poweroff>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
@@ -63,7 +63,7 @@
   <features>
     <gic version='2'/>
   </features>
-  <memory unit="KiB">{{ memmory_size }}</memory>
+  <memory unit="KiB">{{ memory_size }}</memory>
   <os>
     <type arch='aarch64' machine='virt'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>

examples/vm_agent.yaml

@@ -77,7 +77,7 @@ node_templates:
         create:
           inputs:
             params:
-              memmory_size: 524288
+              memory_size: 524288
               networks:
                 - network: { get_attribute: [common_network, resource_id] }
                   dev: vnet0

examples/vm_centos.amd64.yaml

@@ -74,7 +74,7 @@ node_templates:
           inputs:
             params:
               vcpu: 2
-              memmory_size: 524288
+              memory_size: 524288
               networks:
                 - network: { get_attribute: [common_network, resource_id] }
                   dev: vnet0

examples/vm_fabric.amd64.yaml

@@ -74,7 +74,7 @@ node_templates:
           inputs:
             params:
               vcpu: 2
-              memmory_size: 524288
+              memory_size: 524288
               networks:
                 - network: { get_attribute: [common_network, resource_id] }
                   dev: vnet0

examples/vm_fabric.arm64.yaml

@@ -68,7 +68,7 @@ node_templates:
         create:
           inputs:
             params:
-              memmory_size: 524288
+              memory_size: 524288
               nvram: { get_attribute: [disk_clone, bios_flash] }
               disks:
                 - bus: scsi

plugin.yaml

@@ -20,18 +20,26 @@ node_types:
         configure:
           implementation: libvirt.cloudify_libvirt.domain_tasks.configure
           inputs: {}
-        suspend:
-          implementation: libvirt.cloudify_libvirt.domain_tasks.suspend
-          inputs: {}
-        resume:
-          implementation: libvirt.cloudify_libvirt.domain_tasks.resume
+        start:
+          implementation: libvirt.cloudify_libvirt.domain_tasks.start
           inputs: {}
         stop:
           implementation: libvirt.cloudify_libvirt.domain_tasks.stop
           inputs: {}
         delete:
           implementation: libvirt.cloudify_libvirt.domain_tasks.delete
           inputs: {}
+        # suspend/resume
+        suspend:
+          implementation: libvirt.cloudify_libvirt.domain_tasks.suspend
+          inputs: {}
+        resume:
+          implementation: libvirt.cloudify_libvirt.domain_tasks.resume
+          inputs: {}
+      cloudify.interfaces.statistics:
+        perfomance:
+          implementation: libvirt.cloudify_libvirt.domain_tasks.perfomance
+          inputs: {}
 
   cloudify.libvirt.network:
     derived_from: cloudify.nodes.Network