From 3143a1be93eb0a76ff7d8d30bb2666fb2d11a407 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 24 Mar 2025 15:04:39 +0100 Subject: [PATCH] Remove no longer valid optimization. --- .../vmoperator/runner/qemu/StatusUpdater.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java index 8eaeea8..b5d02c2 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/StatusUpdater.java @@ -76,7 +76,6 @@ public class StatusUpdater extends VmDefUpdater { private static final ObjectMapper objectMapper = new ObjectMapper().registerModule(new JavaTimeModule()); - private long observedGeneration; private boolean guestShutdownStops; private boolean shutdownByGuest; private VmDefinitionStub vmStub; @@ -131,7 +130,6 @@ public class StatusUpdater extends VmDefUpdater { if (vmDef == null) { return; } - observedGeneration = vmDef.getMetadata().getGeneration(); vmStub.updateStatus(from -> { JsonObject status = from.statusJson(); status.addProperty(Status.RUNNER_VERSION, Optional.ofNullable( @@ -166,21 +164,6 @@ public class StatusUpdater extends VmDefUpdater { if (vmStub == null) { return; } - - // A change of the runner configuration is typically caused - // by a new version of the CR. So we update only if we have - // a new version of the CR. There's one exception: the display - // password is configured by a file, not by the CR. - var vmDef = vmStub.model().orElse(null); - if (vmDef == null) { - return; - } - if (vmDef.metadata().getGeneration() == observedGeneration - && (event.configuration().hasDisplayPassword - || vmDef.statusJson().getAsJsonPrimitive( - Status.DISPLAY_PASSWORD_SERIAL).getAsInt() == -1)) { - return; - } vmStub.updateStatus(from -> { JsonObject status = from.statusJson(); if (!event.configuration().hasDisplayPassword) { @@ -194,7 +177,7 @@ public class StatusUpdater extends VmDefUpdater { from.getMetadata().getGeneration())); updateUserLoggedIn(from); return status; - }, vmDef); + }); } /**