Merge lp:~chipaca/ubuntu-push/auto-retry into lp:ubuntu-push

[John Lenton]

Introducing AutoRetry, a generic AutoRetry.

Introducing AutoRetry, a generic AutoRetry.

[Samuele Pedroni (pedronis)]

TestCanBeStopped has some problem, it passes even with:

- quitRedialing <- true
+ //quitRedialing <- true

review: Needs Information

[John Lenton (chipaca)]

That test is ... braindead. Sorry. Fixed.

[Samuele Pedroni (pedronis)]

good

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/auto-retry into lp:ubuntu-push failed. Below is the output from the failed tests.

mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1
/mnt/tarmac/cache/ubuntu-push/go-ws/bin/godeps -u dependencies.tsv
"/mnt/tarmac/cache/ubuntu-push/go-ws/src/launchpad.net/gocheck" now at <email address hidden>
go install launchpad.net/gocheck launchpad.net/go-dbus/v1
go test launchpad.net/ubuntu-push/...
ok launchpad.net/ubuntu-push/bus 0.840s

----------------------------------------------------------------------
FAIL: connectivity_test.go:183: ConnSuite.TestRun

connectivity_test.go:219:
    c.Fatalf("Timed out before getting value (#%d)", i+1)
... Error: Timed out before getting value (#2)

OOPS: 9 passed, 1 FAILED
--- FAIL: Test (1.91 seconds)
FAIL
FAIL launchpad.net/ubuntu-push/bus/connectivity 2.448s
ok launchpad.net/ubuntu-push/bus/networkmanager 0.751s
ok launchpad.net/ubuntu-push/bus/notifications 1.620s
ok launchpad.net/ubuntu-push/bus/testing 0.564s
ok launchpad.net/ubuntu-push/bus/urldispatcher 1.185s
ok launchpad.net/ubuntu-push/config 1.992s
ok launchpad.net/ubuntu-push/logger 0.624s
ok launchpad.net/ubuntu-push/protocol 2.764s
ok launchpad.net/ubuntu-push/server 3.324s
ok launchpad.net/ubuntu-push/server/acceptance 1.476s
? launchpad.net/ubuntu-push/server/acceptance/cmd [no test files]
ok launchpad.net/ubuntu-push/server/api 1.294s
ok launchpad.net/ubuntu-push/server/broker 0.396s
ok launchpad.net/ubuntu-push/server/broker/simple 0.032s
? launchpad.net/ubuntu-push/server/broker/testing [no test files]
? launchpad.net/ubuntu-push/server/broker/testsuite [no test files]
? launchpad.net/ubuntu-push/server/dev [no test files]
ok launchpad.net/ubuntu-push/server/listener 7.922s

----------------------------------------------------------------------
FAIL: session_test.go:412: sessionSuite.TestSessionLoopExchangeNextPing

session_test.go:430:
    c.Check(time.Since(tack) < (3+5)*time.Millisecond, Equals, true)
... obtained bool = false
... expected bool = true

OOPS: 22 passed, 1 FAILED
--- FAIL: TestSession (0.93 seconds)
FAIL
FAIL launchpad.net/ubuntu-push/server/session 1.015s
ok launchpad.net/ubuntu-push/server/store 0.398s
? launchpad.net/ubuntu-push/testing [no test files]
ok launchpad.net/ubuntu-push/testing/condition 0.026s
ok launchpad.net/ubuntu-push/util 1.296s
ok launchpad.net/ubuntu-push/whoopsie/identifier 1.763s
ok launchpad.net/ubuntu-push/whoopsie/identifier/testing 0.971s

make: *** [check] Error 1

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/auto-retry into lp:ubuntu-push failed. Below is the output from the failed tests.

mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1
/mnt/tarmac/cache/ubuntu-push/go-ws/bin/godeps -u dependencies.tsv
"/mnt/tarmac/cache/ubuntu-push/go-ws/src/launchpad.net/gocheck" now at <email address hidden>
go install launchpad.net/gocheck launchpad.net/go-dbus/v1
go test launchpad.net/ubuntu-push/...
ok launchpad.net/ubuntu-push/bus 0.313s

----------------------------------------------------------------------
FAIL: connectivity_test.go:183: ConnSuite.TestRun

connectivity_test.go:219:
    c.Fatalf("Timed out before getting value (#%d)", i+1)
... Error: Timed out before getting value (#2)

OOPS: 9 passed, 1 FAILED
--- FAIL: Test (0.95 seconds)
FAIL
FAIL launchpad.net/ubuntu-push/bus/connectivity 2.029s
ok launchpad.net/ubuntu-push/bus/networkmanager 1.063s
ok launchpad.net/ubuntu-push/bus/notifications 1.117s
ok launchpad.net/ubuntu-push/bus/testing 1.274s
ok launchpad.net/ubuntu-push/bus/urldispatcher 0.504s
ok launchpad.net/ubuntu-push/config 3.014s
ok launchpad.net/ubuntu-push/logger 2.123s
ok launchpad.net/ubuntu-push/protocol 2.831s
ok launchpad.net/ubuntu-push/server 4.244s
ok launchpad.net/ubuntu-push/server/acceptance 1.392s
? launchpad.net/ubuntu-push/server/acceptance/cmd [no test files]
ok launchpad.net/ubuntu-push/server/api 3.382s
ok launchpad.net/ubuntu-push/server/broker 3.287s
ok launchpad.net/ubuntu-push/server/broker/simple 2.592s
? launchpad.net/ubuntu-push/server/broker/testing [no test files]
? launchpad.net/ubuntu-push/server/broker/testsuite [no test files]
? launchpad.net/ubuntu-push/server/dev [no test files]
ok launchpad.net/ubuntu-push/server/listener 22.787s

----------------------------------------------------------------------
FAIL: session_test.go:412: sessionSuite.TestSessionLoopExchangeNextPing

session_test.go:430:
    c.Check(time.Since(tack) < (3+5)*time.Millisecond, Equals, true)
... obtained bool = false
... expected bool = true

OOPS: 22 passed, 1 FAILED
--- FAIL: TestSession (1.30 seconds)
FAIL
FAIL launchpad.net/ubuntu-push/server/session 2.018s
ok launchpad.net/ubuntu-push/server/store 0.340s
? launchpad.net/ubuntu-push/testing [no test files]
ok launchpad.net/ubuntu-push/testing/condition 4.400s
ok launchpad.net/ubuntu-push/util 2.759s
ok launchpad.net/ubuntu-push/whoopsie/identifier 1.296s
ok launchpad.net/ubuntu-push/whoopsie/identifier/testing 0.348s

make: *** [check] Error 1

=== modified file 'util/redialer.go'
--- util/redialer.go	2014-01-27 13:02:26 +0000
+++ util/redialer.go	2014-01-29 11:42:44 +0000
@@ -49,15 +49,14 @@
 	return time.Duration(rand.Int63n(2*n+1) - n)
 }
 
-// AutoRedialer takes a Dialer and retries its Dial() method until it
-// stops returning an error. It does exponential (optionally
-// jitter'ed) backoff.
-func AutoRedial(dialer Dialer) uint32 {
+// AutoRetry keeps on calling f() until it stops returning an error.
+// It does exponential backoff, adding jitter at each step back.
+func AutoRetry(f func() error, jitter func(time.Duration) time.Duration) uint32 {
 	var timeout time.Duration
 	var dialAttempts uint32 = 0 // unsigned so it can wrap safely ...
 	var numTimeouts uint32 = uint32(len(Timeouts))
 	for {
-		if dialer.Dial() == nil {
+		if f() == nil {
 			return dialAttempts + 1
 		}
 		if dialAttempts < numTimeouts {
@@ -65,7 +64,7 @@
 		} else {
 			timeout = Timeouts[numTimeouts-1]
 		}
-		timeout += dialer.Jitter(timeout)
+		timeout += jitter(timeout)
 		dialAttempts++
 		select {
 		case <-quitRedialing:
@@ -75,6 +74,13 @@
 	}
 }
 
+// AutoRedialer takes a Dialer and retries its Dial() method until it
+// stops returning an error. It does exponential (optionally
+// jitter'ed) backoff.
+func AutoRedial(dialer Dialer) uint32 {
+	return AutoRetry(dialer.Dial, dialer.Jitter)
+}
+
 func init() {
 	ps := []int{1, 2, 5, 11, 19, 37, 67, 113, 191} // 3 pₙ₊₁ ≥ 5 pₙ
 	Timeouts = make([]time.Duration, len(ps))

=== modified file 'util/redialer_test.go'
--- util/redialer_test.go	2014-01-27 12:41:54 +0000
+++ util/redialer_test.go	2014-01-29 11:42:44 +0000
@@ -17,6 +17,7 @@
 package util
 
 import (
+	"errors"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
 	testibus "launchpad.net/ubuntu-push/bus/testing"
@@ -54,8 +55,28 @@
 
 func (s *RedialerSuite) TestCanBeStopped(c *C) {
 	endp := testibus.NewTestingEndpoint(condition.Work(false), nil)
-	go func() { c.Check(AutoRedial(endp), Equals, uint32(1)) }()
+	ch := make(chan uint32)
+	go func() { ch <- AutoRedial(endp) }()
 	quitRedialing <- true
+	select {
+	case n := <-ch:
+		c.Check(n, Equals, uint32(1))
+	case <-time.Tick(20 * time.Millisecond):
+		c.Fatal("timed out waiting for redial")
+	}
+}
+
+func (s *RedialerSuite) TestAutoRetry(c *C) {
+	cond := condition.Fail2Work(5)
+	f := func() error {
+		if cond.OK() {
+			return nil
+		} else {
+			return errors.New("X")
+		}
+	}
+	jitter := func(time.Duration) time.Duration { return 0 }
+	c.Check(AutoRetry(f, jitter), Equals, uint32(6))
 }
 
 func (s *RedialerSuite) TestJitter(c *C) {