nebulous/optimiser-controller
Code Issues Proposed changes

For local processing, send out AMPL file

Browse Source 
... only if connected to ActiveMQ, of course.

Change-Id: Id886f440f8fbe0dda1c620c5aabeeb82b17b5604
This commit is contained in:
Rudi Schlatte
2024-01-21 18:31:12 +01:00
parent 3860e14902
commit 9256d6231a
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/LocalExecution.java
View File

@@ -5,10 +5,12 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.nebulouscloud.exn.core.Publisher;
import lombok.extern.slf4j.Slf4j;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
@@ -31,6 +33,13 @@ public class LocalExecution implements Callable<Integer> {
@Override public Integer call() {
ObjectMapper mapper = new ObjectMapper();
CountDownLatch exn_synchronizer = new CountDownLatch(1);
ExnConnector connector = main.getActiveMQConnector();
Publisher publisher = null;
if (connector != null) {
publisher = connector.getAmplMessagePublisher();
connector.start(exn_synchronizer);
}
JsonNode msg;
try {
msg = mapper.readTree(Files.readString(app_creation_msg, StandardCharsets.UTF_8));
@@ -38,10 +47,13 @@ public class LocalExecution implements Callable<Integer> {
log.error("Could not read an input file: ", e);
return 1;
}
NebulousApp app = NebulousApp.newFromAppMessage(msg,
main.getActiveMQConnector() == null ? null : main.getActiveMQConnector().getAmplMessagePublisher());
NebulousApp app = NebulousApp.newFromAppMessage(msg, publisher);
if (connector != null) {
log.info("Sending AMPL to channel {}", publisher);
app.sendAMPL();
}
System.out.println(app.generateAMPL());
// TODO: wait for solver reply here?
return 0;
}
}

9
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/Main.java
View File

@@ -112,7 +112,10 @@ public class Main implements Callable<Integer> {
}
/**
* Initialization code shared between main and subcommands.
* Initialization code shared between main and subcommands. Note that
* here we connect to SAL if possible, but (for now) do not start the EXN
* ActiveMQ middleware. Each main method needs to call
* `activeMQConnector.start`.
*/
private void init() {
log.info("Beginning common startup of optimiser-controller");
@@ -123,7 +126,6 @@ public class Main implements Callable<Integer> {
log.error("Connection to SAL unsuccessful");
} else {
log.info("Established connection to SAL");
// FIXME: remove this once we have the exn connector
NebulousApp.setSalConnector(salConnector);
}
} else {
@@ -140,8 +142,7 @@ public class Main implements Callable<Integer> {
public void onReady(AtomicReference<Context> context) {
log.info("Optimiser-controller connected to ActiveMQ");
}
}
);
});
} else {
log.info("ActiveMQ login info not set, only operating locally.");
}

5
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousApp.java
View File

@@ -162,6 +162,7 @@ public class NebulousApp {
}
this.UUID = app_message.at(uuid_path).textValue();
this.app_name = app_message.at(name_path).textValue();
log.info("New App instantiated: Name='{}', UUID='{}'", app_name, UUID);
}
/**
@@ -306,6 +307,10 @@ public class NebulousApp {
* Calculate AMPL file and send it off to the right channel.
*/
public void sendAMPL() {
if (ampl_message_channel == null) {
log.error("AMPL publisher not set, cannot send AMPL file");
return;
}
String ampl = generateAMPL();
ObjectNode msg = mapper.createObjectNode();
msg.put(getUUID() + ".ampl", ampl);