[Buildbot-commits] [buildbot/buildbot] c1c525: Revert "integration: wait for 'new' change event s...

GitHub noreply at github.com
Sun Aug 2 17:34:16 UTC 2015 

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: c1c525d924174c56974e997c94f28738dddb9f4b
      https://github.com/buildbot/buildbot/commit/c1c525d924174c56974e997c94f28738dddb9f4b
  Author: Ion Alberdi <nolaridebi at gmail.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/test/util/integration.py

  Log Message:
  -----------
  Revert "integration: wait for 'new' change event subscription"

This reverts commit 866e90b5bdd0d4a820c1e6b4bfa2be61cb2b9218.


  Commit: d725a2e6c3daf5eca4b3d9b98c67c967450c89ff
      https://github.com/buildbot/buildbot/commit/d725a2e6c3daf5eca4b3d9b98c67c967450c89ff
  Author: Ion Alberdi <nolaridebi at gmail.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/schedulers/manager.py
    M master/buildbot/util/service.py

  Log Message:
  -----------
  service.py: make clustered service/scheduler manager an async service

The integration tests identify during some executions,
a race condition regarding AnyBranchSchedulers:
- a master starts, with startService
- the AnyBranchSheduler is started by means of
  the SchedulerManager (a service of the master)
  but returns before having started (as the scheduler
  is not an AsynService)
- one change, C, is added,
- the AnyBranchScheduler listens to new change events
  and is now started.

In that situation, the change C will not trigger any build
related to the AnyBranchScheduler configuration.

This commit makes clustered service and the related scheduler
manager become an asyncService, so that their startService
returns a deferred that is fired once they're activated only.

The reconfigService may still not be working though, which
may require to change the SchedulerManager into a
BuildbotServiceManager.


  Commit: ef86db8df6f3790b83b7584c59a6f4d40a272750
      https://github.com/buildbot/buildbot/commit/ef86db8df6f3790b83b7584c59a6f4d40a272750
  Author: Ion Alberdi <nolaridebi at gmail.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/buildslave/manager.py
    M master/buildbot/changes/base.py
    M master/buildbot/changes/pb.py
    M master/buildbot/master.py
    A master/buildbot/process/measured_service.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/manager.py
    M master/buildbot/test/unit/test_changes_base.py
    M master/buildbot/test/unit/test_changes_bitbucket.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_changes_hgpoller.py
    M master/buildbot/test/unit/test_config.py
    M master/buildbot/test/unit/test_schedulers_base.py
    M master/buildbot/test/unit/test_schedulers_forcesched.py
    M master/buildbot/test/unit/test_schedulers_manager.py
    M master/buildbot/test/unit/test_util_service.py
    M master/buildbot/test/util/changesource.py
    M master/buildbot/test/util/scheduler.py
    M master/buildbot/util/service.py

  Log Message:
  -----------
  schedulers/manager.py: make it a BuildbotServiceManager

To do so, this commit implements three refactorings
- make ClusteredService become a BuildbotService
- create measured_service, to factorize the metrics
  method calls during reconfigServiceWithBuildbotConfig
- make schedulers/manager.py (and buildslave/manager.py)
  become a measured_service.MeasuredBuildbotServiceManager


  Commit: 3e6497c0acacb0dc11c4dfdc7791e82fea22dcb1
      https://github.com/buildbot/buildbot/commit/3e6497c0acacb0dc11c4dfdc7791e82fea22dcb1
  Author: Ion Alberdi <ialberdi at intel.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/test/fake/fakemaster.py
    M master/buildbot/test/unit/test_buildslave_manager.py
    M master/buildbot/test/unit/test_schedulers_manager.py
    M master/buildbot/test/unit/test_schedulers_trysched.py
    M master/buildbot/test/unit/test_util_service.py
    M master/buildbot/util/service.py

  Log Message:
  -----------
  service.py: bugfix and adding objectid

When integrate the scheduler_manager into
BuildbotServiceManager the unit test
identified several issues
- objectid, that was previously set
  was not set in BuildbotServiceManager
- some 'yield'-s were missing
- reconfigServiceWithSibling was called
  twice (one for nothing) for services
  that just got added

This commit fixes these issues and factorizes
the some mocks needed for unit tests.


  Commit: 8eb411fcc961f7bef09d5e7eafb6f4cdbacf8cd6
      https://github.com/buildbot/buildbot/commit/8eb411fcc961f7bef09d5e7eafb6f4cdbacf8cd6
  Author: Ion Alberdi <ialberdi at intel.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/util/service.py

  Log Message:
  -----------
  service: clusteredService activityPoll does not wait for its stop

the previous version had a bug as the callback (_activityPoll)
of the object
_activityPollCall = task.LoopingCall(_activityPoll)

