kvm: reduce number of options for cpu/ram hotplug

software/kvm/common.cfg

@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 152b052f4b418ab3138a3e109a3ec01e
+md5sum = 40c2f8ab6408d0bd24d0f3bac0e20152
 download-only = true
 on-update = true
 
@@ -108,7 +108,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = dd5c37d60f2ea3dc3a7af15718d4ac6c
+md5sum = 2a5146d009ae87fa3e9eda9b849f7dfe
 download-only = true
 on-update = true
 
@@ -186,7 +186,7 @@ ignore-existing = true
 url = ${:_profile_base_location_}/template/template-kvm-run.in
 mode = 644
 filename = template-kvm-run.in
-md5sum = 7f34fbb05f0cfdb6753e008e47cacf30
+md5sum = 98bd177c19f102ccbb30642ad7d32f3b
 download-only = true
 on-update = true
 
@@ -196,7 +196,7 @@ ignore-existing = true
 url = ${:_profile_base_location_}/template/kvm-controller-run.in
 mode = 644
 filename = kvm-controller-run.in
-md5sum = 9ba27ec934e0e86ef88493356a40bed5
+md5sum = 4d0dafef7d1f2b1ca3c641d6740bc881
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster-input-schema.json

@@ -189,36 +189,27 @@
               "default": "started",
               "enum": ["started", "stopped"]
             },
+            "enable-device-hotplug": {
+              "title": "Enable device hotplug mode",
+              "description": "If yes, this will allow to Create devices like CPU and Memory in hotplug mode without restart the VM. Operatin System should be configured to Online new created devices.",
+              "type": "boolean",
+              "default": false
+            },
             "ram-size": {
               "title": "RAM size",
               "description": "RAM size, in MB.",
               "type": "integer",
               "default": 1024,
-              "minimum": 128,
-              "multipleOf": 128
+              "minimum": 1024,
+              "multipleOf": 512
             },
