nebulous/optimiser-controller
Code Issues Proposed changes

Temporarily bypass resource broker

Browse Source 
Change-Id: Ibfb4de36e6d3233d4d1271805282e7feee0f1fc2
This commit is contained in:
Rudi Schlatte 2024-04-03 12:03:26 +02:00
parent 7df7f8bcf1
commit 252d818c92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ public class NebulousAppDeployer {
// 2. Find node candidates // 2. Find node candidates
// TODO: filter by app resources (check enabled: true in resources array) // TODO: filter by app resources (check enabled: true in resources array)
List<NodeCandidate> controllerCandidates = conn.findNodeCandidates(controllerRequirements, appUUID); List<NodeCandidate> controllerCandidates = conn.findNodeCandidatesFromSal(controllerRequirements, appUUID);
if (controllerCandidates.isEmpty()) { if (controllerCandidates.isEmpty()) {
log.error("Could not find node candidates for requirements: {}", log.error("Could not find node candidates for requirements: {}",
controllerRequirements, keyValue("appId", appUUID), keyValue("clusterName", clusterName)); controllerRequirements, keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@ -188,7 +188,7 @@ public class NebulousAppDeployer {
String nodeName = e.getKey(); String nodeName = e.getKey();
List<Requirement> requirements = e.getValue(); List<Requirement> requirements = e.getValue();
// TODO: filter by app resources (check enabled: true in resources array) // TODO: filter by app resources (check enabled: true in resources array)
List<NodeCandidate> candidates = conn.findNodeCandidates(requirements, appUUID); List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(requirements, appUUID);
if (candidates.isEmpty()) { if (candidates.isEmpty()) {
log.error("Could not find node candidates for for node {}, requirements: {}", nodeName, requirements, log.error("Could not find node candidates for for node {}, requirements: {}", nodeName, requirements,
keyValue("appId", appUUID), keyValue("clusterName", clusterName)); keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@ -443,7 +443,7 @@ public class NebulousAppDeployer {
log.debug("Adding {} nodes to component {}", nAdd, componentName, log.debug("Adding {} nodes to component {}", nAdd, componentName,
keyValue("appId", appUUID), keyValue("clusterName", clusterName)); keyValue("appId", appUUID), keyValue("clusterName", clusterName));
// TODO: filter by app resources (check enabled: true in resources array) // TODO: filter by app resources (check enabled: true in resources array)
List<NodeCandidate> candidates = conn.findNodeCandidates(newR, appUUID); List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(newR, appUUID);
if (candidates.isEmpty()) { if (candidates.isEmpty()) {
log.error("Could not find node candidates for requirements: {}", log.error("Could not find node candidates for requirements: {}",
newR, keyValue("appId", appUUID), keyValue("clusterName", clusterName)); newR, keyValue("appId", appUUID), keyValue("clusterName", clusterName));
@ -499,7 +499,7 @@ public class NebulousAppDeployer {
log.debug("Redeploying all nodes of component {}", componentName, log.debug("Redeploying all nodes of component {}", componentName,
keyValue("appId", appUUID), keyValue("clusterName", clusterName)); keyValue("appId", appUUID), keyValue("clusterName", clusterName));
// TODO: filter by app resources (check enabled: true in resources array) // TODO: filter by app resources (check enabled: true in resources array)
List<NodeCandidate> candidates = conn.findNodeCandidates(newR, appUUID); List<NodeCandidate> candidates = conn.findNodeCandidatesFromSal(newR, appUUID);
if (candidates.size() == 0) { if (candidates.size() == 0) {
log.error("Empty node candidate list for component {}, continuing without creating node", componentName, log.error("Empty node candidate list for component {}, continuing without creating node", componentName,
keyValue("appId", appUUID), keyValue("clusterName", clusterName)); keyValue("appId", appUUID), keyValue("clusterName", clusterName));