Bump version to 0.9.55

Can cause log flooding in some edge cases and isn't really needed any
longer. Use a proper conditional followed by an actual error handler.

.version

@@ -1 +1 @@
-0.9.52
+0.9.55

CHANGELOG.md

@@ -1,5 +1,19 @@
 ## PVC Changelog
 
+###### [v0.9.55](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.55)
+
+  * Fixes a problem with the literal eval handler in the provisioner (again)
+  * Fixes a potential log deadlock in Zookeeper-lost situations when doing keepalives
+
+###### [v0.9.54](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.54)
+
+[CLI Client] Fixes a bad variable reference from the previous change
+[API Daemon] Enables TLSv1 with an SSLContext object for maximum compatibility
+
+###### [v0.9.53](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.53)
+
+  * [API] Fixes sort order of VM list (for real this time)
+
 ###### [v0.9.52](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.52)
 
   * [CLI] Fixes a bug with vm modify not requiring a cluster

api-daemon/pvcapid/Daemon.py

@@ -22,10 +22,12 @@
 import os
 import yaml
 
+from ssl import SSLContext, TLSVersion
+
 from distutils.util import strtobool as dustrtobool
 
 # Daemon version
-version = "0.9.52"
+version = "0.9.55"
 
 # API version
 API_VERSION = 1.0
@@ -123,7 +125,10 @@ def entrypoint():
     import pvcapid.flaskapi as pvc_api  # noqa: E402
 
     if config["ssl_enabled"]:
-        context = (config["ssl_cert_file"], config["ssl_key_file"])
+        context = SSLContext()
+        context.minimum_version = TLSVersion.TLSv1
+        context.get_ca_certs()
+        context.load_cert_chain(config["ssl_cert_file"], keyfile=config["ssl_key_file"])
     else:
         context = None
 

client-cli/pvc/cli_lib/provisioner.py

@@ -26,6 +26,7 @@ from requests_toolbelt.multipart.encoder import (
 
 import pvc.cli_lib.ansiprint as ansiprint
 from pvc.cli_lib.common import UploadProgressBar, call_api
+from ast import literal_eval
 
 
 #
@@ -792,10 +793,16 @@ def task_status(config, task_id=None, is_watching=False):
                         task["type"] = task_type
                     task["worker"] = task_host
                     task["id"] = task_job.get("id")
-                    task_args = task_job.get("args")
+                    try:
+                        task_args = literal_eval(task_job.get("args"))
+                    except Exception:
+                        task_args = task_job.get("args")
                     task["vm_name"] = task_args[0]
                     task["vm_profile"] = task_args[1]
-                    task_kwargs = task_job.get("kwargs")
+                    try:
+                        task_kwargs = literal_eval(task_job.get("kwargs"))
+                    except Exception:
+                        task_kwargs = task_job.get("kwargs")
                     task["vm_define"] = str(bool(task_kwargs["define_vm"]))
                     task["vm_start"] = str(bool(task_kwargs["start_vm"]))
                     task_data.append(task)

client-cli/pvc/pvc.py

@@ -1353,7 +1353,7 @@ def vm_stop(domain, confirm_flag):
 @click.argument("domain")
 @click.option(
     "--force",
-    "force",
+    "force_flag",
     is_flag=True,
     default=False,
     help="Forcibly stop the VM instead of waiting for shutdown.",

client-cli/setup.py

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

daemon-common/vm.py

@@ -1292,4 +1292,4 @@ def get_list(zkhandler, node, state, tag, limit, is_fuzzy=True, negate=False):
             except Exception:
                 pass
 
-    return True, vm_data_list
+    return True, sorted(vm_data_list, key=lambda d: d["name"])

debian/changelog

@@ -1,3 +1,23 @@
+pvc (0.9.55-0) unstable; urgency=high
+
+  * Fixes a problem with the literal eval handler in the provisioner (again)
+  * Fixes a potential log deadlock in Zookeeper-lost situations when doing keepalives
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 04 Oct 2022 13:21:40 -0400
+
+pvc (0.9.54-0) unstable; urgency=high
+
+[CLI Client] Fixes a bad variable reference from the previous change
+[API Daemon] Enables TLSv1 with an SSLContext object for maximum compatibility
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 23 Aug 2022 11:01:05 -0400
+
+pvc (0.9.53-0) unstable; urgency=high
+
+  * [API] Fixes sort order of VM list (for real this time)
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Fri, 12 Aug 2022 17:47:11 -0400
+
 pvc (0.9.52-0) unstable; urgency=high
 
   * [CLI] Fixes a bug with vm modify not requiring a cluster

node-daemon/pvcnoded/Daemon.py

@@ -48,7 +48,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.52"
+version = "0.9.55"
 
 
 ##########################################################

node-daemon/pvcnoded/util/keepalive.py

@@ -661,15 +661,19 @@ def node_keepalive(logger, config, zkhandler, this_node):
                     zkhandler.read("base.config.migration_target_selector")
                     != config["migration_target_selector"]
                 ):
-                    raise
+                    zkhandler.write(
+                        [
+                            (
+                                "base.config.migration_target_selector",
+                                config["migration_target_selector"],
+                            )
+                        ]
+                    )
             except Exception:
-                zkhandler.write(
+                logger.out(
-                    [
+                    "Failed to set migration target selector in Zookeeper",
-                        (
+                    state="e",
-                            "base.config.migration_target_selector",
+                    prefix="main-thread",
-                            config["migration_target_selector"],
-                        )
-                    ]
                 )
 
     # Set the upstream IP in Zookeeper for clients to read
@@ -680,10 +684,14 @@ def node_keepalive(logger, config, zkhandler, this_node):
                     zkhandler.read("base.config.upstream_ip")
                     != config["upstream_floating_ip"]
                 ):
-                    raise
+                    zkhandler.write(
+                        [("base.config.upstream_ip", config["upstream_floating_ip"])]
+                    )
             except Exception:
-                zkhandler.write(
+                logger.out(
-                    [("base.config.upstream_ip", config["upstream_floating_ip"])]
+                    "Failed to set upstream floating IP in Zookeeper",
+                    state="e",
+                    prefix="main-thread",
                 )
 
     # Get past state and update if needed