waited the activityPollCall to stop during its execution
thus creating a deadlock.

This commit just say the activityPollCall to stop
during the method, and exits without waiting for its end.


  Commit: d83a9a28380405f201ca444499a0b81e2ba3c463
      https://github.com/buildbot/buildbot/commit/d83a9a28380405f201ca444499a0b81e2ba3c463
  Author: Ion Alberdi <ialberdi at intel.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/util/service.py

  Log Message:
  -----------
  utils/service: callback _startServiceDeferred similarly in both cases

there were two different ways in the related class to callback
the _startServiceDeferred:
- _startServiceDeferred.callback(None)
- if _startServiceDeferred is not None:
      _startServiceDeferred.callback(None)
      _startServiceDeferred = None

this commit factorizes the second way in a method
and calls that method in the two situation.


  Commit: 601f6f6d5131343946b140862297ec7da12de2f5
      https://github.com/buildbot/buildbot/commit/601f6f6d5131343946b140862297ec7da12de2f5
  Author: Ion Alberdi <ialberdi at intel.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/changes/manager.py
    M master/buildbot/test/unit/test_changes_manager.py

  Log Message:
  -----------
  manager: don't set children master attribute

the change source children being ClusteredBuildbotService's
the
@property
def master(self)

method ensures the proper computation of the
master. This commit removes
the lines that explicitly set
src.master = ...
of ChangeSource's

in the ChangeManager.


  Commit: 6c3945312f8ad8cd0d0412bc16dbf82f72d4a1d6
      https://github.com/buildbot/buildbot/commit/6c3945312f8ad8cd0d0412bc16dbf82f72d4a1d6
  Author: Ion Alberdi <ialberdi at intel.com>
  Date:   2015-07-24 (Fri, 24 Jul 2015)

  Changed paths:
    M master/buildbot/process/measured_service.py
    M master/buildbot/test/unit/test_config.py
    M master/buildbot/test/unit/test_util_service.py

  Log Message:
  -----------
  test_util_service: pylint and python2.6 compatibility

this commit fixes
- pylint issue, and
- python2.6 compatibility issue ("{}".format(var) should
be replaced by "{0}".format(var) in python2.6)


  Commit: 33c30d02ad29b89be2ee9fab2e03e39e3db940e7
      https://github.com/buildbot/buildbot/commit/33c30d02ad29b89be2ee9fab2e03e39e3db940e7
  Author: Jørn Lomax <northlomax at gmail.com>
  Date:   2015-08-01 (Sat, 01 Aug 2015)

  Changed paths:
    M master/buildbot/changes/filter.py
    M master/buildbot/manhole.py
    M master/buildbot/process/build.py
    M master/buildbot/process/logobserver.py
    M master/buildbot/scripts/create_master.py
    M master/buildbot/status/__init__.py
    M master/buildbot/status/master.py
    M master/buildbot/steps/master.py
    M master/buildbot/steps/transfer.py
    M master/buildbot/test/fake/fakedata.py
    M master/buildbot/test/unit/test_db_users.py
    M master/buildbot/test/util/endpoint.py
    M master/buildbot/test/util/scheduler.py
    M master/buildbot/util/__init__.py
    M master/buildbot/util/croniter.py
    M master/buildbot/util/pickle.py
    M master/buildbot/www/rest.py

  Log Message:
  -----------
  Fix misc. py3 compatibility (types, next(), octals)


  Commit: 7c142ebb128b32a35efdd8451df337c512b88e80
      https://github.com/buildbot/buildbot/commit/7c142ebb128b32a35efdd8451df337c512b88e80
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    M master/buildbot/changes/filter.py
    M master/buildbot/manhole.py
    M master/buildbot/process/build.py
    M master/buildbot/process/logobserver.py
    M master/buildbot/scripts/create_master.py
    M master/buildbot/status/__init__.py
    M master/buildbot/status/master.py
    M master/buildbot/steps/master.py
    M master/buildbot/steps/transfer.py
    M master/buildbot/test/fake/fakedata.py
    M master/buildbot/test/unit/test_db_users.py
    M master/buildbot/test/util/endpoint.py
    M master/buildbot/test/util/scheduler.py
    M master/buildbot/util/__init__.py
    M master/buildbot/util/croniter.py
    M master/buildbot/util/pickle.py
    M master/buildbot/www/rest.py

  Log Message:
  -----------
  Merge branch 'stage1_fixes' of https://github.com/jvlomax/buildbot into betarelease


  Commit: b0062f6a7f0cd187cad061a8382bf3244e171181
      https://github.com/buildbot/buildbot/commit/b0062f6a7f0cd187cad061a8382bf3244e171181
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    M master/buildbot/steps/master.py
    M master/buildbot/util/pickle.py

  Log Message:
  -----------
  autopep8

