Skip to content

bugfix: fix lock competition between Stats and Start interface #2238

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
merged 1 commit into from
Sep 14, 2018
Merged

bugfix: fix lock competition between Stats and Start interface #2238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions daemon/mgr/container_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,15 @@ func (mgr *ContainerManager) StreamStats(ctx context.Context, name string, confi
if err != nil {
return err
}
containerStat := toContainerStats(metrics.Timestamp, stats)

if err := enc.Encode(containerStat); err != nil {
return err
// metrics may be nil if the container is not running,
// so just ignore it and try get the metrics next time.
if metrics != nil {
containerStat := toContainerStats(metrics.Timestamp, stats)

if err := enc.Encode(containerStat); err != nil {
return err
}
}

time.Sleep(DefaultStatsInterval)
Expand All @@ -81,6 +86,11 @@ func (mgr *ContainerManager) Stats(ctx context.Context, name string) (*container
ID := c.ID
c.Unlock()

// only get metrics when the container is running
if !(c.IsRunning() || c.IsPaused()) {
return nil, nil, nil
Copy link
Contributor

@fuweid fuweid Sep 14, 2018

Choose a reason for hiding this comment

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

return nil will panic if the StreamStat toContainerStats consumes the result.

Copy link
Contributor Author

@HusterWan HusterWan Sep 14, 2018

Choose a reason for hiding this comment

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

make sense, i have fix it.

}

metric, err := mgr.Client.ContainerStats(ctx, ID)
if err != nil {
return nil, nil, err
Expand Down