Merge pull request #552 from iExecBlockchainComputing/bugfix/miscellaneous-fixes

jbern0rd · web-flow · commit bad19a5ed5e1 · 2023-09-27T15:05:10.000+02:00
Bugfix/miscellaneous fixes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - Fix log format in `LasService`. (#546)
 - Do not retry calls to fetch replicate from a scheduler, those calls are already scheduled. (#547)
 - Remove dead code in `IexecHubService`. (#550)
+- Remove `VersionService#isSnapshot`. (#552)
 ### Dependency Upgrades
 - Upgrade to `iexec-common` 8.2.1-NEXT-SNAPSHOT. (#538)
 - Remove `logstash-gelf` dependency. (#540)
@@ -27,7 +28,7 @@ All notable changes to this project will be documented in this file.
 - Upgrade to `jenkins-library` 2.7.3. (#549)
 - Upgrade to `iexec-commons-poco` 3.1.0. (#551)
 - Upgrade to `iexec-common` 8.3.0. (#551)
-- Upgrade to `iexec-commons-containers` 1.1.0. (#551)
+- Upgrade to `iexec-commons-containers` 1.1.2. (#551 #552)
 
 ## [[8.1.4]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.1.4) 2023-06-27
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 version=8.1.4
 iexecCommonVersion=8.3.0
-iexecCommonsContainersVersion=1.1.0
+iexecCommonsContainersVersion=1.1.2
 iexecCommonsPocoVersion=3.1.0
 iexecBlockchainAdapterVersion=8.1.1
 iexecResultVersion=8.1.1
-iexecSmsVersion=8.1.1
+iexecSmsVersion=8.2.0-NEXT-SNAPSHOT
 
 nexusUser
 nexusPassword
diff --git a/src/main/java/com/iexec/worker/PingService.java b/src/main/java/com/iexec/worker/PingService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,10 +80,10 @@ void pingScheduler() {
         try {
             sessionId = coreClient.ping(loginService.getToken());
         } catch (FeignException e) {
+            log.warn("The worker cannot ping the core [status:{}]", e.status());
             if (e instanceof FeignException.Unauthorized) {
                 loginService.login();
             }
-            log.warn("The worker cannot ping the core [status:{}]", e.status());
             return;
         }
 
diff --git a/src/main/java/com/iexec/worker/compute/ComputeController.java b/src/main/java/com/iexec/worker/compute/ComputeController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public ComputeController(ComputeExitCauseService computeStageExitService,
     }
 
     @PostMapping("/compute/{stage}/{chainTaskId}/exit")
-    public ResponseEntity sendExitCauseForGivenComputeStage(
+    public ResponseEntity<Void> sendExitCauseForGivenComputeStage(
             @PathVariable ComputeStage stage,
             @PathVariable String chainTaskId,
             @RequestBody ExitMessage exitMessage) {
diff --git a/src/main/java/com/iexec/worker/utils/AsyncUtils.java b/src/main/java/com/iexec/worker/utils/AsyncUtils.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020 IEXEC BLOCKCHAIN TECH
+* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@
 
 package com.iexec.worker.utils;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
 @Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class AsyncUtils {
 
-    private AsyncUtils() {}
-
     /**
      * The default {@link CompletableFuture#runAsync(Runnable)} fails silently when an exception
      * is thrown in the running thread. This wrapper method adds an exception handler that logs
diff --git a/src/main/java/com/iexec/worker/utils/ExecutorUtils.java b/src/main/java/com/iexec/worker/utils/ExecutorUtils.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020 IEXEC BLOCKCHAIN TECH
+* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,15 +16,16 @@
 
 package com.iexec.worker.utils;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ExecutorUtils {
 
-    private ExecutorUtils() {}
-
     public static Executor
             newSingleThreadExecutorWithFixedSizeQueue(int queueSize, String threadNamePrefix) {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
diff --git a/src/main/java/com/iexec/worker/version/VersionService.java b/src/main/java/com/iexec/worker/version/VersionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.iexec.worker.utils.version;
+package com.iexec.worker.version;
 
-import com.iexec.common.utils.VersionUtils;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Service;
 
@@ -33,8 +32,4 @@ public String getVersion() {
         return buildProperties.getVersion();
     }
 
-    public boolean isSnapshot() {
-        return VersionUtils.isSnapshot(buildProperties.getVersion());
-    }
-
 }
diff --git a/src/main/java/com/iexec/worker/worker/WorkerService.java b/src/main/java/com/iexec/worker/worker/WorkerService.java
@@ -26,7 +26,7 @@
 import com.iexec.worker.feign.CustomCoreFeignClient;
 import com.iexec.worker.tee.scone.TeeSconeService;
 import com.iexec.worker.utils.LoggingUtils;
-import com.iexec.worker.utils.version.VersionService;
+import com.iexec.worker.version.VersionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.restart.RestartEndpoint;
 import org.springframework.context.annotation.Bean;
diff --git a/src/test/java/com/iexec/worker/tee/TeeServicesPropertiesServiceTests.java b/src/test/java/com/iexec/worker/tee/TeeServicesPropertiesServiceTests.java
@@ -54,8 +54,10 @@ class TeeServicesPropertiesServiceTests {
     private static final long POST_COMPUTE_HEAP_SIZE = 1024L;
     private static final String POST_COMPUTE_ENTRYPOINT = "postComputeEntrypoint";
     private static final GramineServicesProperties GRAMINE_PROPERTIES = new GramineServicesProperties(
-            new TeeAppProperties(PRE_COMPUTE_IMAGE, "", PRE_COMPUTE_ENTRYPOINT, PRE_COMPUTE_HEAP_SIZE),
-            new TeeAppProperties(POST_COMPUTE_IMAGE, "", POST_COMPUTE_ENTRYPOINT, POST_COMPUTE_HEAP_SIZE)
+            TeeAppProperties.builder().image(PRE_COMPUTE_IMAGE).fingerprint("")
+                    .entrypoint(PRE_COMPUTE_ENTRYPOINT).heapSizeInBytes(PRE_COMPUTE_HEAP_SIZE).build(),
+            TeeAppProperties.builder().image(POST_COMPUTE_IMAGE).fingerprint("")
+                    .entrypoint(POST_COMPUTE_ENTRYPOINT).heapSizeInBytes(POST_COMPUTE_HEAP_SIZE).build()
     );
 
     @Mock
diff --git a/src/test/java/com/iexec/worker/version/VersionServiceTests.java b/src/test/java/com/iexec/worker/version/VersionServiceTests.java
@@ -1,8 +1,23 @@
-package com.iexec.worker.utils.version;
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iexec.worker.version;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.InjectMocks;
@@ -25,18 +40,10 @@ public void preflight() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings={"x.y.z", "x.y.z-rc"})
-    void testNonSnapshotVersion(String version) {
+    @ValueSource(strings={"x.y.z", "x.y.z-rc", "x.y.z-NEXT-SNAPSHOT"})
+    void testVersions(String version) {
         Mockito.when(buildProperties.getVersion()).thenReturn(version);
         Assertions.assertEquals(version, versionService.getVersion());
-        Assertions.assertFalse(versionService.isSnapshot());
-    }
-
-    @Test
-    void testSnapshotVersion() {
-        Mockito.when(buildProperties.getVersion()).thenReturn("x.y.z-NEXT-SNAPSHOT");
-        Assertions.assertEquals("x.y.z-NEXT-SNAPSHOT", versionService.getVersion());
-        Assertions.assertTrue(versionService.isSnapshot());
     }
 
 }
diff --git a/src/test/java/com/iexec/worker/worker/WorkerServiceTests.java b/src/test/java/com/iexec/worker/worker/WorkerServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License; Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 import com.iexec.worker.docker.DockerService;
 import com.iexec.worker.feign.CustomCoreFeignClient;
 import com.iexec.worker.tee.scone.TeeSconeService;
-import com.iexec.worker.utils.version.VersionService;
+import com.iexec.worker.version.VersionService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020 IEXEC BLOCKCHAIN TECH`
	`2`	`+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -80,10 +80,10 @@ void pingScheduler() {`
`80`	`80`	`try {`
`81`	`81`	`sessionId = coreClient.ping(loginService.getToken());`
`82`	`82`	`} catch (FeignException e) {`
	`83`	`+ log.warn("The worker cannot ping the core [status:{}]", e.status());`
`83`	`84`	`if (e instanceof FeignException.Unauthorized) {`
`84`	`85`	`loginService.login();`
`85`	`86`	`}`
`86`		`- log.warn("The worker cannot ping the core [status:{}]", e.status());`
`87`	`87`	`return;`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2022 IEXEC BLOCKCHAIN TECH`
	`2`	`+ * Copyright 2022-2023 IEXEC BLOCKCHAIN TECH`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -42,7 +42,7 @@ public ComputeController(ComputeExitCauseService computeStageExitService,`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@PostMapping("/compute/{stage}/{chainTaskId}/exit")`
`45`		`- public ResponseEntity sendExitCauseForGivenComputeStage(`
	`45`	`+ public ResponseEntity<Void> sendExitCauseForGivenComputeStage(`
`46`	`46`	`@PathVariable ComputeStage stage,`
`47`	`47`	`@PathVariable String chainTaskId,`
`48`	`48`	`@RequestBody ExitMessage exitMessage) {`