From 15664a6a0ca1f6662f6e6ca6f3a1a3d77179e587 Mon Sep 17 00:00:00 2001 From: Rohit Jnagal Date: Sat, 8 Aug 2015 02:22:19 +0000 Subject: [PATCH] Fix cgroup name parsing logic in ps output for centos6. Centos 6 uses a different ps lib resulting in different output. --- manager/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/container.go b/manager/container.go index e6084801..ee328290 100644 --- a/manager/container.go +++ b/manager/container.go @@ -42,7 +42,7 @@ import ( // Housekeeping interval. var HousekeepingInterval = flag.Duration("housekeeping_interval", 1*time.Second, "Interval between container housekeepings") -var cgroupPathRegExp = regexp.MustCompile(".*:devices:(.*?),.*") +var cgroupPathRegExp = regexp.MustCompile(".*devices:(.*?)[,;$].*") // Decay value used for load average smoothing. Interval length of 10 seconds is used. var loadDecay = math.Exp(float64(-1 * (*HousekeepingInterval).Seconds() / 10))