Skip to content

Commit a010b85

Browse files
authored
style: add missing final keyword and formatting improvements (#660)
1 parent 8b37bca commit a010b85

File tree

11 files changed

+131
-164
lines changed

11 files changed

+131
-164
lines changed

src/main/java/com/iexec/worker/compute/app/AppComputeService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ public AppComputeResponse runCompute(final TaskDescription taskDescription,
115115
// We use the name "worker1-0xabc123" for app container to avoid
116116
// conflicts when running multiple workers on the same machine.
117117
// Exp: integration tests
118-
private String getTaskContainerName(String chainTaskId) {
118+
private String getTaskContainerName(final String chainTaskId) {
119119
return workerConfigService.getWorkerName() + "-" + chainTaskId;
120120
}
121121

122-
private List<ReplicateStatusCause> getExitCauseFromFinalStatus(DockerRunFinalStatus finalStatus) {
122+
private List<ReplicateStatusCause> getExitCauseFromFinalStatus(final DockerRunFinalStatus finalStatus) {
123123
return switch (finalStatus) {
124124
case TIMEOUT -> List.of(ReplicateStatusCause.APP_COMPUTE_TIMEOUT);
125125
case FAILED -> List.of(ReplicateStatusCause.APP_COMPUTE_FAILED);

src/main/java/com/iexec/worker/compute/post/PostComputeService.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,17 @@ public PostComputeResponse runTeePostCompute(TaskDescription taskDescription,
211211
}
212212
final DockerRunFinalStatus finalStatus = dockerResponse.getFinalStatus();
213213
if (finalStatus == DockerRunFinalStatus.TIMEOUT) {
214-
log.error("Tee post-compute container timed out" +
215-
" [chainTaskId:{}, maxExecutionTime:{}]",
214+
log.error("Tee post-compute container timed out [chainTaskId:{}, maxExecutionTime:{}]",
216215
chainTaskId, taskDescription.getMaxExecutionTime());
217216
return PostComputeResponse.builder()
218217
.exitCauses(List.of(ReplicateStatusCause.POST_COMPUTE_TIMEOUT))
219218
.build();
220219
}
221220
if (finalStatus == DockerRunFinalStatus.FAILED) {
222-
int exitCode = dockerResponse.getContainerExitCode();
221+
final int exitCode = dockerResponse.getContainerExitCode();
223222
final List<ReplicateStatusCause> exitCauses = getExitCauses(chainTaskId, exitCode);
224-
log.error("Failed to run tee post-compute [chainTaskId:{}, " +
225-
"exitCode:{}, exitCauses:{}]", chainTaskId, exitCode, exitCauses);
223+
log.error("Failed to run tee post-compute [chainTaskId:{}, exitCode:{}, exitCauses:{}]",
224+
chainTaskId, exitCode, exitCauses);
226225
return PostComputeResponse.builder()
227226
.exitCauses(exitCauses)
228227
.build();

src/main/java/com/iexec/worker/compute/pre/PreComputeResponse.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class PreComputeResponse implements ComputeResponse {
3535
String stdout;
3636
String stderr;
3737

38-
3938
@Override
4039
public boolean isSuccessful() {
4140
if (isTeeTask) {

src/main/java/com/iexec/worker/compute/pre/PreComputeService.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public PreComputeResponse runTeePreCompute(TaskDescription taskDescription, Work
117117
.ofGigabytes(workerConfigService.getTeeComputeMaxHeapSizeGb())
118118
.toBytes();
119119
if (enclaveConfig.getHeapSize() > teeComputeMaxHeapSize) {
120-
log.error("Enclave configuration should define a proper heap " +
121-
"size [chainTaskId:{}, heapSize:{}, maxHeapSize:{}]",
120+
log.error("Enclave configuration should define a proper heap size [chainTaskId:{}, heapSize:{}, maxHeapSize:{}]",
122121
chainTaskId, enclaveConfig.getHeapSize(), teeComputeMaxHeapSize);
123122
preComputeResponseBuilder.exitCauses(List.of(PRE_COMPUTE_INVALID_ENCLAVE_HEAP_CONFIGURATION));
124123
return preComputeResponseBuilder.build();
@@ -140,8 +139,8 @@ public PreComputeResponse runTeePreCompute(TaskDescription taskDescription, Work
140139

141140
// run TEE pre-compute container if needed
142141
if (taskDescription.requiresPreCompute()) {
143-
log.info("Task contains TEE input data [chainTaskId:{}, containsDataset:{}, containsInputFiles:{}]",
144-
chainTaskId, taskDescription.containsDataset(), taskDescription.containsInputFiles());
142+
log.info("Task contains TEE input data [chainTaskId:{}, containsDataset:{}, containsInputFiles:{}, isBulkRequest:{}]",
143+
chainTaskId, taskDescription.containsDataset(), taskDescription.containsInputFiles(), taskDescription.isBulkRequest());
145144
final List<ReplicateStatusCause> exitCauses = downloadDatasetAndFiles(taskDescription, secureSession);
146145
preComputeResponseBuilder.exitCauses(exitCauses);
147146
}
@@ -150,12 +149,12 @@ public PreComputeResponse runTeePreCompute(TaskDescription taskDescription, Work
150149
}
151150

152151
private List<ReplicateStatusCause> downloadDatasetAndFiles(
153-
TaskDescription taskDescription,
154-
TeeSessionGenerationResponse secureSession) {
152+
final TaskDescription taskDescription,
153+
final TeeSessionGenerationResponse secureSession) {
155154
try {
156-
Integer exitCode = prepareTeeInputData(taskDescription, secureSession);
155+
final Integer exitCode = prepareTeeInputData(taskDescription, secureSession);
157156
if (exitCode == null || exitCode != 0) {
158-
String chainTaskId = taskDescription.getChainTaskId();
157+
final String chainTaskId = taskDescription.getChainTaskId();
159158
final List<ReplicateStatusCause> exitCauses = getExitCauses(chainTaskId, exitCode);
160159
log.error("Failed to prepare TEE input data [chainTaskId:{}, exitCode:{}, exitCauses:{}]",
161160
chainTaskId, exitCode, exitCauses);

src/main/java/com/iexec/worker/result/ResultService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public boolean writeErrorToIexecOut(final String chainTaskId, final ReplicateSta
101101
final String errorContent = String.format("[IEXEC] Errors occurred while computing the task [error:%s, causes:%s]",
102102
errorStatus, causes);
103103
final ComputedFile computedFile = ComputedFile.builder()
104-
.deterministicOutputPath(IexecFileHelper.SLASH_IEXEC_OUT +
105-
File.separator + ERROR_FILENAME)
104+
.deterministicOutputPath(IexecFileHelper.SLASH_IEXEC_OUT + File.separator + ERROR_FILENAME)
106105
.build();
107106
final String computedFileJsonAsString;
108107
try {

0 commit comments

Comments
 (0)