Skip to content

2573: Support 2 reviewers by default for some areas of the JDK#1764

Open
zhaosongzs wants to merge 6 commits intoopenjdk:masterfrom
zhaosongzs:SKARA-2573
Open

2573: Support 2 reviewers by default for some areas of the JDK#1764
zhaosongzs wants to merge 6 commits intoopenjdk:masterfrom
zhaosongzs:SKARA-2573

Conversation

@zhaosongzs
Copy link
Copy Markdown
Member

@zhaosongzs zhaosongzs commented Apr 6, 2026

There was a two-reviewers feature in Skara. We can configure two-reviewers labels in the configuration and if the PR contains one of the two-reviewers labels, when the PR is ready for integration, in the merge ready comment, skara would add a line "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." However, this feature was never used in production. It's only used in skara repo(e.g. #1761 (comment)), and I never noticed this message...
This PR is trying to make an improvement for this feature, when the PR contains two-reviewers label, the bot will automatically increase reviewers count to 2. Even when the label is removed later, the count won't be lowered back.
Also, the explicit "/reviewers" command will always win in this case.


  • I have successfully run sh gradlew test on macOS or Linux

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace

Issue

  • SKARA-2573: Support 2 reviewers by default for some areas of the JDK (Enhancement - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/skara.git pull/1764/head:pull/1764
$ git checkout pull/1764

Update a local copy of the PR:
$ git checkout pull/1764
$ git pull https://git.openjdk.org/skara.git pull/1764/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1764

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/skara/pull/1764.diff

Using Webrev

Link to Webrev Comment

# Conflicts:
#	bots/pr/src/test/java/org/openjdk/skara/bots/pr/CheckTests.java
@bridgekeeper
Copy link
Copy Markdown

bridgekeeper bot commented Apr 6, 2026

👋 Welcome back zsong! 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
Copy link
Copy Markdown

openjdk bot commented Apr 6, 2026

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title 2573 2573: Support 2 reviewers by default for some areas of the JDK Apr 6, 2026
@kevinrushforth
Copy link
Copy Markdown
Member

Will we be able to take advantage of this for jfx? We don't have any labels for different code areas, so I'd want to be able to configure Skara to always default to 2 reviewers for the main jfx repo, allowing for /reviewers 1 to lower it back down.

@zhaosongzs
Copy link
Copy Markdown
Member Author

Will we be able to take advantage of this for jfx? We don't have any labels for different code areas, so I'd want to be able to configure Skara to always default to 2 reviewers for the main jfx repo, allowing for /reviewers 1 to lower it back down.

Yes, we can configure 'rfr' as the two-reviewers label for jfx repo.

@zhaosongzs zhaosongzs marked this pull request as ready for review April 6, 2026 20:26
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 6, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge bot commented Apr 6, 2026

Webrevs

return comments;
}

var marker = ReviewersTracker.setReviewersMarker(2, "reviewers");
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is correct. The common "2 reviewers" requirement in various part of the JDK is, at least as far as I understand it, equivalent to /reviewers 2, not /reviewers 2 reviewer. So the required additional reviewer does not need the project role "Reviewer". I think this call will result in requiring two reviews from role reviewer. I think it would be correct to just change "reviewers" to "authors", but I'm not 100% sure.

Suggested change
var marker = ReviewersTracker.setReviewersMarker(2, "reviewers");
var marker = ReviewersTracker.setReviewersMarker(2, "authors");

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe @kevinrushforth can answer this question.

I am ok to change it to authors, at least 1 reviewer will be required, so it only affects the requirement of second reviewer's role.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Erik is right. The expectation is that it is equivalent to /reviewers 2 which would be 1 reviewers and 1 author or higher.

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

Labels

rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants