Fix bad changelog entries

1. Add documentation on the node selector flags. In the API, reference
the daemon configuration manual which now includes details in this
section; in the CLI, provide the help in "pvc vm define" in detail and
then reference that command's help in the other commands that use this
field.

2. Ensure the naming is consistent in the CLI, using the flag name
"--node-selector" everywhere (was "--selector" for "pvc vm" commands and
"--node-selector" for "pvc provisioner" commands).

.version

@@ -1 +1 @@
-0.9.49
+0.9.50

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## PVC Changelog
 
+###### [v0.9.50](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.50)
+
+  * [Node Daemon/API/CLI] Adds free memory node selector
+  * [Node Daemon] Fixes bug sending space-containing detect disk strings
+
 ###### [v0.9.49](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.49)
 
   * [Node Daemon] Fixes bugs with OSD stat population on creation

api-daemon/pvcapid/Daemon.py

@@ -25,7 +25,7 @@ import yaml
 from distutils.util import strtobool as dustrtobool
 
 # Daemon version
-version = "0.9.49"
+version = "0.9.50"
 
 # API version
 API_VERSION = 1.0

api-daemon/pvcapid/flaskapi.py

@@ -1002,7 +1002,7 @@ class API_VM_Root(Resource):
                     type: string
                 node_selector:
                   type: string
-                  description: The selector used to determine candidate nodes during migration
+                  description: The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference
                 node_autostart:
                   type: boolean
                   description: Whether to autostart the VM when its node returns to ready domain state
@@ -1252,7 +1252,7 @@ class API_VM_Root(Resource):
             {"name": "node"},
             {
                 "name": "selector",
-                "choices": ("mem", "vcpus", "load", "vms", "none"),
+                "choices": ("mem", "memfree", "vcpus", "load", "vms", "none"),
                 "helptext": "A valid selector must be specified",
             },
             {"name": "autostart"},
@@ -1297,13 +1297,15 @@ class API_VM_Root(Resource):
             name: selector
             type: string
             required: false
-            description: The selector used to determine candidate nodes during migration
-            default: mem
+            description: The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference
+            default: none
             enum:
               - mem
+              - memfree
               - vcpus
               - load
               - vms
+              - none (cluster default)
           - in: query
             name: autostart
             type: boolean
@@ -1397,7 +1399,7 @@ class API_VM_Element(Resource):
             {"name": "node"},
             {
                 "name": "selector",
-                "choices": ("mem", "vcpus", "load", "vms", "none"),
+                "choices": ("mem", "memfree", "vcpus", "load", "vms", "none"),
                 "helptext": "A valid selector must be specified",
             },
             {"name": "autostart"},
@@ -1444,10 +1446,11 @@ class API_VM_Element(Resource):
             name: selector
             type: string
             required: false
-            description: The selector used to determine candidate nodes during migration
-            default: mem
+            description: The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference
+            default: none
             enum:
               - mem
+              - memfree
               - vcpus
               - load
               - vms
@@ -1626,7 +1629,7 @@ class API_VM_Metadata(Resource):
                     type: string
                 node_selector:
                   type: string
-                  description: The selector used to determine candidate nodes during migration
+                  description: The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference
                 node_autostart:
                   type: string
                   description: Whether to autostart the VM when its node returns to ready domain state
@@ -1646,7 +1649,7 @@ class API_VM_Metadata(Resource):
             {"name": "limit"},
             {
                 "name": "selector",
-                "choices": ("mem", "vcpus", "load", "vms", "none"),
+                "choices": ("mem", "memfree", "vcpus", "load", "vms", "none"),
                 "helptext": "A valid selector must be specified",
             },
             {"name": "autostart"},
@@ -1675,12 +1678,14 @@ class API_VM_Metadata(Resource):
             name: selector
             type: string
             required: false
-            description: The selector used to determine candidate nodes during migration
+            description: The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference
             enum:
               - mem
+              - memfree
               - vcpus
               - load
               - vms
+              - none (cluster default)
           - in: query
             name: autostart
             type: boolean

client-cli/pvc/pvc.py

@@ -803,11 +803,11 @@ def cli_vm():
 )
 @click.option(
     "-s",
-    "--selector",
+    "--node-selector",
     "node_selector",
-    default="mem",
+    default="none",
     show_default=True,
-    type=click.Choice(["mem", "load", "vcpus", "vms", "none"]),
+    type=click.Choice(["mem", "memfree", "load", "vcpus", "vms", "none"]),
     help='Method to determine optimal target node during autoselect; "none" will use the default for the cluster.',
 )
 @click.option(
@@ -857,6 +857,18 @@ def vm_define(
 ):
     """
     Define a new virtual machine from Libvirt XML configuration file VMCONFIG.
+
+    The target node selector ("--node-selector"/"-s") can be "none" to use the cluster default, or one of the following values:
+      * "mem": choose the node with the least provisioned VM memory
+      * "memfree": choose the node with the most (real) free memory
+      * "vcpus": choose the node with the least allocated VM vCPUs
+      * "load": choose the node with the lowest current load average
+      * "vms": choose the node with the least number of provisioned VMs
+
+    For most clusters, "mem" should be sufficient, but others may be used based on the cluster workload and available resources. The following caveats should be considered:
+      * "mem" looks at the provisioned memory, not the allocated memory; thus, stopped or disabled VMs are counted towards a node's memory for this selector, even though their memory is not actively in use.
+      * "memfree" looks at the free memory of the node in general, ignoring the amount provisioned to VMs; if any VM's internal memory usage changes, this value would be affected. This might be preferable to "mem" on clusters with very high memory utilization versus total capacity or if many VMs are stopped/disabled.
+      * "load" looks at the system load of the node in general, ignoring load in any particular VMs; if any VM's CPU usage changes, this value would be affected. This might be preferable on clusters with some very CPU intensive VMs.
     """
 
     # Open the XML file
@@ -898,11 +910,11 @@ def vm_define(
 )
 @click.option(
     "-s",
-    "--selector",
+    "--node-selector",
     "node_selector",
     default=None,
     show_default=False,
-    type=click.Choice(["mem", "load", "vcpus", "vms", "none"]),
+    type=click.Choice(["mem", "memfree", "load", "vcpus", "vms", "none"]),
     help='Method to determine optimal target node during autoselect; "none" will use the default for the cluster.',
 )
 @click.option(
@@ -942,6 +954,8 @@ def vm_meta(
 ):
     """
     Modify the PVC metadata of existing virtual machine DOMAIN. At least one option to update must be specified. DOMAIN may be a UUID or name.
+
+    For details on the "--node-selector"/"-s" values, please see help for the command "pvc vm define".
     """
 
     if (
@@ -4102,7 +4116,9 @@ def provisioner_template_system_list(limit):
 @click.option(
     "--node-selector",
     "node_selector",
-    type=click.Choice(["mem", "vcpus", "vms", "load", "none"], case_sensitive=False),
+    type=click.Choice(
+        ["mem", "memfree", "vcpus", "vms", "load", "none"], case_sensitive=False
+    ),
     default="none",
     help='Method to determine optimal target node during autoselect; "none" will use the default for the cluster.',
 )
@@ -4135,6 +4151,8 @@ def provisioner_template_system_add(
 ):
     """
     Add a new system template NAME to the PVC cluster provisioner.
+
+    For details on the possible "--node-selector" values, please see help for the command "pvc vm define".
     """
     params = dict()
     params["name"] = name
@@ -4194,7 +4212,9 @@ def provisioner_template_system_add(
 @click.option(
     "--node-selector",
     "node_selector",
-    type=click.Choice(["mem", "vcpus", "vms", "load", "none"], case_sensitive=False),
+    type=click.Choice(
+        ["mem", "memfree", "vcpus", "vms", "load", "none"], case_sensitive=False
+    ),
     help='Method to determine optimal target node during autoselect; "none" will use the default for the cluster.',
 )
 @click.option(
@@ -4226,6 +4246,8 @@ def provisioner_template_system_modify(
 ):
     """
     Add a new system template NAME to the PVC cluster provisioner.
+
+    For details on the possible "--node-selector" values, please see help for the command "pvc vm define".
     """
     params = dict()
     params["vcpus"] = vcpus

client-cli/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pvc",
-    version="0.9.49",
+    version="0.9.50",
     packages=["pvc", "pvc.cli_lib"],
     install_requires=[
         "Click",

daemon-common/common.py

@@ -639,6 +639,8 @@ def findTargetNode(zkhandler, dom_uuid):
     # Execute the search
     if search_field == "mem":
         return findTargetNodeMem(zkhandler, node_limit, dom_uuid)
+    if search_field == "memfree":
+        return findTargetNodeMemFree(zkhandler, node_limit, dom_uuid)
     if search_field == "load":
         return findTargetNodeLoad(zkhandler, node_limit, dom_uuid)
     if search_field == "vcpus":
@@ -677,7 +679,7 @@ def getNodes(zkhandler, node_limit, dom_uuid):
 
 
 #
-# via free memory (relative to allocated memory)
+# via provisioned memory
 #
 def findTargetNodeMem(zkhandler, node_limit, dom_uuid):
     most_provfree = 0
@@ -698,6 +700,24 @@ def findTargetNodeMem(zkhandler, node_limit, dom_uuid):
     return target_node
 
 
+#
+# via free memory
+#
+def findTargetNodeMemFree(zkhandler, node_limit, dom_uuid):
+    most_memfree = 0
+    target_node = None
+
+    node_list = getNodes(zkhandler, node_limit, dom_uuid)
+    for node in node_list:
+        memfree = int(zkhandler.read(("node.memory.free", node)))
+
+        if memfree > most_memfree:
+            most_memfree = memfree
+            target_node = node
+
+    return target_node
+
+
 #
 # via load average
 #

debian/changelog

@@ -1,3 +1,10 @@
+pvc (0.9.50-0) unstable; urgency=high
+
+  * [Node Daemon/API/CLI] Adds free memory node selector
+  * [Node Daemon] Fixes bug sending space-containing detect disk strings
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Wed, 06 Jul 2022 16:01:14 -0400
+
 pvc (0.9.49-0) unstable; urgency=high
 
   * [Node Daemon] Fixes bugs with OSD stat population on creation

docs/manuals/daemon.md

@@ -353,7 +353,19 @@ The password for the PVC node daemon to log in to the IPMI interface.
 
 * *required*
 
-The selector algorithm to use when migrating hosts away from the node. Valid `selector` values are: `mem`: the node with the least allocated VM memory; `vcpus`: the node with the least allocated VM vCPUs; `load`: the node with the least current load average; `vms`: the node with the least number of provisioned VMs.
+The default selector algorithm to use when migrating VMs away from a node; individual VMs can override this default.
+
+Valid `target_selector` values are:
+  * `mem`: choose the node with the least provisioned VM memory
+  * `memfree`: choose the node with the most (real) free memory
+  * `vcpus`: choose the node with the least allocated VM vCPUs
+  * `load`: choose the node with the lowest current load average
+  * `vms`: choose the node with the least number of provisioned VMs
+
+For most clusters, `mem` should be sufficient, but others may be used based on the cluster workload and available resources. The following caveats should be considered:
+  * `mem` looks at the provisioned memory, not the allocated memory; thus, stopped or disabled VMs are counted towards a node's memory for this selector, even though their memory is not actively in use.
+  * `memfree` looks at the free memory of the node in general, ignoring the amount provisioned to VMs; if any VM's internal memory usage changes, this value would be affected. This might be preferable to `mem` on clusters with very high memory utilization versus total capacity or if many VMs are stopped/disabled.
+  * `load` looks at the system load of the node in general, ignoring load in any particular VMs; if any VM's CPU usage changes, this value would be affected. This might be preferable on clusters with some very CPU intensive VMs.
 
 #### `system` → `configuration` → `directories` → `dynamic_directory`
 

docs/manuals/swagger.json

@@ -192,7 +192,7 @@
                     "type": "array"
                 },
                 "node_selector": {
-                    "description": "The selector used to determine candidate nodes during migration",
+                    "description": "The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference",
                     "type": "string"
                 }
             },
@@ -1414,7 +1414,7 @@
                     "type": "array"
                 },
                 "node_selector": {
-                    "description": "The selector used to determine candidate nodes during migration",
+                    "description": "The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference",
                     "type": "string"
                 },
                 "profile": {
@@ -6173,13 +6173,15 @@
                         "type": "string"
                     },
                     {
-                        "default": "mem",
-                        "description": "The selector used to determine candidate nodes during migration",
+                        "default": "none",
+                        "description": "The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference",
                         "enum": [
                             "mem",
+                            "memfree",
                             "vcpus",
                             "load",
-                            "vms"
+                            "vms",
+                            "none (cluster default)"
                         ],
                         "in": "query",
                         "name": "selector",
@@ -6330,10 +6332,11 @@
                         "type": "string"
                     },
                     {
-                        "default": "mem",
-                        "description": "The selector used to determine candidate nodes during migration",
+                        "default": "none",
+                        "description": "The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference",
                         "enum": [
                             "mem",
+                            "memfree",
                             "vcpus",
                             "load",
                             "vms",
@@ -6591,12 +6594,14 @@
                         "type": "string"
                     },
                     {
-                        "description": "The selector used to determine candidate nodes during migration",
+                        "description": "The selector used to determine candidate nodes during migration; see 'target_selector' in the node daemon configuration reference",
                         "enum": [
                             "mem",
+                            "memfree",
                             "vcpus",
                             "load",
-                            "vms"
+                            "vms",
+                            "none (cluster default)"
                         ],
                         "in": "query",
                         "name": "selector",

node-daemon/pvcnoded.sample.yaml

@@ -122,7 +122,7 @@ pvc:
         pass: Passw0rd
     # migration: Migration option configuration
     migration:
-      # target_selector: Criteria to select the ideal migration target, options: mem, load, vcpus, vms
+      # target_selector: Criteria to select the ideal migration target, options: mem, memfree, load, vcpus, vms
       target_selector: mem
     # configuration: Local system configurations
     configuration:

node-daemon/pvcnoded/Daemon.py

@@ -48,7 +48,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.49"
+version = "0.9.50"
 
 
 ##########################################################

node-daemon/pvcnoded/objects/CephInstance.py

@@ -1239,8 +1239,9 @@ class CephSnapshotInstance(object):
 # Primary command function
 # This command pipe is only used for OSD adds and removes
 def ceph_command(zkhandler, logger, this_node, data, d_osd):
-    # Get the command and args
-    command, args = data.split()
+    # Get the command and args; the * + join ensures arguments with spaces (e.g. detect strings) are recombined right
+    command, *args = data.split()
+    args = " ".join(args)
 
     # Adding a new OSD
     if command == "osd_add":