Bump version to 0.9.91

Shows each subarg of the task_args as its own element, if applicable,
and fits the width to the terminal using MAX_CONTENT_WIDTH instead of an
arbitrary value.

.version

@@ -1 +1 @@
-0.9.90
+0.9.91

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## PVC Changelog
 
+###### [v0.9.91](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.91)
+
+  * [Client CLI] Fixes a bug and improves output during cluster task events.
+  * [Client CLI] Improves the output of the task list display.
+  * [Provisioner] Fixes some missing cloud-init modules in the default debootstrap script.
+  * [Client CLI] Fixes a bug with a missing argument to the vm_define helper function.
+  * [All] Fixes inconsistent package find + rm commands to avoid errors in dpkg.
+
 ###### [v0.9.90](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.90)
 
   * [Client CLI/API Daemon] Adds additional backup metainfo and an emailed report option to autobackups.

api-daemon/provisioner/examples/script/3-debootstrap.py

@@ -589,11 +589,13 @@ After=multi-user.target
                  - migrator
                  - bootcmd
                  - write-files
+                 - growpart
                  - resizefs
                  - set_hostname
                  - update_hostname
                  - update_etc_hosts
                  - ca-certs
+                 - users-groups
                  - ssh
                 
                 cloud_config_modules:

api-daemon/pvcapid/Daemon.py

@@ -27,7 +27,7 @@ from distutils.util import strtobool as dustrtobool
 import daemon_lib.config as cfg
 
 # Daemon version
-version = "0.9.90"
+version = "0.9.91"
 
 # API version
 API_VERSION = 1.0

client-cli/pvc/cli/cli.py

@@ -687,7 +687,10 @@ def cli_cluster_task(task_id, wait_flag, format_function):
 
     if wait_flag:
         # First validate that this is actually a valid task that is running
+        echo(CLI_CONFIG, "Querying cluster for tasks...", newline=False)
         retcode, retdata = pvc.lib.common.task_status(CLI_CONFIG, None)
+        echo(CLI_CONFIG, " done.")
+        echo(CLI_CONFIG, "")
         if task_id in [i["id"] for i in retdata]:
             task = [i for i in retdata if i["id"] == task_id][0]
             retmsg = wait_for_celery_task(
@@ -699,7 +702,10 @@ def cli_cluster_task(task_id, wait_flag, format_function):
             retmsg = f"No task with ID {task_id} found."
         finish(retcode, retmsg)
     else:
+        echo(CLI_CONFIG, "Querying cluster for tasks...", newline=False)
         retcode, retdata = pvc.lib.common.task_status(CLI_CONFIG, task_id)
+        echo(CLI_CONFIG, " done.")
+        echo(CLI_CONFIG, "")
         finish(retcode, retdata, format_function)
 
 

client-cli/pvc/cli/formatters.py

@@ -645,6 +645,24 @@ def cli_cluster_task_format_pretty(CLI_CONFIG, task_data):
         if _task_type_length > task_type_length:
             task_type_length = _task_type_length
 
+        for arg_name, arg_data in task["kwargs"].items():
+            # Skip the "run_on" argument
+            if arg_name == "run_on":
+                continue
+
+            # task_arg_name column
+            _task_arg_name_length = len(str(arg_name)) + 1
+            if _task_arg_name_length > task_arg_name_length:
+                task_arg_name_length = _task_arg_name_length
+
+    task_header_length = (
+        task_id_length + task_name_length + task_type_length + task_worker_length + 3
+    )
+    max_task_data_length = (
+        MAX_CONTENT_WIDTH - task_header_length - task_arg_name_length - 2
+    )
+
+    for task in task_data:
         updated_kwargs = list()
         for arg_name, arg_data in task["kwargs"].items():
             # Skip the "run_on" argument
@@ -656,15 +674,30 @@ def cli_cluster_task_format_pretty(CLI_CONFIG, task_data):
             if _task_arg_name_length > task_arg_name_length:
                 task_arg_name_length = _task_arg_name_length
 
-            if len(str(arg_data)) > 17:
+            if isinstance(arg_data, list):
-                arg_data = arg_data[:17] + "..."
+                for subarg_data in arg_data:
+                    if len(subarg_data) > max_task_data_length:
+                        subarg_data = (
+                            str(subarg_data[: max_task_data_length - 4]) + " ..."
+                        )
 
-            # task_arg_data column
+                    # task_arg_data column
-            _task_arg_data_length = len(str(arg_data)) + 1
+                    _task_arg_data_length = len(str(subarg_data)) + 1
-            if _task_arg_data_length > task_arg_data_length:
+                    if _task_arg_data_length > task_arg_data_length:
-                task_arg_data_length = _task_arg_data_length
+                        task_arg_data_length = _task_arg_data_length
+
+                    updated_kwargs.append({"name": arg_name, "data": subarg_data})
+            else:
+                if len(str(arg_data)) > 24:
+                    arg_data = str(arg_data[:24]) + " ..."
+
+                    # task_arg_data column
+                    _task_arg_data_length = len(str(arg_data)) + 1
+                    if _task_arg_data_length > task_arg_data_length:
+                        task_arg_data_length = _task_arg_data_length
+
+                updated_kwargs.append({"name": arg_name, "data": arg_data})
 
-            updated_kwargs.append({"name": arg_name, "data": arg_data})
         task["kwargs"] = updated_kwargs
         tasks.append(task)
 

client-cli/pvc/cli/waiters.py

@@ -115,6 +115,8 @@ def wait_for_celery_task(CLI_CONFIG, task_detail, start_late=False):
         )
         while True:
             sleep(0.5)
