Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid retrieving a worker which is being removed by the idle worker clean-up process #3725

Merged
merged 9 commits into from
Dec 14, 2023
+14 −1
Merged

Avoid retrieving a worker which is being removed by the idle worker clean-up process #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5f9c0e
prevent returning stopping workers
beer-1 Nov 19, 2023
d020489
clear only the specific worker
beer-1 Nov 23, 2023
fb77730
Add ibc-go v8 to integration tests (#3694)
ljoss17 Nov 16, 2023
90e7fd7
Update Gaia used in tests from v12 to v13 & v14 (#3700)
ljoss17 Nov 16, 2023
94a0208
Replace Gaia v12 with v13 and v14 in multi-chain tests (#3701)
ljoss17 Nov 17, 2023
8952751
Merge branch 'master' into fix/stopping-workers
beer-1 Nov 28, 2023
a5eb135
Merge branch 'master' into fix/stopping-workers
beer-1 Dec 4, 2023
ea93e59
Add changelog entry
ljoss17 Dec 11, 2023
2eae3b3
Merge branch 'master' into luca_joss/fix-stopped-workers
ljoss17 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/unreleased/bug-fixes/ibc-relayer/3703-avoid-returning-stopped-worker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Avoid retrieving a worker which is being removed by the idle worker clean-up
process.
process ([\#3703](https://github.com/informalsystems/hermes/issues/3703))
12 changes: 11 additions & 1 deletion crates/relayer/src/worker/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,17 @@ impl WorkerMap {
config: &Config,
) -> &WorkerHandle {
if self.workers.contains_key(&object) {
&self.workers[&object]
if self.workers[&object].shutdown_stopped_tasks() {
self.remove_stopped(
self.workers[&object].id(),
self.workers[&object].object().clone(),
);

let worker = self.spawn_worker(src, dst, &object, config);
self.workers.entry(object).or_insert(worker)
} else {
&self.workers[&object]
}
} else {
let worker = self.spawn_worker(src, dst, &object, config);
self.workers.entry(object).or_insert(worker)
Expand Down
Loading