[ARVADOS] updated: 4be23b41ec561b404dd833bdbea9d764f2b5d027

[git at public.curoverse.com]

Summary of changes:
 services/crunchstat/crunchstat.go | 160 ++++++++++++++++++++++----------------
 1 file changed, 93 insertions(+), 67 deletions(-)

       via  4be23b41ec561b404dd833bdbea9d764f2b5d027 (commit)
       via  9017317669b19883493fa18dc0c4900bab87ae96 (commit)
       via  501c5d20678de74fdce6618821659be41b3c0004 (commit)
       via  292856a6f1d26dcfd7a652a9a83cbe4a375588d4 (commit)
      from  4146cc481cec9847eb41d3e5ba7602b4f33d2096 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4be23b41ec561b404dd833bdbea9d764f2b5d027
Merge: 4146cc4 9017317
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 8 10:58:31 2014 -0400

    Merge branch '4044-crunchstat-wait' refs #4044


commit 9017317669b19883493fa18dc0c4900bab87ae96
Merge: 501c5d2 4146cc4
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 8 10:58:23 2014 -0400

    4044: Merge branch 'master' into 4044-crunchstat-wait


commit 501c5d20678de74fdce6618821659be41b3c0004
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Oct 8 10:58:11 2014 -0400

    4044: Add comments to "continue" statements.

diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 79583b2..387f647 100644
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -120,6 +120,7 @@ func PollCgroupStats(cgroup_root string, cgroup_parent string, container_id stri
 			c, err := os.Open(cpuset_cpus)
 			if err != nil {
 				stderr <- fmt.Sprintf("open %s: %s", cpuset_cpus, err)
+				// cgroup probably gone -- skip other stats too.
 				continue
 			}
 			b, _ := ioutil.ReadAll(c)
@@ -152,6 +153,8 @@ func PollCgroupStats(cgroup_root string, cgroup_parent string, container_id stri
 				// be >1 interval old, so stats will
 				// be incorrect. Start over instead.
 				last_user = -1
+
+				// cgroup probably gone -- skip other stats too.
 				continue
 			}
 			b, _ := ioutil.ReadAll(c)
@@ -188,6 +191,7 @@ func PollCgroupStats(cgroup_root string, cgroup_parent string, container_id stri
 			c, err := os.Open(blkio_io_service_bytes)
 			if err != nil {
 				stderr <- fmt.Sprintf("open %s: %s", blkio_io_service_bytes, err)
+				// cgroup probably gone -- skip other stats too.
 				continue
 			}
 			b := bufio.NewScanner(c)
@@ -221,6 +225,7 @@ func PollCgroupStats(cgroup_root string, cgroup_parent string, container_id stri
 			c, err := os.Open(memory_stat)
 			if err != nil {
 				stderr <- fmt.Sprintf("open %s: %s", memory_stat, err)
+				// cgroup probably gone -- skip other stats too.
 				continue
 			}
 			b := bufio.NewScanner(c)

-----------------------------------------------------------------------


hooks/post-receive
--