mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Merge branch 'fix/condition-update'

Browse source
This commit is contained in:
Michael Lipp 2025-03-15 12:35:23 +01:00
commit fcdb537f35
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/VmDefUpdater.java
View file

@ -125,16 +125,19 @@ public class VmDefUpdater extends Component {
protected JsonObject updateCondition(VmDefinition from, String type, protected JsonObject updateCondition(VmDefinition from, String type,
boolean state, String reason, String message) { boolean state, String reason, String message) {
JsonObject status = from.statusJson(); JsonObject status = from.statusJson();
// Optimize, as we can get this several times // Avoid redundant updates, as this may be called several times
var current = status.getAsJsonArray("conditions").asList().stream() var current = status.getAsJsonArray("conditions").asList().stream()
.map(cond -> (JsonObject) cond) .map(cond -> (JsonObject) cond)
.filter(cond -> type.equals(cond.get("type").getAsString())) .filter(cond -> type.equals(cond.get("type").getAsString()))
.findFirst(); .findFirst();
if (current.isPresent() var stateUnchanged = current.map(c -> c.get("status").getAsString())
&& current.map(c -> c.get("status").getAsString()) .map("True"::equals).map(s -> s == state).orElse(false);
.map("True"::equals).map(s -> s == state).orElse(false) if (stateUnchanged
&& current.map(c -> c.get("reason").getAsString()) && current.map(c -> c.get("reason").getAsString())
.map(reason::equals).orElse(false)) { .map(reason::equals).orElse(false)
&& current.map(c -> c.get("observedGeneration").getAsLong())
.map(from.getMetadata().getGeneration()::equals)
.orElse(false)) {
return status; return status;
} }
@ -143,7 +146,9 @@ public class VmDefUpdater extends Component {
"status", state ? "True" : "False", "status", state ? "True" : "False",
"observedGeneration", from.getMetadata().getGeneration(), "observedGeneration", from.getMetadata().getGeneration(),
"reason", reason, "reason", reason,
"lastTransitionTime", Instant.now().toString())); "lastTransitionTime", stateUnchanged
? current.get().get("lastTransitionTime").getAsString()
: Instant.now().toString()));
if (message != null) { if (message != null) {
condition.put("message", message); condition.put("message", message);
} }