nebulous/optimiser-controller
Code Issues Proposed changes

Refine master node requirements, log them

Browse Source 
Do not insist to run on an IAAS node if an edge node is available

Change-Id: I39b23c8391ff1c3a7b674502609b6ae284c2300c
This commit is contained in:
Rudi Schlatte 2024-03-20 10:10:24 +01:00
parent aacdf3803f
commit 1a56a2b130
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,15 +45,9 @@ public class NebulousAppDeployer {
*/ */
public static List<Requirement> getControllerRequirements(String jobID) { public static List<Requirement> getControllerRequirements(String jobID) {
return List.of( return List.of(
new NodeTypeRequirement(List.of(NodeType.IAAS), jobID, jobID),
// TODO: untested; we rely on the fact that SAL has an abstraction
// over operating systems. See
// https://github.com/ow2-proactive/scheduling-abstraction-layer/blob/master/sal-common/src/main/java/org/ow2/proactive/sal/model/OperatingSystemFamily.java#L39
// and
// https://github.com/ow2-proactive/scheduling-abstraction-layer/blob/master/sal-service/src/main/java/org/ow2/proactive/sal/service/nc/NodeCandidateUtils.java#L159
new AttributeRequirement("image", "operatingSystem.family", new AttributeRequirement("image", "operatingSystem.family",
RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()), RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()),
new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "4096"), new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"),
new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4")); new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4"));
} }
@ -244,6 +238,7 @@ public class NebulousAppDeployer {
app.getComponentNodeNames().put(componentName, nodeNames); app.getComponentNodeNames().put(componentName, nodeNames);
} }
Main.logFile("nodenames-" + appUUID + ".txt", app.getComponentNodeNames()); Main.logFile("nodenames-" + appUUID + ".txt", app.getComponentNodeNames());
Main.logFile("master-node-" + appUUID + ".txt", masterNodeCandidate);
Main.logFile("worker-nodes-" + appUUID + ".txt", clusterNodes); Main.logFile("worker-nodes-" + appUUID + ".txt", clusterNodes);
try { try {
Main.logFile("worker-labels-" + appUUID + ".txt", mapper.writeValueAsString(nodeLabels)); Main.logFile("worker-labels-" + appUUID + ".txt", mapper.writeValueAsString(nodeLabels));