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

fix(console): prevent panics if subscriber reports out-of-order times #295

Merged
merged 4 commits into from
Mar 7, 2022
Merged

fix(console): prevent panics if subscriber reports out-of-order times #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8734f16
chore: update internal lock file
thombles Feb 20, 2022
15e1618
fix(console): prevent panics if subscriber reports out-of-order times
thombles Feb 20, 2022
8eae691
Apply suggestions from code review
hawkw Mar 7, 2022
fc40fba
Merge branch 'main' into tk/reducing-panics
hawkw Mar 7, 2022
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
14 changes: 8 additions & 6 deletions tokio-console/src/state/async_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ impl AsyncOpsState {
.stats
.dropped_at
.map(|d| {
let dropped_for = now.duration_since(d).unwrap();
let dropped_for = now.duration_since(d).unwrap_or_default();
retain_for > dropped_for
})
.unwrap_or(true)
Expand Down Expand Up @@ -247,14 +247,15 @@ impl AsyncOp {
pub(crate) fn total(&self, since: SystemTime) -> Duration {
self.stats
.total
.unwrap_or_else(|| since.duration_since(self.stats.created_at).unwrap())
.or_else(|| since.duration_since(self.stats.created_at).ok())
.unwrap_or_default()
}

pub(crate) fn busy(&self, since: SystemTime) -> Duration {
if let (Some(last_poll_started), None) =
(self.stats.last_poll_started, self.stats.last_poll_ended)
{
let current_time_in_poll = since.duration_since(last_poll_started).unwrap();
let current_time_in_poll = since.duration_since(last_poll_started).unwrap_or_default();
return self.stats.busy + current_time_in_poll;
}
self.stats.busy
Expand All @@ -263,7 +264,8 @@ impl AsyncOp {
pub(crate) fn idle(&self, since: SystemTime) -> Duration {
self.stats
.idle
.unwrap_or_else(|| self.total(since) - self.busy(since))
.or_else(|| self.total(since).checked_sub(self.busy(since)))
.unwrap_or_default()
}

pub(crate) fn total_polls(&self) -> u64 {
Expand Down Expand Up @@ -309,11 +311,11 @@ impl AsyncOpStats {
.unwrap();

let dropped_at: Option<SystemTime> = pb.dropped_at.map(|v| v.try_into().unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap_or_default());

let poll_stats = pb.poll_stats.expect("task should have poll stats");
let busy = poll_stats.busy_time.map(pb_duration).unwrap_or_default();
let idle = total.map(|total| total - busy);
let idle = total.map(|total| total.checked_sub(busy).unwrap_or_default());
let formatted_attributes = Attribute::make_formatted(styles, &mut attributes);
let task_id = pb.task_id.map(|id| task_ids.id_for(id.id));
let task_id_str = strings.string(
Expand Down
12 changes: 7 additions & 5 deletions tokio-console/src/state/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ impl ResourcesState {
.stats
.dropped_at
.map(|d| {
let dropped_for = now.duration_since(d).unwrap();
let dropped_for = now.duration_since(d).unwrap_or_default();
retain_for > dropped_for
})
.unwrap_or(true)
Expand Down Expand Up @@ -296,9 +296,11 @@ impl Resource {
}

pub(crate) fn total(&self, since: SystemTime) -> Duration {
self.stats
.total
.unwrap_or_else(|| since.duration_since(self.stats.created_at).unwrap())
self.stats.total.unwrap_or_else(|| {
since
.duration_since(self.stats.created_at)
.unwrap_or_default()
})
Comment on lines +299 to +303
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, take it or leave it: consider

Suggested change
self.stats.total.unwrap_or_else(|| {
since
.duration_since(self.stats.created_at)
.unwrap_or_default()
})
self.stats
.total
.or_else(|| since.duration_since(self.stats.created_at).ok())
.unwrap_or_default()

}

pub(crate) fn dropped(&self) -> bool {
Expand Down Expand Up @@ -338,7 +340,7 @@ impl ResourceStats {
.try_into()
.unwrap();
let dropped_at: Option<SystemTime> = pb.dropped_at.map(|v| v.try_into().unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap_or_default());

Self {
created_at,
Expand Down
14 changes: 8 additions & 6 deletions tokio-console/src/state/tasks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ impl TasksState {
task.stats
.dropped_at
.map(|d| {
let dropped_for = now.duration_since(d).unwrap();
let dropped_for = now.duration_since(d).unwrap_or_default();
retain_for > dropped_for
})
.unwrap_or(true)
Expand Down Expand Up @@ -281,15 +281,16 @@ impl Task {
pub(crate) fn total(&self, since: SystemTime) -> Duration {
self.stats
.total
.unwrap_or_else(|| since.duration_since(self.stats.created_at).unwrap())
.or_else(|| since.duration_since(self.stats.created_at).ok())
.unwrap_or_default()
}

pub(crate) fn busy(&self, since: SystemTime) -> Duration {
if let (Some(last_poll_started), None) =
(self.stats.last_poll_started, self.stats.last_poll_ended)
{
// in this case the task is being polled at the moment
let current_time_in_poll = since.duration_since(last_poll_started).unwrap();
let current_time_in_poll = since.duration_since(last_poll_started).unwrap_or_default();
return self.stats.busy + current_time_in_poll;
}
self.stats.busy
Expand All @@ -298,7 +299,8 @@ impl Task {
pub(crate) fn idle(&self, since: SystemTime) -> Duration {
self.stats
.idle
.unwrap_or_else(|| self.total(since) - self.busy(since))
.or_else(|| self.total(since).checked_sub(self.busy(since)))
.unwrap_or_default()
}

/// Returns the total number of times the task has been polled.
Expand Down Expand Up @@ -388,11 +390,11 @@ impl From<proto::tasks::Stats> for TaskStats {
.unwrap();

let dropped_at: Option<SystemTime> = pb.dropped_at.map(|v| v.try_into().unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap());
let total = dropped_at.map(|d| d.duration_since(created_at).unwrap_or_default());

let poll_stats = pb.poll_stats.expect("task should have poll stats");
let busy = poll_stats.busy_time.map(pb_duration).unwrap_or_default();
let idle = total.map(|total| total - busy);
let idle = total.map(|total| total.checked_sub(busy).unwrap_or_default());
Self {
total,
idle,
Expand Down