Skip to content
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

1191: CommitCommentWorkItem overwhelms scheduler #1223

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Sep 27, 2021

Main goal if this patch is to fix the scheduling issue caused by CommitCommentsWorkItems::concurrentWith always returning true. To solve this a little nicer, I decided to expand on the idea I introduced a while back with PullRequest::isSame, and add the corresponding method to HostedRepository. This made implementing the ::concurrentWith methods cleaner IMO.

In addition to this, I decided to add two new gauges to the metrics collection, which would have made it much easier to discover this issue if we already had them. These gauges report the number of active and pending WorkItems we have respectively in the BotRunner, summarized per WorkItem type using labels. To achieve this as nicely as I could, I refactored the BotRunner a little bit, moving all adds and removes for the active and pending maps to specific methods.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1191: CommitCommentWorkItem overwhelms scheduler

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1223/head:pull/1223
$ git checkout pull/1223

Update a local copy of the PR:
$ git checkout pull/1223
$ git pull https://git.openjdk.java.net/skara pull/1223/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1223

View PR using the GUI difftool:
$ git pr show -t 1223

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1223.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 27, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1191 1191: CommitCommentWorkItem overwhelms scheduler Sep 27, 2021
@openjdk openjdk bot added the rfr label Sep 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 27, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

1191: CommitCommentWorkItem overwhelms scheduler

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Sep 27, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Sep 28, 2021

Thanks Kevin!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

Going to push as commit 91be684.

@openjdk openjdk bot closed this Sep 28, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

@erikj79 Pushed as commit 91be684.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants