kevin/ma
1
0
Fork 0
Code Issues 1 Packages Activity

It works

Browse Source
This commit is contained in:
Kevin
2026-07-10 22:19:33 +02:00
parent ca45b4069f
commit 7b9188ab54
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nextflow/plugins/nf-k8s/src/main/nextflow/k8s/K8sRuntimeEstimator.groovy
View File

@@ -91,7 +91,7 @@ class K8sRuntimeEstimator {
double estimate(String taskName, long inputSize) { double estimate(String taskName, long inputSize) {
Function estimator = estimators.get(taskName) Function estimator = estimators.get(taskName)
if (estimator == null) { if (estimator == null) {
log.warn "[K8s] Unable to estimate take ${taskName}: unknown task" //log.warn "[K8s] Unable to estimate take ${taskName}: unknown task"
return Double.POSITIVE_INFINITY return Double.POSITIVE_INFINITY
} }
return estimator.estimate(inputSize) return estimator.estimate(inputSize)

7
nextflow/plugins/nf-k8s/src/main/nextflow/k8s/strategies/K8sDVFSSchedulingStrategy.groovy
View File

@@ -82,6 +82,7 @@ class K8sDVFSSchedulingStrategy implements K8sSchedulingStrategy {
for (AssignedTask t : tasks) { for (AssignedTask t : tasks) {
max = Long.max(t.frequency, max) max = Long.max(t.frequency, max)
} }
log.info "[K8s] node ${name} running at ${max} Hz / ${maxFrequency} Hz ${((double)max/(double)maxFrequency) * 100.0}%"
dvfsClient.setNodeFrequency(name, (int)max) dvfsClient.setNodeFrequency(name, (int)max)
this.currentFrequency = max this.currentFrequency = max
} }
@@ -92,7 +93,7 @@ class K8sDVFSSchedulingStrategy implements K8sSchedulingStrategy {
this.allocatedMemory += reqBytes this.allocatedMemory += reqBytes
this.allocatedCPUs += reqCPUs this.allocatedCPUs += reqCPUs
log.info "[K8s] node ${name}: task ${task.name} assigned, now have ${availableMemory} bytes and ${availableCPUs} cpus [${reqBytes}, ${reqCPUs}]" log.info "[K8s] node ${name}: task ${task.name} assigned, now have ${availableMemory} bytes and ${availableCPUs} cpus [${reqBytes}, ${reqCPUs}]: at ${frequency}/${maxFrequency}"
this.tasks.add(new AssignedTask(task, frequency)) this.tasks.add(new AssignedTask(task, frequency))
updateFrequency(dvfsClient) updateFrequency(dvfsClient)
} }
@@ -189,7 +190,7 @@ class K8sDVFSSchedulingStrategy implements K8sSchedulingStrategy {
ArrayList<WorkerNode> suitableNodes = filterNodes(req.task) ArrayList<WorkerNode> suitableNodes = filterNodes(req.task)
if (suitableNodes.size() == 0) { if (suitableNodes.size() == 0) {
if (!anyNode(req.task)) { if (!anyNode(req.task)) {
log.error "[K8s] unable to schedule task ${req.task} - no node satisfies resource requirements" //log.error "[K8s] unable to schedule task ${req.task} - no node satisfies resource requirements"
return null return null
} }
/* No node can currently execute this task, but it should be possible in the future */ /* No node can currently execute this task, but it should be possible in the future */
@@ -271,7 +272,7 @@ class K8sDVFSSchedulingStrategy implements K8sSchedulingStrategy {
final int reqCPUs = getTaskCPURequirement(task) final int reqCPUs = getTaskCPURequirement(task)
ArrayList<WorkerNode> suitableNodes = new ArrayList<>() ArrayList<WorkerNode> suitableNodes = new ArrayList<>()
for (WorkerNode n : nodes) { for (WorkerNode n : nodes) {
if (n.availableMemory >= reqBytes && n.availableCPUs >= reqCPUs) { if (n.availableMemory > reqBytes && n.availableCPUs > reqCPUs) {
log.info "[K8s] task ${task.name}: ${reqBytes} bytes ${reqCPUs} cpus: node ${n.name} has ${n.availableMemory} bytes, ${n.availableCPUs} cpus" log.info "[K8s] task ${task.name}: ${reqBytes} bytes ${reqCPUs} cpus: node ${n.name} has ${n.availableMemory} bytes, ${n.availableCPUs} cpus"
suitableNodes.add(n) suitableNodes.add(n)
} }

4
test/nextflow.config
View File

@@ -22,7 +22,7 @@ k8s {
projectDir = '/workspace/projects' projectDir = '/workspace/projects'
cleanup = false cleanup = false
nextflowImage = 'gitea.kleine.eulenhexe.de/kevin/ma/nextflow-dvfs:0.6.15' nextflowImage = 'gitea.kleine.eulenhexe.de/kevin/ma/nextflow-dvfs:0.6.18'
imagePullPolicy = 'IfNotPresent' imagePullPolicy = 'IfNotPresent'
schedulerInterval = '10s' schedulerInterval = '10s'
recordTaskRuntimes = true recordTaskRuntimes = true
@@ -33,7 +33,7 @@ k8s {
image = 'gitea.kleine.eulenhexe.de/kevin/ma/dvfs-agent:0.2.0' image = 'gitea.kleine.eulenhexe.de/kevin/ma/dvfs-agent:0.2.0'
command = ['/usr/local/bin/agent'] command = ['/usr/local/bin/agent']
wait = 'Running' wait = 'Running'
cleanup = false cleanup = true
} }
} }