Skip to content

Ignore the TokenAlreadyScheduled error of the reseal_timer #1075

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

Merged
mergify merged 4 commits into from
Jan 10, 2019
Merged

Ignore the TokenAlreadyScheduled error of the reseal_timer #1075

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1259280
Ignore the TokenAlreadyScheduled error of the reseal_timer
Jan 9, 2019
b561d2c
Merge branch 'master' into 'f/ignore_schedule_error'
Jan 10, 2019
a88f98a
Merge branch 'master' into 'f/ignore_schedule_error'
Jan 10, 2019
dfc315c
Merge branch 'master' into 'f/ignore_schedule_error'
Jan 10, 2019
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
22 changes: 17 additions & 5 deletions core/src/client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use cstate::{
ActionHandler, AssetScheme, AssetSchemeAddress, FindActionHandler, OwnedAsset, OwnedAssetAddress, StateDB, Text,
TopLevelState, TopStateView,
};
use ctimer::{TimeoutHandler, TimerApi, TimerToken};
use ctimer::{TimeoutHandler, TimerApi, TimerScheduleError, TimerToken};
use ctypes::invoice::Invoice;
use ctypes::transaction::{AssetTransferInput, PartialHashing, ShardTransaction};
use ctypes::{BlockNumber, ShardId};
Expand Down Expand Up @@ -286,18 +286,30 @@ impl ResealTimer for Client {
fn set_max_timer(&self) {
if let Some(reseal_timer) = self.reseal_timer.read().as_ref() {
reseal_timer.cancel(RESEAL_MAX_TIMER_TOKEN).expect("Reseal max timer clear succeeds");
reseal_timer
match reseal_timer
.schedule_once(self.importer.miner.get_options().reseal_max_period, RESEAL_MAX_TIMER_TOKEN)
.expect("Reseal max timer set succeeds");
{
Ok(_) => {}
Err(TimerScheduleError::TokenAlreadyScheduled) => {
// Since set_max_timer could be called in multi thread, ignore the TokenAlreadyScheduled error
}
Err(err) => unreachable!("Reseal max timer should not fail but failed with {:?}", err),
}
};
}

fn set_min_timer(&self) {
if let Some(reseal_timer) = self.reseal_timer.read().as_ref() {
reseal_timer.cancel(RESEAL_MIN_TIMER_TOKEN).expect("Reseal min timer clear succeeds");
reseal_timer
match reseal_timer
.schedule_once(self.importer.miner.get_options().reseal_min_period, RESEAL_MIN_TIMER_TOKEN)
.expect("Reseal min timer set succeeds");
{
Ok(_) => {}
Err(TimerScheduleError::TokenAlreadyScheduled) => {
// Since set_min_timer could be called in multi thread, ignore the TokenAlreadyScheduled error
}
Err(err) => unreachable!("Reseal min timer should not fail but failed with {:?}", err),
}
};
}
}
Expand Down