Merge branch 'main' into hoh-limit-ipfs-kubo-resources

Author: Psycojoker

pyproject.toml

@@ -51,7 +51,7 @@ dependencies = [
   "py-cpuinfo==9",
   "pydantic[dotenv]~=1.10.13",
   "pyroute2==0.7.12",
-  "python-cpuid==0.1",
+  "python-cpuid==0.1.1",
   "pyyaml==6.0.1",
   "qmp==1.1",
   "schedule==1.2.1",

src/aleph/vm/orchestrator/views/__init__.py

@@ -440,13 +440,13 @@ async def update_allocations(request: web.Request):
         except Exception as error:
             # Handle unknown exception separately, to avoid leaking data
             logger.exception("Unhandled Error while starting VM '%s': %s", instance_hash, error)
-            scheduling_errors[vm_hash] = Exception("Unhandled Error")
+            scheduling_errors[instance_hash] = Exception("Unhandled Error")
 
     # Log unsupported features
     if allocation.on_demand_vms:
         logger.warning("Not supported yet: 'allocation.on_demand_vms'")
     if allocation.jobs:
-        logger.warning("Not supported yet: 'allocation.on_demand_vms'")
+        logger.warning("Not supported yet: 'allocation.jobs'")
 
     failing = set(scheduling_errors.keys())
     successful = allocations - failing