Skip to content

Make sure that we're not evaluating excluded branches #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2015

Conversation

orjan
Copy link
Contributor

@orjan orjan commented Oct 9, 2015

This pull request addresses issue #684

@orjan
Copy link
Contributor Author

orjan commented Oct 9, 2015

In #673 I noticed that track-merge-target must be set to track develop is develop is merged into master but then, getting the base configuration got really slow on the build server e.g.

feature[/-]:
    track-merge-target: true
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:35] Project root is: D:\BuildAgent\work\607b08944775ee0f
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:45] Using latest commit on specified branch
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:46] Begin: Attempting to inherit branch configuration from parent branch
[20:31:40][Step 1/1]   INFO [10/08/15 20:30:56:46] Begin: Finding branch source
[20:31:41][Step 1/1]   INFO [10/08/15 20:30:56:68] End: Finding branch source (Took: 217.25ms)
[20:34:53][Step 1/1]   INFO [10/08/15 20:34:09:30] Found possible parent branches: develop, origin/develop, origin/feature/BRIKKS-4556-spider
[20:34:53][Step 1/1]   WARN [10/08/15 20:34:09:30] Failed to inherit Increment branch configuration, ended up with: develop, origin/develop, origin/feature/BRIKKS-4556-spider
[20:34:53][Step 1/1] 
[20:34:53][Step 1/1] Falling back to develop branch config
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:30] End: Attempting to inherit branch configuration from parent branch (Took: 192,845.07ms)
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:32] Running against branch: feature/BRIKKS-4569 (e9b0fbfec6d781af8ebd47e478cdcef036fb69e3)
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:33] Begin: Calculating base versions

This my first attempt to address this performance bottleneck and all feedback is welcome.

image

@JakeGinnivan
Copy link
Contributor

Did you see my comment on the cause in the other thread?

Sent from my Windows Phone


From: Örjan Sjöholmmailto:[email protected]
Sent: ‎10/‎10/‎2015 5:56 AM
To: GitTools/GitVersionmailto:[email protected]
Subject: Re: [GitVersion] [WIP] Getting base configuration a little bit faster (#680)

In #673#673 I noticed that track-merge-target must be set to track develop is develop is merged into master but then, getting the base configuration got really slow on the build server e.g.

feature[/-]:
track-merge-target: true

[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:35] Project root is: D:\BuildAgent\work\607b08944775ee0f
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:45] Using latest commit on specified branch
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:46] Begin: Attempting to inherit branch configuration from parent branch
[20:31:40][Step 1/1] INFO [10/08/15 20:30:56:46] Begin: Finding branch source
[20:31:41][Step 1/1] INFO [10/08/15 20:30:56:68] End: Finding branch source (Took: 217.25ms)
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:30] Found possible parent branches: develop, origin/develop, origin/feature/BRIKKS-4556-spider
[20:34:53][Step 1/1] WARN [10/08/15 20:34:09:30] Failed to inherit Increment branch configuration, ended up with: develop, origin/develop, origin/feature/BRIKKS-4556-spider
[20:34:53][Step 1/1]
[20:34:53][Step 1/1] Falling back to develop branch config
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:30] End: Attempting to inherit branch configuration from parent branch (Took: 192,845.07ms)
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:32] Running against branch: feature/BRIKKS-4569 (e9b0fbfec6d781af8ebd47e478cdcef036fb69e3)
[20:34:53][Step 1/1] INFO [10/08/15 20:34:09:33] Begin: Calculating base versions

This my first attempt to address this performance bottleneck and all feedback is welcome.

[image]https://cloud.githubusercontent.com/assets/124032/10406566/4575f040-6ee1-11e5-8394-61b78108b9b9.png


Reply to this email directly or view it on GitHubhttps://github.com//pull/680#issuecomment-146995411.

@orjan
Copy link
Contributor Author

orjan commented Oct 10, 2015

If you are referring to removing the commit message strategy, so yes? I think this pr addresses something else, e.g the last yellow line in the trace here: #677 (comment)

I think it's 2 different execution paths, both suffering performance problems?

@orjan orjan force-pushed the performance-get-base-config branch from 6a4d975 to 0eb9eb5 Compare October 11, 2015 20:28
@orjan orjan changed the title [WIP] Getting base configuration a little bit faster Make sure that we're not evaluating excluded branches Oct 11, 2015
@orjan
Copy link
Contributor Author

orjan commented Oct 11, 2015

Dot trace after the optimization:

image

orjan added 2 commits October 12, 2015 13:31
This commit removes the excluded branches before we're trying to find
branches containing the commit.

This will also exclude branches we it's not possible to find a
configuration.

Fixes GitTools#684
@orjan orjan force-pushed the performance-get-base-config branch from 0eb9eb5 to 33f8921 Compare October 12, 2015 11:36
JakeGinnivan added a commit that referenced this pull request Oct 17, 2015
Make sure that we're not evaluating excluded branches
@JakeGinnivan JakeGinnivan merged commit 976eadc into GitTools:master Oct 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants