Skip to content

Commit

Permalink
node: fix task caller lifecycle in Triggers schedule (#2605)
Browse files Browse the repository at this point in the history
  • Loading branch information
canepat authored Dec 21, 2024
1 parent 377c803 commit 2d84274
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 5 deletions.
8 changes: 4 additions & 4 deletions silkworm/node/stagedsync/stages/stage_triggers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ Stage::Result TriggersStage::forward(db::RWTxn& tx) {
}

Task<void> TriggersStage::schedule(std::function<void(db::RWTxn&)> callback) {
auto task_caller = [this, c = std::move(callback)]() -> Task<void> {
db::RWTxn* tx = this->current_tx_;
auto task_caller = [](auto* self, auto trigger) -> Task<void> {
db::RWTxn* tx = self->current_tx_;
SILKWORM_ASSERT(tx);
c(*tx);
trigger(*tx);
co_return;
};
return concurrency::spawn_task(ioc_, task_caller());
return concurrency::spawn_task(ioc_, task_caller(this, std::move(callback)));
}

bool TriggersStage::stop() {
Expand Down
4 changes: 3 additions & 1 deletion silkworm/node/stagedsync/stages/stage_triggers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ class TriggersStage : public Stage, public datastore::StageScheduler {

bool stop() override;

private:
protected:
boost::asio::io_context ioc_;

private:
db::RWTxn* current_tx_{};
};

Expand Down
50 changes: 50 additions & 0 deletions silkworm/node/stagedsync/stages/stage_triggers_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
Copyright 2024 The Silkworm Authors
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.
*/

#include "stage_triggers.hpp"

#include <catch2/catch_test_macros.hpp>

#include <silkworm/db/access_layer.hpp>
#include <silkworm/db/test_util/temp_chain_data.hpp>
#include <silkworm/infra/concurrency/spawn.hpp>

namespace silkworm::stagedsync {

using namespace silkworm::db;
using db::test_util::TempChainDataStore;

class TriggersStateForTest : public TriggersStage {
public:
using TriggersStage::TriggersStage;
boost::asio::io_context& io_context() { return ioc_; }
};

TEST_CASE("TriggersStage: scheduled task lifetime") {
TempChainDataStore temp_chaindata;
RWTxn& txn{temp_chaindata.rw_txn()};
txn.disable_commit();

stagedsync::SyncContext sync_context{};
TriggersStateForTest stage_triggers{&sync_context};
auto future = concurrency::spawn_future(stage_triggers.io_context(), stage_triggers.schedule([](auto& rw_txn) {
rw_txn.is_open();
}));
REQUIRE(stage_triggers.forward(txn) == stagedsync::Stage::Result::kSuccess);
CHECK_NOTHROW(future.get());
}

} // namespace silkworm::stagedsync

0 comments on commit 2d84274

Please sign in to comment.