+            if isinstance(task_status, tuple):
+                continue
             if task_status.get("state") != "RUNNING":
                 break
             if task_status.get("current") > last_task:

client-cli/pvc/lib/vm.py

@@ -89,6 +89,7 @@ def vm_define(
     node_selector,
     node_autostart,
     migration_method,
+    migration_max_downtime,
     user_tags,
     protected_tags,
 ):
@@ -96,7 +97,7 @@ def vm_define(
     Define a new VM on the cluster
 
     API endpoint: POST /vm
-    API arguments: xml={xml}, node={node}, limit={node_limit}, selector={node_selector}, autostart={node_autostart}, migration_method={migration_method}, user_tags={user_tags}, protected_tags={protected_tags}
+    API arguments: xml={xml}, node={node}, limit={node_limit}, selector={node_selector}, autostart={node_autostart}, migration_method={migration_method}, migration_max_downtime={migration_max_downtime}, user_tags={user_tags}, protected_tags={protected_tags}
     API schema: {"message":"{data}"}
     """
     params = {
@@ -105,6 +106,7 @@ def vm_define(
         "selector": node_selector,
         "autostart": node_autostart,
         "migration_method": migration_method,
+        "migration_max_downtime": migration_max_downtime,
         "user_tags": user_tags,
         "protected_tags": protected_tags,
     }

client-cli/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pvc",
-    version="0.9.90",
+    version="0.9.91",
     packages=["pvc.cli", "pvc.lib"],
     install_requires=[
         "Click",

debian/changelog

@@ -1,3 +1,13 @@
+pvc (0.9.91-0) unstable; urgency=high
+
+  * [Client CLI] Fixes a bug and improves output during cluster task events.
+  * [Client CLI] Improves the output of the task list display.
+  * [Provisioner] Fixes some missing cloud-init modules in the default debootstrap script.
+  * [Client CLI] Fixes a bug with a missing argument to the vm_define helper function.
+  * [All] Fixes inconsistent package find + rm commands to avoid errors in dpkg.
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 23 Jan 2024 10:02:19 -0500
+
 pvc (0.9.90-0) unstable; urgency=high
 
   * [Client CLI/API Daemon] Adds additional backup metainfo and an emailed report option to autobackups.

debian/pvc-client-cli.postinst

@@ -2,7 +2,12 @@
 
 # Generate the bash completion configuration
 if [ -d /etc/bash_completion.d ]; then
+    echo "Installing BASH completion configuration"
     _PVC_COMPLETE=source_bash pvc > /etc/bash_completion.d/pvc
 fi
 
+# Remove any cached CPython directories or files
+echo "Cleaning up CPython caches"
+find /usr/lib/python3/dist-packages/pvc -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true
+
 exit 0

debian/pvc-daemon-api.preinst

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Remove any cached CPython directories or files
-echo "Cleaning up existing CPython files"
+echo "Cleaning up CPython caches"
-find /usr/share/pvc/pvcapid -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true
+find /usr/share/pvc/pvcapid -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true

debian/pvc-daemon-common.preinst

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Remove any cached CPython directories or files
+echo "Cleaning up CPython caches"
+find /usr/share/pvc/daemon_lib -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true

debian/pvc-daemon-health.preinst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # Remove any cached CPython directories or files
-echo "Cleaning up existing CPython files"
+echo "Cleaning up CPython caches"
-find /usr/share/pvc/pvchealthd -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true
+find /usr/share/pvc/pvchealthd -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true
-find /usr/share/pvc/plugins -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true
+find /usr/share/pvc/plugins -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true

debian/pvc-daemon-node.preinst

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Remove any cached CPython directories or files
-echo "Cleaning up existing CPython files"
+echo "Cleaning up CPython caches"
-find /usr/share/pvc/pvcnoded -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true
+find /usr/share/pvc/pvcnoded -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true

debian/pvc-daemon-worker.preinst

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Remove any cached CPython directories or files
-echo "Cleaning up existing CPython files"
+echo "Cleaning up CPython caches"
-find /usr/share/pvc/pvcworkerd -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true
+find /usr/share/pvc/pvcworkerd -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true

debian/rules

@@ -13,7 +13,7 @@ override_dh_python3:
 	rm -r $(CURDIR)/client-cli/.pybuild $(CURDIR)/client-cli/pvc.egg-info
 
 override_dh_auto_clean:
-	find . -name "__pycache__" -o -name ".pybuild" -exec rm -r {} \; || true
+	find . -name "__pycache__" -o -name ".pybuild" -exec rm -fr {} + || true
 
 # If you need to rebuild the Sphinx documentation
 # Add spinxdoc to the dh --with line

health-daemon/pvchealthd/Daemon.py

@@ -33,7 +33,7 @@ import os
 import signal
 
 # Daemon version
-version = "0.9.90"
+version = "0.9.91"
 
 
 ##########################################################

node-daemon/pvcnoded/Daemon.py

@@ -49,7 +49,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.90"
+version = "0.9.91"
 
 
 ##########################################################

worker-daemon/pvcworkerd/Daemon.py

@@ -44,7 +44,7 @@ from daemon_lib.vmbuilder import (
 )
 
 # Daemon version
-version = "0.9.90"
+version = "0.9.91"
 
 
 config = cfg.get_configuration()