8016: Rename Poll to PollPeriod.

diff --git a/lib/crunchstat/crunchstat.go b/lib/crunchstat/crunchstat.go
index 0a6d3bcd00c628cdf6ab24c666d9263a1931d747..e0ef058835ad6652009e5b2dbb40dbbf7a63da58 100644 (file)
--- a/lib/crunchstat/crunchstat.go
+++ b/lib/crunchstat/crunchstat.go
@@ -46,7 +46,7 @@ type Reporter struct {
        CgroupParent string
 
        // Interval between samples. Must be positive.
-       Poll time.Duration
+       PollPeriod time.Duration
 
        // Where to write statistics. Must not be nil.
        Logger *log.Logger
@@ -368,7 +368,7 @@ func (r *Reporter) run() {
        r.lastNetSample = make(map[string]ioSample)
        r.lastDiskSample = make(map[string]ioSample)
 
-       ticker := time.NewTicker(r.Poll)
+       ticker := time.NewTicker(r.PollPeriod)
        for {
                r.doMemoryStats()
                r.doCPUStats()
@@ -413,7 +413,7 @@ func (r *Reporter) waitForCIDFile() bool {
 func (r *Reporter) waitForCgroup() bool {
        ticker := time.NewTicker(100 * time.Millisecond)
        defer ticker.Stop()
-       warningTimer := time.After(r.Poll)
+       warningTimer := time.After(r.PollPeriod)
        for {
                c, err := r.openStatFile("cpuacct", "cgroup.procs", false)
                if err == nil {
@@ -423,7 +423,7 @@ func (r *Reporter) waitForCgroup() bool {
                select {
                case <-ticker.C:
                case <-warningTimer:
-                       r.Logger.Printf("cgroup stats files have not appeared after %v (config error?) -- still waiting...", r.Poll)
+                       r.Logger.Printf("cgroup stats files have not appeared after %v (config error?) -- still waiting...", r.PollPeriod)
                case <-r.done:
                        r.Logger.Printf("cgroup stats files never appeared for %v", r.CID)
                        return false

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index b064c4233086f48935287722c09a882a58b4f29f..9a508d5077af193762b78b8fa1820db526938bdf 100644 (file)
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -395,7 +395,7 @@ func (runner *ContainerRunner) StartCrunchstat() {
                Logger:       log.New(runner.statLogger, "", 0),
                CgroupParent: runner.cgroupParent,
                CgroupRoot:   runner.cgroupRoot,
-               Poll:         runner.statInterval,
+               PollPeriod:   runner.statInterval,
        }
        runner.statReporter.Start()
 }