Merge lp:~noise/ubuntu-push/busy-sleep-hack into lp:ubuntu-push/automatic

[Bret Barker]

ref #1435109, add a hacky busy sleep loop to workaround go's sleep not accounting for suspended time

[lp:~noise/ubuntu-push/busy-sleep-hack]

388. By Bret Barker on 2015-03-30

remove debug line

389. By Bret Barker on 2015-03-30

add config for poll_busy_wait, 0s to disable

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'client/client.go'
--- client/client.go	2015-03-17 10:43:50 +0000
+++ client/client.go	2015-03-30 19:22:06 +0000
@@ -79,6 +79,7 @@
 	PollNetworkWait config.ConfigTimeDuration `json:"poll_net_wait"`
 	PollPolldWait   config.ConfigTimeDuration `json:"poll_polld_wait"`
 	PollDoneWait    config.ConfigTimeDuration `json:"poll_done_wait"`
+	PollBusyWait    config.ConfigTimeDuration `json:"poll_busy_wait"`
 }
 
 // PushService is the interface we use of service.PushService.
@@ -246,6 +247,7 @@
 			NetworkWait:        client.config.PollNetworkWait.TimeDuration(),
 			PolldWait:          client.config.PollPolldWait.TimeDuration(),
 			DoneWait:           client.config.PollDoneWait.TimeDuration(),
+			BusyWait:           client.config.PollBusyWait.TimeDuration(),
 		},
 		Log:                client.log,
 		SessionStateGetter: client.session,

=== modified file 'client/client_test.go'
--- client/client_test.go	2015-03-17 10:51:55 +0000
+++ client/client_test.go	2015-03-30 19:22:06 +0000
@@ -185,6 +185,7 @@
 		"poll_net_wait":    "1m",
 		"poll_polld_wait":  "3m",
 		"poll_done_wait":   "5s",
+		"poll_busy_wait":   "0s",
 	}
 	for k, v := range overrides {
 		cfgMap[k] = v

=== modified file 'debian/config.json'
--- debian/config.json	2015-01-26 21:00:27 +0000
+++ debian/config.json	2015-03-30 19:22:06 +0000
@@ -19,5 +19,6 @@
     "poll_settle":      "20ms",
     "poll_net_wait":    "1m",
     "poll_polld_wait":  "3m",
-    "poll_done_wait":   "5s"
+    "poll_done_wait":   "5s",
+    "poll_busy_wait":   "1s"
 }

=== modified file 'poller/poller.go'
--- poller/poller.go	2015-03-26 13:48:19 +0000
+++ poller/poller.go	2015-03-30 19:22:06 +0000
@@ -48,6 +48,7 @@
 	NetworkWait        time.Duration
 	PolldWait          time.Duration
 	DoneWait           time.Duration
+	BusyWait           time.Duration
 }
 
 type Poller interface {
@@ -111,6 +112,19 @@
 	p.powerd = powerd.New(powerdEndp, p.log)
 	p.polld = polld.New(polldEndp, p.log)
 
+	// busy sleep loop to workaround go's timer/sleep
+	// not accounting for time when the system is suspended
+	// see https://bugs.launchpad.net/ubuntu/+source/ubuntu-push/+bug/1435109
+	if p.times.BusyWait > 0 {
+		p.log.Debugf("starting busy loop with %s interval", p.times.BusyWait)
+		go func() {
+			for {
+				time.Sleep(p.times.BusyWait)
+			}
+		}()
+	} else {
+		p.log.Debugf("skipping busy loop")
+	}
 	return nil
 }
 
@@ -178,8 +192,7 @@
 		return lockCookie
 	}
 	p.log.Debugf("got wakelock cookie of %s, checking conn state", lockCookie)
-	// XXX killed as part of bug #1435109 troubleshooting, remove cfg if remains unused
-	// time.Sleep(p.times.SessionStateSettle)
+	time.Sleep(p.times.SessionStateSettle)
 	for i := 0; i < 20; i++ {
 		if p.IsConnected() {
 			p.log.Debugf("iter %02d: connected", i)