Signed-off-by: Pierre Tardy <pierre.tardy at intel.com>


  Commit: 01941df391e33ae178fa645bfb86256fa83c78d3
      https://github.com/buildbot/buildbot/commit/01941df391e33ae178fa645bfb86256fa83c78d3
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    M master/buildbot/steps/source/mercurial.py
    M master/buildbot/test/unit/test_steps_source_mercurial.py
    M master/setup.py
    M www/md_base/guanlecoja/config.coffee
    M www/md_base/src/app/builds/builder/builder.controller.coffee
    A www/md_base/src/app/builds/builder/builder.less
    M www/md_base/src/app/builds/builder/builder.route.coffee
    M www/md_base/src/app/builds/builder/builds.builder.tpl.jade
    A www/md_base/src/app/builds/builder/forcedialog/builds.forcedialog.tpl.jade
    A www/md_base/src/app/builds/builder/forcedialog/forcedialog.controller.coffee
    A www/md_base/src/app/builds/builder/forcedialog/forcedialog.less
    A www/md_base/src/app/builds/builder/tabs/builds.builder.buildstab.tpl.jade
    A www/md_base/src/app/builds/builder/tabs/builds.builder.buildtab.tpl.jade
    A www/md_base/src/app/builds/builder/tabs/builds.builder.infotab.tpl.jade
    A www/md_base/src/app/builds/builder/tabs/buildtab.controller.coffee
    A www/md_base/src/app/builds/builder/tabs/buildtab.less
    M www/md_base/src/app/builds/builds.controller.coffee
    M www/md_base/src/app/builds/builds.less
    A www/md_base/src/app/common/directives/buildinfo/buildinfo.directive.coffee
    A www/md_base/src/app/common/directives/buildinfo/buildinfo.less
    A www/md_base/src/app/common/directives/buildinfo/buildinfo.spec.coffee
    A www/md_base/src/app/common/directives/buildinfo/buildinfo.tpl.jade
    M www/md_base/src/app/common/directives/builditem/builditem.directive.coffee
    M www/md_base/src/app/common/directives/builditem/builditem.less
    M www/md_base/src/app/common/directives/builditem/builditem.tpl.jade
    M www/md_base/src/app/common/directives/inspectdata/inspectdata.less
    M www/md_base/src/app/common/directives/inspectdata/inspectdata.tpl.jade
    A www/md_base/src/icons/calendar.svg
    A www/md_base/src/icons/folder.svg
    A www/md_base/src/icons/person.svg
    A www/md_base/src/icons/time.svg

  Log Message:
  -----------
  Merge remote-tracking branch 'buildbot/master' into betarelease


  Commit: 61329332b564992adc38933e101fb9727bf1b92d
      https://github.com/buildbot/buildbot/commit/61329332b564992adc38933e101fb9727bf1b92d
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    M master/buildbot/buildslave/manager.py
    M master/buildbot/changes/base.py
    M master/buildbot/changes/manager.py
    M master/buildbot/changes/pb.py
    M master/buildbot/master.py
    A master/buildbot/process/measured_service.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/manager.py
    M master/buildbot/test/fake/fakemaster.py
    M master/buildbot/test/unit/test_buildslave_manager.py
    M master/buildbot/test/unit/test_changes_base.py
    M master/buildbot/test/unit/test_changes_bitbucket.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_changes_hgpoller.py
    M master/buildbot/test/unit/test_changes_manager.py
    M master/buildbot/test/unit/test_config.py
    M master/buildbot/test/unit/test_schedulers_base.py
    M master/buildbot/test/unit/test_schedulers_forcesched.py
    M master/buildbot/test/unit/test_schedulers_manager.py
    M master/buildbot/test/unit/test_schedulers_trysched.py
    M master/buildbot/test/unit/test_util_service.py
    M master/buildbot/test/util/changesource.py
    M master/buildbot/test/util/integration.py
    M master/buildbot/test/util/scheduler.py
    M master/buildbot/util/service.py

  Log Message:
  -----------
  Merge branch 'raceconditionbis' of https://github.com/yetanotherion/buildbot into betarelease


  Commit: dd4444a1d18f968c8f2e880e2bdee53fe3887725
      https://github.com/buildbot/buildbot/commit/dd4444a1d18f968c8f2e880e2bdee53fe3887725
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    M master/buildbot/test/fake/fakemaster.py

  Log Message:
  -----------
  autopep8

Signed-off-by: Pierre Tardy <pierre.tardy at intel.com>


Compare: https://github.com/buildbot/buildbot/compare/0e50ed1ed37e...dd4444a1d18f

More information about the Commits mailing list