From 8c931a12ee06ceed7f3fde3b06d5aa3db3971040 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Mon, 6 Jun 2016 18:52:54 -0700 Subject: [PATCH] Returning an error if stats collection hasn't started yet for a new docker container --- client/driver/docker.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index 0cac50480..35c55fe5d 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -914,7 +914,11 @@ func (h *DockerHandle) Kill() error { func (h *DockerHandle) Stats() (*cstructs.TaskResourceUsage, error) { h.resourceUsageLock.RLock() defer h.resourceUsageLock.RUnlock() - return h.resourceUsage, nil + var err error + if h.resourceUsage == nil { + err = fmt.Errorf("stats collection hasn't started yet") + } + return h.resourceUsage, err } func (h *DockerHandle) run() {