Bump version to 0.9.95

.version

@@ -1 +1 @@
-0.9.96
+0.9.95

CHANGELOG.md

@@ -1,15 +1,9 @@
 ## PVC Changelog
 
-###### [v0.9.96](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.96)
-
-  * [API Daemon] Fixes a bug when reporting node stats
-  * [API Daemon] Fixes a bug deleteing successful benchmark results
-
 ###### [v0.9.95](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.95)
 
   * [API Daemon/CLI Client] Adds a flag to allow duplicate VNIs in network templates
   * [API Daemon] Ensures that storage template disks are returned in disk ID order
-  * [Client CLI] Fixes a display bug showing all OSDs as split
 
 ###### [v0.9.94](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.94)
 

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

client-cli/pvc/lib/storage.py

@@ -430,9 +430,7 @@ def format_list_osd(config, osd_list):
             )
             continue
 
-        if osd_information.get("is_split") is not None and osd_information.get(
+        if osd_information.get("is_split") is not None:
-            "is_split"
-        ):
             osd_information["device"] = f"{osd_information['device']} [s]"
 
         # Deal with the size to human readable

client-cli/setup.py

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

daemon-common/benchmark.py

@@ -115,13 +115,12 @@ class BenchmarkError(Exception):
 #
 
 
-def cleanup(job_name, db_conn=None, db_cur=None, zkhandler=None, final=False):
+def cleanup(job_name, db_conn=None, db_cur=None, zkhandler=None):
     if db_conn is not None and db_cur is not None:
-        if not final:
+        # Clean up our dangling result
-            # Clean up our dangling result (non-final runs only)
+        query = "DELETE FROM storage_benchmarks WHERE job = %s;"
-            query = "DELETE FROM storage_benchmarks WHERE job = %s;"
+        args = (job_name,)
-            args = (job_name,)
+        db_cur.execute(query, args)
-            db_cur.execute(query, args)
         db_conn.commit()
         # Close the database connections cleanly
         close_database(db_conn, db_cur)
@@ -411,7 +410,6 @@ def worker_run_benchmark(zkhandler, celery, config, pool):
         db_conn=db_conn,
         db_cur=db_cur,
         zkhandler=zkhandler,
-        final=True,
     )
 
     current_stage += 1

daemon-common/node.py

@@ -69,8 +69,6 @@ def getNodeHealthDetails(zkhandler, node_name, node_health_plugins):
             plugin_message,
             plugin_data,
         ) = tuple(all_plugin_data[pos_start:pos_end])
-        if plugin_data is None:
-            continue
         plugin_output = {
             "name": plugin,
             "last_run": int(plugin_last_run) if plugin_last_run is not None else None,
@@ -158,9 +156,9 @@ def getNodeInformation(zkhandler, node_name):
         zkhandler, node_name, node_health_plugins
     )
 
-    try:
+    if _node_network_stats is not None:
         node_network_stats = json.loads(_node_network_stats)
-    except Exception:
+    else:
         node_network_stats = dict()
 
     # Construct a data structure to represent the data

debian/changelog

@@ -1,15 +1,7 @@
-pvc (0.9.96-0) unstable; urgency=high
-
-  * [API Daemon] Fixes a bug when reporting node stats
-  * [API Daemon] Fixes a bug deleteing successful benchmark results
-
- -- Joshua M. Boniface <joshua@boniface.me>  Fri, 08 Mar 2024 14:23:06 -0500
-
 pvc (0.9.95-0) unstable; urgency=high
 
   * [API Daemon/CLI Client] Adds a flag to allow duplicate VNIs in network templates
   * [API Daemon] Ensures that storage template disks are returned in disk ID order
-  * [Client CLI] Fixes a display bug showing all OSDs as split
 
  -- Joshua M. Boniface <joshua@boniface.me>  Fri, 09 Feb 2024 12:42:00 -0500
 

health-daemon/pvchealthd/Daemon.py

@@ -33,7 +33,7 @@ import os
 import signal
 
 # Daemon version
-version = "0.9.96"
+version = "0.9.95"
 
 
 ##########################################################

node-daemon/pvcnoded/Daemon.py

@@ -49,7 +49,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.96"
+version = "0.9.95"
 
 
 ##########################################################

worker-daemon/pvcworkerd/Daemon.py

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