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

Optimize state change handling.
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Michael Lipp 2025-03-29 15:09:38 +01:00
parent db49f5ba2f
commit 991763f228
18 changed files with 152 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

4
org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinition.java
View file

@ -300,8 +300,8 @@ public class VmDefinition extends K8sDynamicModel {
*
* @return the data
*/
public Optional<VmExtraData> extra() {
return Optional.ofNullable(extraData);
public VmExtraData extra() {
return extraData;
}
/**

4
org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmExtraData.java
View file

@ -112,7 +112,7 @@ public class VmExtraData {
* @param deleteConnectionFile the delete connection file
* @return the string
*/
public String connectionFile(String password,
public Optional<String> connectionFile(String password,
Class<?> preferredIpVersion, boolean deleteConnectionFile) {
var addr = displayIp(preferredIpVersion);
if (addr.isEmpty()) {
@ -144,7 +144,7 @@ public class VmExtraData {
if (deleteConnectionFile) {
data.append("delete-this-file=1\n");
}
return data.toString();
return Optional.of(data.toString());
}
private Optional<InetAddress> displayIp(Class<?> preferredIpVersion) {

2
org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmPool.java
View file

@ -177,7 +177,7 @@ public class VmPool {
}
// Additional check in case lastUsed has not been updated
// by PoolMonitor#onVmDefChanged() yet ("race condition")
// by PoolMonitor#onVmResourceChanged() yet ("race condition")
if (vmDef.condition("ConsoleConnected")
.map(cc -> cc.getLastTransitionTime().toInstant())
.map(this::retainUntil)