1
=== modified file 'testing/mgo.go'
2
--- testing/mgo.go	2014-05-12 07:59:38 +0000
3
+++ testing/mgo.go	2014-05-14 07:43:49 +0000
4
@@ -38,6 +38,11 @@
5
38
	waitingForConnectionsRe = regexp.MustCompile(".*initandlisten.*waiting for connections.*")
38
	waitingForConnectionsRe = regexp.MustCompile(".*initandlisten.*waiting for connections.*")
6
39
)
39
)
7
40
40
8
41
const (
9
42
	// maximum number of times to attempt starting mongod
10
43
	maxStartMongodAttempts = 5
11
44
)
12
45
13
41
type MgoInstance struct {
46
type MgoInstance struct {
14
42
	// addr holds the address of the MongoDB server
47
	// addr holds the address of the MongoDB server
15
43
	addr string
48
	addr string
16
@@ -107,18 +112,29 @@
17
107
	if err != nil {
112
	if err != nil {
18
108
		return fmt.Errorf("cannot write cert/key PEM: %v", err)
113
		return fmt.Errorf("cannot write cert/key PEM: %v", err)
19
109
	}
114
	}
32
110
	inst.port = FindTCPPort()
115
33
111
	inst.addr = fmt.Sprintf("localhost:%d", inst.port)
116
	// Attempt to start mongo up to maxStartMongodAttempts times,
34
112
	inst.dir = dbdir
117
	// as the port we choose may be taken from us in the mean time.
35
113
	inst.ssl = ssl
118
	for i := 0; i < maxStartMongodAttempts; i++ {
36
114
	if err := inst.run(); err != nil {
119
		inst.port = FindTCPPort()
37
115
		inst.addr = ""
120
		inst.addr = fmt.Sprintf("localhost:%d", inst.port)
38
116
		inst.port = 0
121
		inst.dir = dbdir
39
117
		os.RemoveAll(inst.dir)
122
		inst.ssl = ssl
40
118
		inst.dir = ""
123
		err = inst.run()
41
119
		logger.Warningf("failed to start mongo: %v", err)
124
		switch err.(type) {
42
120
	} else {
125
		case addrAlreadyInUseError:
43
121
		logger.Debugf("started mongod pid %d in %s on port %d", inst.server.Process.Pid, dbdir, inst.port)
126
			logger.Debugf("failed to start mongo: %v, trying another port", err)
44
127
			continue
45
128
		case nil:
46
129
			logger.Debugf("started mongod pid %d in %s on port %d", inst.server.Process.Pid, dbdir, inst.port)
47
130
		default:
48
131
			inst.addr = ""
49
132
			inst.port = 0
50
133
			os.RemoveAll(inst.dir)
51
134
			inst.dir = ""
52
135
			logger.Warningf("failed to start mongo: %v", err)
53
136
		}
54
137
		break
55
122
	}
138
	}
56
123
	return err
139
	return err
57
124
}
140
}
58
@@ -139,6 +155,7 @@
59
139
		"--noprealloc",
155
		"--noprealloc",
60
140
		"--smallfiles",
156
		"--smallfiles",
61
141
		"--nojournal",
157
		"--nojournal",
62
158
		"--nohttpinterface",
63
142
		"--nounixsocket",
159
		"--nounixsocket",
64
143
		"--oplogSize", "10",
160
		"--oplogSize", "10",
65
144
		"--keyFile", filepath.Join(inst.dir, "keyfile"),
161
		"--keyFile", filepath.Join(inst.dir, "keyfile"),
66
@@ -186,7 +203,11 @@
67
186
		if readUntilMatching(prefix, io.TeeReader(out, &buf), waitingForConnectionsRe) {
203
		if readUntilMatching(prefix, io.TeeReader(out, &buf), waitingForConnectionsRe) {
68
187
			listening <- nil
204
			listening <- nil
69
188
		} else {
205
		} else {
71
189
			listening <- fmt.Errorf("mongod failed to listen on port %v", mgoport)
206
			err := fmt.Errorf("mongod failed to listen on port %v", mgoport)
72
207
			if strings.Contains(buf.String(), "addr already in use") {
73
208
				err = addrAlreadyInUseError{err}
74
209
			}
75
210
			listening <- err
76
190
		}
211
		}
77
191
		// Capture the last 20 lines of output from mongod, to log
212
		// Capture the last 20 lines of output from mongod, to log
78
192
		// in the event of unclean exit.
213
		// in the event of unclean exit.
79
@@ -528,3 +549,7 @@
80
528
	l.Close()
549
	l.Close()
81
529
	return l.Addr().(*net.TCPAddr).Port
550
	return l.Addr().(*net.TCPAddr).Port
82
530
}
551
}
83
552
84
553
type addrAlreadyInUseError struct {
85
554
	error
86
555
}
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-05-14	Pending
Review via email: mp+219456@code.launchpad.net