Navigation

Changeset 458

Timestamp:

09/29/07 13:22:30 (1 year ago)

Author:

warner@lothar.com

Message:

runner: increase start/stop timeout to 10 seconds, for #68

Files:

r457	r458
1	1	2007-09-29 Brian Warner <warner@lothar.com>
	2
	3	* buildbot/scripts/runner.py (stop): increase the timeout from 5
	4	seconds to 10, to give heavily loaded machines a better chance to
	5	finish shutting down. Addresses (partially) #68.
	6	* buildbot/scripts/logwatcher.py (LogWatcher.TIMEOUT_DELAY): same,
	7	on startup
	8	* buildbot/scripts/reconfig.py (Reconfigurator.run): same
	9	* buildbot/scripts/startup.py (Follower._failure): update message
2	10
3	11	* buildbot/changes/bonsaipoller.py: apply changes from the Mozilla

r267	r458
19	19	class LogWatcher(LineOnlyReceiver):
20	20	POLL_INTERVAL = 0.1
21		TIMEOUT_DELAY = 5.0
	21	TIMEOUT_DELAY = 10.0
22	22	delimiter = os.linesep
23	23
…	…
32	32	# return a Deferred that fires when the reconfig process has
33	33	# finished. It errbacks with TimeoutError if the finish line has not
34		# been seen within 5 seconds, and with ReconfigError if the error
	34	# been seen within 10 seconds, and with ReconfigError if the error
35	35	# line was seen. If the logfile could not be opened, it errbacks with
36	36	# an IOError.

r267	r458
21	21	# configuration from ..." and "configuration update complete" or
22	22	# "I will keep using the previous config file instead.", or until
23		# 5 seconds have elapsed.
	23	# 10 seconds have elapsed.
24	24
25	25	self.sent_signal = False

r438	r458
378	378	return
379	379	time.sleep(0.1)
380		while timer < 5:
381		# poll once per second until twistd.pid goes away, up to 5 seconds
	380	while timer < 10:
	381	# poll once per second until twistd.pid goes away, up to 10 seconds
382	382	try:
383	383	os.kill(pid, 0)

r377	r458
26	26	if why.check(BuildmasterTimeoutError):
27	27	print """
28		The buildmaster took more than 5 seconds to start, so we were unable to
	28	The buildmaster took more than 10 seconds to start, so we were unable to
29	29	confirm that it started correctly. Please 'tail twistd.log' and look for a
30	30	line that says 'configuration update complete' to verify correct startup.
…	…
32	32	elif why.check(BuildslaveTimeoutError):
33	33	print """
34		The buildslave took more than 5 seconds to start and/or connect to the
	34	The buildslave took more than 10 seconds to start and/or connect to the
35	35	buildmaster, so we were unable to confirm that it started and connected
36	36	correctly. Please 'tail twistd.log' and look for a line that says 'message