-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #688 from iExecBlockchainComputing/release/8.4.1
Release/8.4.1
- Loading branch information
Showing
50 changed files
with
2,311 additions
and
2,214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| version=8.4.0 | ||
| version=8.4.1 | ||
| iexecCommonVersion=8.4.0 | ||
| iexecCommonsPocoVersion=3.2.0 | ||
| iexecBlockchainAdapterVersion=8.4.0 | ||
| iexecResultVersion=8.4.0 | ||
| iexecSmsVersion=8.5.0 | ||
| iexecSmsVersion=8.5.1 | ||
|
|
||
| nexusUser | ||
| nexusPassword |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
src/main/java/com/iexec/core/detector/task/ConsensusReachedTaskDetector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright 2024 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.core.detector.task; | ||
|
|
||
| import com.iexec.core.chain.IexecHubService; | ||
| import com.iexec.core.detector.Detector; | ||
| import com.iexec.core.task.Task; | ||
| import com.iexec.core.task.TaskService; | ||
| import com.iexec.core.task.TaskStatus; | ||
| import com.iexec.core.task.update.TaskUpdateRequestManager; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.scheduling.annotation.Scheduled; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import static com.iexec.commons.poco.chain.ChainTaskStatus.REVEALING; | ||
| import static com.iexec.core.task.TaskStatus.RUNNING; | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| public class ConsensusReachedTaskDetector implements Detector { | ||
|
|
||
| private final IexecHubService iexecHubService; | ||
| private final TaskService taskService; | ||
| private final TaskUpdateRequestManager taskUpdateRequestManager; | ||
|
|
||
| public ConsensusReachedTaskDetector(IexecHubService iexecHubService, | ||
| TaskService taskService, | ||
| TaskUpdateRequestManager taskUpdateRequestManager) { | ||
| this.iexecHubService = iexecHubService; | ||
| this.taskService = taskService; | ||
| this.taskUpdateRequestManager = taskUpdateRequestManager; | ||
| } | ||
|
|
||
| @Scheduled(fixedRateString = "#{@cronConfiguration.getConsensusReached()}") | ||
| @Override | ||
| public void detect() { | ||
| log.debug("Trying to detect running tasks with on-chain consensus"); | ||
| taskService.findByCurrentStatus(RUNNING).stream() | ||
| .filter(this::isConsensusReached) | ||
| .forEach(this::publishTaskUpdateRequest); | ||
| } | ||
|
|
||
| private boolean isConsensusReached(Task task) { | ||
| return iexecHubService.getChainTask(task.getChainTaskId()).stream() | ||
| .allMatch(chainTask -> chainTask.getStatus() == REVEALING); | ||
| } | ||
|
|
||
| private void publishTaskUpdateRequest(Task task) { | ||
| log.info("Detected confirmed missing update (task) [is:{}, should:{}, taskId:{}]", | ||
| task.getCurrentStatus(), TaskStatus.CONSENSUS_REACHED, task.getChainTaskId()); | ||
| taskUpdateRequestManager.publishRequest(task.getChainTaskId()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.