Merge pull request google#844 from jhjeong-kr/master

issue: high cpu usage
erichhsun · Aug 18, 2015 · f6d53e4 · f6d53e4
2 parents 9db0c2e + 9bb7a02
commit f6d53e4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/manager/container.go b/manager/container.go
@@ -416,6 +416,8 @@ func (c *containerData) housekeeping() {
 		// Schedule the next housekeeping. Sleep until that time.
 		if time.Now().Before(next) {
 			time.Sleep(next.Sub(time.Now()))
+		} else {
+			next = time.Now()
 		}
 		lastHousekeeping = next
 	}