-            "hotplug-slot-size": {
+            "ram-hotplug-slot-size": {
               "title": "Size of Hotpluggable RAM slot, in MB",
               "description": "Define the RAM size to plug on one hotpluggable slot in MB, understand the size of one RAM bar. The RAM hotplugged on each slot will always have the same RAM size.",
               "type": "integer",
               "default": 512,
-              "minimum": 128,
-              "multipleOf": 128
-            },
-            "max-ram-hotplug-size": {
-              "title": "Maximum hotpluggable RAM size, in MB",
-              "description": "Define the maximum size of hotpluggable memory. The size is in MB and should be a multiple of the defined hotpluggable slot size.",
-              "type": "integer",
-              "default": 0,
-              "minimum": 128,
-              "multipleOf": 128
-            },
-            "hotplugged-slot-amount": {
-              "title": "Hotplugged RAM slot amount",
-              "description": "Define the number of Memory slot to hotplug. Ex: if slot-hotplug-size=512 MB, then to hotplug 1G of RAM 2 slots will be used.",
-              "type": "integer",
-              "default": 0,
-              "minimum": 0
+              "minimum": 512,
+              "multipleOf": 512
             },
             "auto-ballooning": {
               "title": "Enable qemu auto ballooning.",
@@ -268,18 +259,6 @@
               "type": "integer",
               "minimum": 1
             },
-            "max-cpu-hotplug-count": {
-              "title": "Maximum hotpluggable CPU amount",
-              "description": "Specifies the maximum number of hotpluggable CPUs.",
-              "type": "integer",
-              "default": 1
-            },
-            "cpu-hotplug-amount": {
-              "title": "hotpluggable CPU amount",
-              "description": "Specifies the number of CPUs to hotplug",
-              "type": "integer",
-              "default": 0
-            },
             "numa": {
               "title": "Simulate a multi node NUMA system.",
               "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -51,16 +51,13 @@ config-authorized-key = {{ dumps(slapparameter_dict.get('authorized-keys') | joi
 config-nbd-port = {{ dumps(kvm_parameter_dict.get('nbd-port', 1024)) }}
 config-nbd2-port = {{ dumps(kvm_parameter_dict.get('nbd-port2', 1024)) }}
 config-ram-size = {{ dumps(kvm_parameter_dict.get('ram-size', 1024)) }}
-config-max-ram-hotplug-size = {{ dumps(kvm_parameter_dict.get('max-ram-hotplug-size', 0)) }}
-config-hotplug-slot-size = {{ dumps(kvm_parameter_dict.get('hotplug-slot-size', 512)) }}
-config-hotplugged-slot-amount = {{ dumps(kvm_parameter_dict.get('hotplugged-slot-amount', 0)) }}
+config-enable-device-hotplug = {{ dumps(kvm_parameter_dict.get('enable-device-hotplug', False)) }}
+config-ram-hotplug-slot-size = {{ dumps(kvm_parameter_dict.get('ram-hotplug-slot-size', 512)) }}
 config-disk-size = {{ dumps(kvm_parameter_dict.get('disk-size', 10)) }}
 config-disk-type = {{ dumps(kvm_parameter_dict.get('disk-type', 'virtio')) }}
 config-cpu-count = {{ dumps(kvm_parameter_dict.get('cpu-count', 1)) }}
-config-max-cpu-hotplug-count = {{ dumps(kvm_parameter_dict.get('max-cpu-hotplug-count', 1)) }}
-config-cpu-hotplug-amount = {{ dumps(kvm_parameter_dict.get('cpu-hotplug-amount', 0)) }}
 {{ setconfig('numa', kvm_parameter_dict.get('numa', '')) }}
-{{ setconfig('cpu-options', kvm_parameter_dict.get('cpu-options', '')) }}
+{{ setconfig('machine-options', kvm_parameter_dict.get('machine-options', '')) }}
 {{ setconfig('nbd-host', kvm_parameter_dict.get('nbd-host', '')) }}
 {{ setconfig('host2', kvm_parameter_dict.get('host2', '')) }}
 

software/kvm/instance-kvm-input-schema.json

@@ -4,36 +4,27 @@
 
   "title": "Input Parameters",
   "properties": {
+    "enable-device-hotplug": {
+      "title": "Enable device hotplug mode",
+      "description": "If yes, this will allow to Create devices like CPU and Memory in hotplug mode without restart the VM. Operatin System should be configured to Online new created devices.",
+      "type": "boolean",
+      "default": false
+    },
     "ram-size": {
       "title": "RAM size",
       "description": "RAM size, in MB.",
       "type": "integer",
       "default": 1024,
-      "minimum": 128,
-      "multipleOf": 128
+      "minimum": 1024,
+      "multipleOf": 512
     },
-    "hotplug-slot-size": {
+    "ram-hotplug-slot-size": {
       "title": "Size of Hotpluggable RAM slot, in MB",
       "description": "Define the RAM size to plug on one hotpluggable slot in MB, understand the size of one RAM bar. The RAM hotplugged on each slot will always have the same RAM size.",
       "type": "integer",
       "default": 512,
-      "minimum": 128,
-      "multipleOf": 128
-    },
-    "max-ram-hotplug-size": {
-      "title": "Maximum hotpluggable RAM size, in MB",
-      "description": "Define the maximum size of hotpluggable memory. The size is in MB and should be a multiple of the defined hotpluggable slot size.",
-      "type": "integer",
-      "default": 0,
-      "minimum": 128,
-      "multipleOf": 128
-    },
-    "hotplugged-slot-amount": {
-      "title": "Hotplugged RAM slot amount",
-      "description": "Define the number of Memory slot to hotplug. Ex: if slot-hotplug-size=512 MB, then to hotplug 1G of RAM 2 slots will be used.",
-      "type": "integer",
-      "default": 0,
-      "minimum": 0
+      "minimum": 512,
+      "multipleOf": 512
     },
     "auto-ballooning": {
       "title": "Enable qemu auto ballooning.",

software/kvm/instance-kvm.cfg.jinja2

@@ -5,6 +5,7 @@
 {% set nat_restrict = slapparameter_dict.get('nat-restrict-mode', 'False').lower() -%}
 {% set name = slapparameter_dict.get('name', 'localhost') -%}
 {% set disable_ansible_promise = slapparameter_dict.get('disable-ansible-promise', 'True').lower() -%}
+{% set enable_device_hotplug = slapparameter_dict.get('enable-device-hotplug', 'false').lower() -%}
 {% set instance_type = slapparameter_dict.get('type', 'standalone') -%}
 {% set nat_rule_list = slapparameter_dict.get('nat-rules', '22 80 443') -%}
 {% set frontend_software_type = 'default' -%}
@@ -66,10 +67,11 @@ python-path = {{ python_eggs_executable }}
 vnc-passwd = ${gen-passwd:passwd}
 socket-path = ${directory:var}/qmp_socket
 kvm-status-path = ${directory:var}/qemu-vm-is-ready
-cpu-hotplug-amount = ${slap-parameter:cpu-hotplug-amount}
-hotplugged-slot-amount = ${slap-parameter:hotplugged-slot-amount}
-hotplug-slot-size = ${slap-parameter:hotplug-slot-size}
-max-ram-hotplug-size = ${slap-parameter:max-ram-hotplug-size}
+cpu-count = ${slap-parameter:cpu-count}
+ram-hotplug-slot-size = ${slap-parameter:ram-hotplug-slot-size}
+ram-size = ${slap-parameter:ram-size}
+enable-device-hotplug = ${slap-parameter:enable-device-hotplug}
+init-ram-size = ${publish-early:initial-ram-size}
 
 [kvm-parameter-dict]
 python-path = {{ python_executable }}
@@ -94,11 +96,10 @@ disk-type = ${slap-parameter:disk-type}
 pid-file-path = ${directory:run}/pid_file
 socket-path = ${kvm-controller-parameter-dict:socket-path}
 
-smp-count = ${slap-parameter:cpu-count}
-max-smp-hotplug-count = ${slap-parameter:max-cpu-hotplug-count}
-ram-size = ${slap-parameter:ram-size}
-max-ram-hotplug-size = ${slap-parameter:max-ram-hotplug-size}
-hotplug-slot-size = ${slap-parameter:hotplug-slot-size}
+enable-device-hotplug = ${kvm-controller-parameter-dict:enable-device-hotplug}
+smp-count = ${kvm-controller-parameter-dict:cpu-count}
+ram-size = ${kvm-controller-parameter-dict:ram-size}
+init-ram-size = ${kvm-controller-parameter-dict:init-ram-size}
 mac-address = ${create-mac:mac-address}
 tap-mac-address = ${create-tap-mac:mac-address}
 
@@ -168,6 +169,14 @@ mode = 700
 context = 
   section parameter_dict kvm-controller-parameter-dict
 
+[publish-early]
+recipe = slapos.cookbook:publish-early
+-init =
+  initial-ram-size slap-parameter:ram-size
+{% if enable_device_hotplug == 'false' -%}
+initial-ram-size = ${slap-parameter:ram-size}
+{% endif -%}
+
 [tunnel-6to4-base]
 recipe = slapos.cookbook:wrapper
 ipv4 = ${slap-network-information:local-ipv4}
@@ -376,6 +385,7 @@ interface-url = {{ slapparameter_dict.get('monitor-interface-url', 'https://moni
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish
+initial-ram-size = ${publish-early:initial-ram-size}
 ipv6 = ${slap-network-information:global-ipv6}
 backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc_auto.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
 url = ${request-slave-frontend:connection-url}/vnc_auto.html?host=${request-slave-frontend:connection-domainname}&port=${request-slave-frontend:connection-port}&encrypt=1&path=${request-slave-frontend:connection-resource}&password=${kvm-controller-parameter-dict:vnc-passwd}
@@ -555,16 +565,13 @@ nbd-host =
 nbd2-port = 1024
 nbd2-host =
 
+enable-device-hotplug = False
 ram-size = 1024
-hotplug-slot-size = 512
-max-ram-hotplug-size = 0
-hotplugged-slot-amount = 0
+ram-hotplug-slot-size = 512
 disk-size = 10
 disk-type = virtio
 
 cpu-count = 1
-max-cpu-hotplug-count = 1
-cpu-hotplug-amount = 0
 disk-cache = writeback
 disk-aio = native
 auto-ballooning = True

software/kvm/software.cfg

@@ -5,7 +5,7 @@ extends = common.cfg
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend
 websockify = 0.5.1
 
-#slapos.toolbox = 0.73
+slapos.toolbox = 0.73
 erp5.util = 0.4.49
 apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0
@@ -45,4 +45,4 @@ paramiko = 2.0.2
 
 # Required by:
 # slapos.toolbox==0.71
-passlib = 1.6.5
+passlib = 1.6.5
\ No newline at end of file

software/kvm/template/kvm-controller-run.in

@@ -13,40 +13,48 @@ from slapos.qemuqmpclient import QemuQMPWrapper
 socket_path = '{{ parameter_dict.get("socket-path") }}'
 vnc_password = '{{ parameter_dict.get("vnc-passwd") }}'
 status_path = '{{ parameter_dict.get("kvm-status-path") }}'
-cpu_hotplug_amount = {{ parameter_dict.get("cpu-hotplug-amount", 0) }}
-cpu_model = '{{ parameter_dict.get("cpu-model", '') }}'
-max_ram_hotplug_size = {{ parameter_dict.get("max-ram-hotplug-size", 0) }}
-ram_hotplug_amount = {{ parameter_dict.get("hotplugged-slot-amount", 0) }}
-slot_hotplug_size = {{ parameter_dict.get("hotplug-slot-size", 512) }}
+cpu_amount = {{ parameter_dict.get("cpu-count") }}
+cpu_model = '{{ parameter_dict.get("cpu-model", "qemu64-x86_64-cpu") }}'
+slot_hotplug_size = {{ parameter_dict.get("ram-hotplug-slot-size", 512) }}
+init_ram_size = {{ parameter_dict.get("init-ram-size") }}
+ram_size = {{ parameter_dict.get("ram-size") }}
+enable_device_hotplug = '{{ parameter_dict.get("enable-device-hotplug") }}'.lower()
+
+def write(message):
+  with open(status_path, 'w') as status_file:
+    status_file.write(message)
 
 def update():
-  if os.path.exists(status_path):
-    os.unlink(status_path)
 
-  qemu_wrapper = QemuQMPWrapper(socket_path)
   try:
+    if cpu_amount < 1:
+      raise ValueError("CPU should be at least equal to 1.")
+    hotplug_ram = ram_size - init_ram_size
+    if hotplug_ram < 0:
+      raise ValueError("RAM size cannot be less than the initial value %s MB" % init_ram_size)
+    if os.path.exists(status_path):
+      os.unlink(status_path)
+
+    qemu_wrapper = QemuQMPWrapper(socket_path)
     qemu_wrapper.setVNCPassword(vnc_password)
-    cpu_option_dict = {
-      'device': 'cpu',
-      'amount': cpu_hotplug_amount
-    }
-    if cpu_model:
-      cpu_option_dict['model'] = cpu_model
-    qemu_wrapper.updateDevice(cpu_option_dict)
-    if max_ram_hotplug_size > 0:
+    if enable_device_hotplug == 'true':
+      write("Qemu Controller is still running...")
+      qemu_wrapper.updateDevice({
+        'device': 'cpu',
+        'amount': cpu_amount,
+        'model': cpu_model
+      })
       qemu_wrapper.updateDevice({
         'device': 'memory',
-        'mem': ram_hotplug_amount * slot_hotplug_size,
+        'mem': hotplug_ram,
         'slot': slot_hotplug_size,
-        'nslot': max_ram_hotplug_size / slot_hotplug_size
+        'nslot': 128
       })
-  except ValueError, e:
-    with open(status_path, 'w') as status_file:
-      status_file.write(str(e))
+  except Exception, e:
+    write(str(e))
     raise
 
-  with open(status_path, 'w') as status_file:
-    status_file.write("")
+  write("")
 
 if __name__ == "__main__":
   update()

software/kvm/template/template-kvm-run.in

@@ -39,12 +39,9 @@ tap_interface = '{{ parameter_dict.get("tap-interface") }}'
 listen_ip = '{{ parameter_dict.get("ipv4") }}'
 mac_address = '{{ parameter_dict.get("mac-address") }}'
 tap_mac_address = '{{ parameter_dict.get("tap-mac-address") }}'
-smp_count = {{ parameter_dict.get("smp-count") }}
-max_smp_hotplug_count = {{ parameter_dict.get("max-smp-hotplug-count") }}
 numa_list = '{{ parameter_dict.get("numa", "") }}'.split()
 ram_size = {{ parameter_dict.get("ram-size") }}
-max_ram_hotplug_size = {{ parameter_dict.get("max-ram-hotplug-size") }}
-slot_hotplug_size = {{ parameter_dict.get("hotplug-slot-size") }}
+init_ram_size = {{ parameter_dict.get("init-ram-size") }}
 pid_file_path = '{{ parameter_dict.get("pid-file-path") }}'
 external_disk_number = {{ parameter_dict.get("external-disk-number") }}
 external_disk_size = {{ parameter_dict.get("external-disk-size") }}
@@ -71,9 +68,12 @@ disk_cache = disk_cache if disk_cache in ["none", "writeback", "unsafe",
 disk_aio = '{{ parameter_dict.get("disk-aio") }}'.strip()
 disk_aio = disk_aio if disk_aio in ["threads", "native"] and \
               disk_cache == "directsync" else "threads"
+smp_count = {{ parameter_dict.get("smp-count") }}
 machine_options = '{{ parameter_dict.get("machine-options", "") }}'.strip()
 cpu_model = '{{ parameter_dict.get("cpu-model", "") }}'.strip()
 
+enable_device_hotplug = '{{ parameter_dict.get("enable-device-hotplug") }}'.lower()
+
 logfile = '{{ parameter_dict.get("log-file") }}'
 
 if hasattr(ssl, '_create_unverified_context') and url_check_certificate == 'false':
@@ -146,12 +146,6 @@ def getMapStorageList(disk_storage_dict, external_disk_number):
       lf.write('%s' % external_disk_number)
   return id_list, external_disk_number
 
-def getMemHotplugDict(max_mem_size, slot_size):
-  if max_mem_size == 0:
-    return None
-  number = max_mem_size / slot_size
-  return {'maxmem': max_mem_size + ram_size, 'slots': number}
-
 # Download existing hard drive if needed at first boot
 if not os.path.exists(disk_path) and virtual_hard_drive_url != '':
   print('Downloading virtual hard drive...')
@@ -263,18 +257,14 @@ if use_tap == 'true':
             tap_interface, vhost),
           '-device', 'virtio-net-pci,netdev=lan%s,mac=%s' % (number, tap_mac_address)]
 
-if not max_smp_hotplug_count >= 0:
-  raise ValueError("Max CPU hotpluggable count is not a valid interger")
-smp ='%s,maxcpus=%s' % (smp_count, smp_count + max_smp_hotplug_count)
-
-mem_dict = getMemHotplugDict(max_ram_hotplug_size, slot_hotplug_size)
-if mem_dict is not None:
- ram_string = '%sM,slots=%s,maxmem=%sM' % (ram_size, mem_dict['slots'], mem_dict['maxmem'])
+if enable_device_hotplug != 'true':
+  smp = '%s,maxcpus=126' % smp_count
+  ram = '%sM,slots=128,maxmem=1T' % ram_size
 else:
-  ram_string = '%s' % ram_size
+  smp = '1,maxcpus=126'
+  ram = '%sM,slots=128,maxmem=1T' % init_ram_size
 kvm_argument_list = [qemu_path,
-  '-enable-kvm', '-smp', smp, '-name', vm_name,
-  '-m', ram_string, '-vga', 'std',
+  '-enable-kvm', '-smp', smp, '-name', vm_name, '-m', ram, '-vga', 'std',
   '-drive', 'file=%s,if=%s,cache=%s,aio=%s' % (disk_path, disk_type, disk_cache, disk_aio),
   '-vnc', '%s:1,ipv4,password' % listen_ip,
   '-boot', 'order=cd,menu=on',