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

Use one event processor for "main loop" events.

Browse source
This commit is contained in:
Michael Lipp 2023-08-07 11:58:18 +02:00
parent 3e43d02931
commit 37e8f90cd1
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java
View file

@ -42,6 +42,7 @@ import org.jgrapes.core.Channel;
import org.jgrapes.core.Component;
import org.jgrapes.core.Components;
import org.jgrapes.core.Components.Timer;
import org.jgrapes.core.EventPipeline;
import org.jgrapes.core.annotation.Handler;
import org.jgrapes.core.events.Start;
import org.jgrapes.core.events.Stop;
@ -69,7 +70,7 @@ public class QemuMonitor extends Component {
private static ObjectMapper mapper = new ObjectMapper();
@SuppressWarnings("PMD.UseConcurrentHashMap")
private EventPipeline rep;
private Path socketPath;
private int powerdownTimeout;
private SocketIOChannel monitorChannel;
@ -113,6 +114,7 @@ public class QemuMonitor extends Component {
*/
@Handler
public void onStart(Start event) throws IOException {
rep = event.associated(EventPipeline.class).get();
if (socketPath == null) {
return;
}
@ -175,7 +177,7 @@ public class QemuMonitor extends Component {
@Handler
public void onConnectError(ConnectError event, SocketIOChannel channel) {
event.event().associated(QemuMonitor.class).ifPresent(qm -> {
fire(new Stop());
rep.fire(new Stop());
});
}
@ -201,7 +203,7 @@ public class QemuMonitor extends Component {
try {
var response = mapper.readValue(line, ObjectNode.class);
if (response.has("QMP")) {
fire(new MonitorReady());
rep.fire(new MonitorReady());
return;
}
if (response.has("return") || response.has("error")) {
@ -209,11 +211,11 @@ public class QemuMonitor extends Component {
logger.fine(
() -> String.format("(Previous \"monitor(in)\" is result "
+ "from executing %s)", executed));
fire(MonitorResult.from(executed, response));
rep.fire(MonitorResult.from(executed, response));
return;
}
if (response.has("event")) {
MonitorEvent.from(response).ifPresent(this::fire);
MonitorEvent.from(response).ifPresent(rep::fire);
}
} catch (JsonProcessingException e) {
throw new IOException(e);

12
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
View file

@ -60,6 +60,7 @@ import org.jdrupes.vmoperator.util.ExtendedObjectWrapper;
import org.jdrupes.vmoperator.util.FsdUtils;
import org.jgrapes.core.Component;
import org.jgrapes.core.Components;
import org.jgrapes.core.EventPipeline;
import org.jgrapes.core.TypedIdKey;
import org.jgrapes.core.annotation.Handler;
import org.jgrapes.core.events.Start;
@ -167,6 +168,7 @@ public class Runner extends Component {
private static final String SAVED_TEMPLATE = "VM.ftl.yaml";
private static final String FW_VARS = "fw-vars.fd";
private EventPipeline rep;
private final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
private final JsonNode defaults;
@SuppressWarnings("PMD.UseConcurrentHashMap")
@ -236,7 +238,7 @@ public class Runner extends Component {
}
logger.fine(() -> "Updating configuration");
var newConf = yamlMapper.convertValue(c, Configuration.class);
fire(new ConfigureQemu(newConf, state));
rep.fire(new ConfigureQemu(newConf, state));
});
}
@ -338,8 +340,10 @@ public class Runner extends Component {
*
* @param event the event
*/
@Handler
@Handler(priority = 100)
public void onStart(Start event) {
rep = newEventPipeline();
event.setAssociated(EventPipeline.class, rep);
try {
if (config == null) {
// Missing configuration, fail
@ -499,11 +503,11 @@ public class Runner extends Component {
logger.severe(() -> "Process " + procDef.name
+ " has exited with value " + event.exitValue()
+ " during startup.");
fire(new Stop());
rep.fire(new Stop());
return;
}
if (procDef.equals(qemuDefinition) && state == State.RUNNING) {
fire(new Stop());
rep.fire(new Stop());
}
logger.info(() -> "Process " + procDef.name
+ " has exited with value " + event.exitValue());