Skip to content

Commit 19b433a

Browse files
Remove further left overs from grouping
Signed-off-by: Lehmann_Fabian <[email protected]>
1 parent 3a5b117 commit 19b433a

File tree

9 files changed

+1
-146
lines changed

9 files changed

+1
-146
lines changed

src/main/java/cws/k8s/scheduler/model/SchedulerConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class SchedulerConfig {
2828
public final Integer maxWaitingCopyTasksPerNode;
2929
public final Integer maxHeldCopyTaskReady;
3030
public final Integer prioPhaseThree;
31-
public final Double minScoreToCopyInAdvance;
3231

3332
public final Map<String, JsonNode> additional;
3433
public final String memoryPredictor;

src/main/java/cws/k8s/scheduler/model/Task.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ public class Task {
8282

8383
private final HierarchyWrapper hierarchyWrapper;
8484

85-
@Getter
86-
@Setter
87-
private Path outputRootDir;
88-
8985
private final Set<NodeLocation> preparedOnNodes = new HashSet<>();
9086

9187
public Task( TaskConfig config, DAG dag ) {
@@ -154,10 +150,6 @@ public void submitted(){
154150
traceRecord.setSchedulerTimeInQueue( System.currentTimeMillis() - timeAddedToQueue );
155151
}
156152

157-
public Set<String> getOutLabel(){
158-
return config.getOutLabel();
159-
}
160-
161153
private long inputSize = -1;
162154

163155
/**
@@ -235,7 +227,4 @@ public int getPreparedOnNodesCount() {
235227
return preparedOnNodes.size();
236228
}
237229

238-
public boolean hasOutlabels() {
239-
return getOutLabel() != null && !getOutLabel().isEmpty();
240-
}
241230
}

src/main/java/cws/k8s/scheduler/model/TaskConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public class TaskConfig {
1818
private final String runName;
1919
private final float cpus;
2020
private final long memoryInBytes;
21-
private final HashSet<String> outLabel;
2221
private final String workDir;
2322
private final int repetition;
2423
private final Long inputSize;
@@ -39,7 +38,6 @@ public TaskConfig(String task) {
3938
this.cpus = 0;
4039
this.memoryInBytes = 0;
4140
this.workDir = null;
42-
this.outLabel = null;
4341
this.repetition = 0;
4442
this.inputSize = null;
4543
}
@@ -53,7 +51,6 @@ public TaskConfig(String task, String name, String workDir, String runName ) {
5351
this.cpus = 0;
5452
this.memoryInBytes = 0;
5553
this.workDir = workDir;
56-
this.outLabel = null;
5754
this.repetition = 0;
5855
this.inputSize = null;
5956
}

src/main/java/cws/k8s/scheduler/model/TaskResultParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ public Set<OutputFile> getNewAndUpdatedFiles(
153153
if( outputRootDir == null ) {
154154
return new HashSet<>();
155155
}
156-
finishedTask.setOutputRootDir( Paths.get(outputRootDir) );
157156

158157
final Set<String> inputdata = new HashSet<>();
159158

src/main/java/cws/k8s/scheduler/model/cluster/CopyTask.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import lombok.extern.slf4j.Slf4j;
1010

1111
import java.nio.file.Path;
12-
import java.util.List;
13-
import java.util.stream.Collectors;
1412

1513
@Slf4j
1614
public class CopyTask extends Task {

src/main/java/cws/k8s/scheduler/util/TraceObserver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@ private void incOfferedForAdditionalCopy(){
103103
}
104104

105105
public String toString() {
106-
return String.format( "%s;%s;%s;%s;%s;%s;%s;%s;%s;%d",
106+
return String.format( "%s;%s;%s;%s;%s;%s;%s;%s;%d",
107107
task.getConfig().getRunName(),
108108
task.getConfig().getName(),
109-
task.getOutLabel(),
110109
task.getNode().getName(),
111110
labelsOnNode,
112111
copyTaskPhase2,

src/test/java/cws/k8s/scheduler/model/cluster/GroupClusterTest.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/test/java/cws/k8s/scheduler/model/cluster/clustering/DistanceMatrixTest.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

src/test/java/cws/k8s/scheduler/model/cluster/clustering/JaccardDistanceTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)