@@ -18,6 +18,8 @@ TRUNK - [bugfix] Make dashboard xhtml compliant - [bugfix] Recognize OpenBSD as a platform - Improve daemon_helper to kill all child processes (don't leave any orphans) +- [bugfix] Timeout if 'git fetch origin' hangs. Configurable via git_load_new_changesets_timeout. + Fixes https://cruisecontrolrb.lighthouseapp.com/projects/9150-cruise-control-rb/tickets/229-sometimes-git-hangs ------------------------------------------------------------------------------------------------------------------------ * 1.3.0 CHANGELOG @@ -9,12 +9,13 @@ class Configuration @disable_build_now = false @serialize_builds = false @serialized_build_timeout = 1.hour + @git_load_new_changesets_timeout = 5.minutes class << self # published configuration options (mentioned in config/site_config.rb.example) attr_accessor :default_polling_interval, :disable_build_now, :email_from, :dashboard_refresh_interval, :serialize_builds, - :serialized_build_timeout + :serialized_build_timeout, :git_load_new_changesets_timeout attr_reader :dashboard_url # non-published configuration options (obscure stuff, mostly useful for http://cruisecontrolrb.thoughtworks.com) config/configuration.rb @@ -63,6 +63,9 @@ # Amount of time a project will wait to build before failing when build serialization is on # Configuration.serialized_build_timeout = 3.hours +# Amount of time a project will wait for git to load new changesets before failing +# Configuration.git_load_new_changesets_timeout = 5.minutes + # To delete build when there are more than a certain number present, uncomment this line - it will make the dashboard # perform better # BuildReaper.number_of_builds_to_keep = 20 config/site_config.rb_example @@ -93,7 +93,12 @@ module SourceControl end def load_new_changesets_from_origin - git("fetch", ["origin"]) + Timeout.timeout(Configuration.git_load_new_changesets_timeout, Timeout::Error) do + sleep 5 + git("fetch", ["origin"]) + end + rescue Timeout::Error => e + raise BuilderError.new("Timeout in 'git fetch origin'") end def git(operation, arguments = [], options = {}, &block) lib/source_control/git.rb @@ -77,9 +77,9 @@ class SourceControl::GitTest < Test::Unit::TestCase def test_latest_revision_should_call_git_log_and_send_it_to_parser in_sandbox do git = new_git + git.expects(:git).with('fetch', ['origin']) git.expects(:git).with("branch").yields(StringIO.new("* master\n")) git.expects(:git).with("log", ["-1", '--pretty=raw', "--stat", 'origin/master']).returns('') - git.expects(:git).with('fetch', ['origin']) stub_parser = Object.new stub_parser.stubs(:parse).returns([:foo]) Git::LogParser.expects(:new).returns(stub_parser) @@ -88,6 +88,33 @@ class SourceControl::GitTest < Test::Unit::TestCase end end + def test_latest_revision_should_timeout + in_sandbox do + git = new_git + class << git + def git(*args) + sleep 1 + end + end + + begin + old_timeout = Configuration.git_load_new_changesets_timeout + Configuration.git_load_new_changesets_timeout = 0.5 + + assert_raise(BuilderError) do + begin + git.latest_revision + rescue BuilderError => e + assert_equal "Timeout in 'git fetch origin'", e.message + raise e + end + end + ensure + Configuration.git_load_new_changesets_timeout = old_timeout + end + end + end + def test_current_branch_should_parse_git_branch_output in_sandbox do git = new_git test/unit/source_control/git_test.rb 2b03f393005c0c10ed92824a999876d777993730 Chad Woolley & Josh Susser thewoolleyman+josh_and_chad@gmail.com http://github.com/thoughtworks/cruisecontrol.rb/commit/d0319803832321f7b5618344e12af69bc0874ba2 d0319803832321f7b5618344e12af69bc0874ba2 2009-05-11T16:35:02-07:00 2009-05-11T16:35:02-07:00 Add timeout for git fetch origin. See https://cruisecontrolrb.lighthouseapp.com/projects/9150-cruise-control-rb/tickets/229-sometimes-git-hangs eb5252cfb5183f6f363ebff5e5802f1417e1eb98 Chad Woolley & Josh Susser thewoolleyman+josh_and_chad@gmail.com