Bump version to 0.9.88

.version

@@ -1 +1 @@
-0.9.89
+0.9.88

CHANGELOG.md

@@ -1,10 +1,5 @@
 ## PVC Changelog
 
-###### [v0.9.89](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.89)
-
-  * [API/Worker Daemons] Fixes a bug with the Celery result backends not being properly initialized on Debian 10/11.
-  * [API Daemon] Fixes a bug if VM CPU stats are missing on Debian 10.
-
 ###### [v0.9.88](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.88)
 
   * [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats.

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.89"
+version = "0.9.88"
 
 # API version
 API_VERSION = 1.0

api-daemon/pvcapid/flaskapi.py

@@ -118,7 +118,7 @@ celery_task_uri = "redis://{}:{}{}".format(
 celery = Celery(
     app.name,
     broker=celery_task_uri,
-    backend=celery_task_uri,
+    result_backend=celery_task_uri,
     result_extended=True,
 )
 app.config["broker_url"] = celery_task_uri

build-and-deploy.sh

@@ -68,8 +68,8 @@ for HOST in ${HOSTS[@]}; do
     ssh $HOST $SUDO systemctl restart pvcworkerd &>/dev/null
     sleep 2
     ssh $HOST $SUDO systemctl restart pvchealthd &>/dev/null
-#    sleep 2
+    sleep 2
-#    ssh $HOST $SUDO systemctl restart pvcnoded &>/dev/null
+    ssh $HOST $SUDO systemctl restart pvcnoded &>/dev/null
     echo " done."
     echo -n "Waiting for node daemon to be running..."
     while [[ $( ssh $HOST "pvc -q node list -f json ${HOST%%.*} | jq -r '.[].daemon_state'" 2>/dev/null ) != "run" ]]; do

client-cli/setup.py

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

daemon-common/cluster.py

@@ -1187,10 +1187,7 @@ def get_resource_metrics(zkhandler):
     )
     output_lines.append("# TYPE pvc_vm_vcpus_cpu_time gauge")
     for vm in vm_data:
-        try:
+        cpu_time = vm["vcpu_stats"]["cpu_time"] / 1000000
-            cpu_time = vm["vcpu_stats"]["cpu_time"] / 1000000
-        except Exception:
-            cpu_time = 0
         output_lines.append(f"pvc_vm_vcpus_cpu_time{{vm=\"{vm['name']}\"}} {cpu_time}")
 
     output_lines.append(
@@ -1198,10 +1195,7 @@ def get_resource_metrics(zkhandler):
     )
     output_lines.append("# TYPE pvc_vm_vcpus_user_time gauge")
     for vm in vm_data:
-        try:
+        user_time = vm["vcpu_stats"]["user_time"] / 1000000
-            user_time = vm["vcpu_stats"]["user_time"] / 1000000
-        except Exception:
-            cpu_time = 0
         output_lines.append(
             f"pvc_vm_vcpus_user_time{{vm=\"{vm['name']}\"}} {user_time}"
         )
@@ -1211,10 +1205,7 @@ def get_resource_metrics(zkhandler):
     )
     output_lines.append("# TYPE pvc_vm_vcpus_system_time gauge")
     for vm in vm_data:
-        try:
+        system_time = vm["vcpu_stats"]["system_time"] / 1000000
-            system_time = vm["vcpu_stats"]["system_time"] / 1000000
-        except Exception:
-            system_time = 0
         output_lines.append(
             f"pvc_vm_vcpus_system_time{{vm=\"{vm['name']}\"}} {system_time}"
         )

debian/changelog

@@ -1,10 +1,3 @@
-pvc (0.9.89-0) unstable; urgency=high
-
-  * [API/Worker Daemons] Fixes a bug with the Celery result backends not being properly initialized on Debian 10/11.
-  * [API Daemon] Fixes a bug if VM CPU stats are missing on Debian 10.
-
- -- Joshua M. Boniface <joshua@boniface.me>  Tue, 09 Jan 2024 12:15:53 -0500
-
 pvc (0.9.88-0) unstable; urgency=high
 
   * [API Daemon] Adds an additional Prometheus metrics proxy for Zookeeper stats.

health-daemon/pvchealthd/Daemon.py

@@ -33,7 +33,7 @@ import os
 import signal
 
 # Daemon version
-version = "0.9.89"
+version = "0.9.88"
 
 
 ##########################################################

monitoring/prometheus/grafana-pvc-vms-dashboard.json

@@ -2515,9 +2515,7 @@
   ],
   "refresh": "5s",
   "schemaVersion": 38,
-  "tags": [
+  "tags": [],
-    "pvc"
-  ],
   "templating": {
     "list": [
       {

node-daemon/pvcnoded/Daemon.py

@@ -49,7 +49,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.89"
+version = "0.9.88"
 
 
 ##########################################################

worker-daemon/pvcworkerd/Daemon.py

@@ -44,7 +44,7 @@ from daemon_lib.vmbuilder import (
 )
 
 # Daemon version
-version = "0.9.89"
+version = "0.9.88"
 
 
 config = cfg.get_configuration()
@@ -58,7 +58,7 @@ celery_task_uri = "redis://{}:{}{}".format(
 celery = Celery(
     "pvcworkerd",
     broker=celery_task_uri,
-    backend=celery_task_uri,
+    result_backend=celery_task_uri,
     result_extended=True,
 )