-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
DNM: Proposal for unifying and improving labels in TiDB, TiKV, and PD repos #11729
Conversation
This comment has been minimized.
This comment has been minimized.
IMHO, |
labels.md
Outdated
errmsg #a7c938 T: Error message #1d76db | ||
for new contributors #c2e0c6 D: Mentor #0e8a16 | ||
help wanted #159818 S: HelpWanted #e6e6e6 | ||
needs-cherry-pick-2.1 #000000 T: CherryPick-2.1 #1d76db |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This label means the PR needs to be cherry-picked to the 2.1 release branch.
labels.md
Outdated
status/future #fbca04 ? | ||
type/1.0 cherry-pick #c2e0c6 * | ||
type/2.0 cherry-pick #99d0ef * | ||
type/2.1 cherry-pick #9bfff5 * <T: CherryPick-2.1> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this label means the PR is a cherry-pick on the 2.1 release-branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this used for? I.e., why does it matter if a PR has been cherry-picked?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ping @zz-jason question ^
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rest LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.
labels.md
Outdated
status/DNM #b60205 S: DNM #e6e6e6 | ||
status/LGT1 #d4c5f9 * <S: Waiting on review> | ||
status/LGT2 #5319e7 * <S: Waiting on review> | ||
status/LGT3 #330099 * <S: Waiting on review> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typically, we use these kind of labels to tell whether we can approve the PR after we comment a LGTM
on the PR. If the PR is labeled with LGT1
, then we can approve the PR when we comment another LGTM
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these useful? It seems to me, you can see this from looking at the GitHub reviews (which I guess didn't exist when these labels were created?). And I think a reviewer or author no longer has to merge/approve the PR since the bot should do that automatically once a PR has enough reviews and passing CI.
This comment has been minimized.
This comment has been minimized.
I've updated to take comments into account and make spacing and capitalisation more consistent. I haven't changed the naming scheme yet. Do others prefer |
I prefer |
Now with |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally LGTM, this feels very familiar from all the times I browsed rust repos. :)
The labels look good to me. But I have another question. Where should we put this document? In some dir of the TiDB repo or in the community repo? |
I wasn't planning to keep this document, just make the changes to the labels and close this PR.Do you want to keep it? |
I'd like to see the TiKV portion go to our RFCs repo. :) Let's get two approvals form the TiKV maintainers first so we can be sure to merge it without change. cc @BusyJay @zhangjinpeng1987 @siddontang @sunxiaoguang PTAL and let us know if you are willing to merge this as-is as a TiKV RFC. |
ping @zz-jason I've addressed some of your comments in the labels doc and have replied to other comments inline. PTAL |
re-ping @zz-jason are you satisfied with the answers to your questions? |
## TiKV | ||
|
||
``` | ||
C: Build #d1fad7 component/build #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like these two conflicts to each other: "We use a C: label
scheme for all repos" "Current labels and colours are on the left, proposed are on the right"
C: Txn #d1fad7 component/transactions #d1fad7 | ||
C: Util #d1fad7 component/util #d1fad7 | ||
C: gRPC #d1fad7 component/gRPC #d1fad7 | ||
D: Easy #0e8a16 difficulty/easy #0e8a16 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that we previously used labels like "Component: Copr". However it is too long so changed to "C: Copr".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Too long means there is a length limit on GitHub or it didn't look good?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
component/bench #d1fad7 | ||
C: TiKV-Client #d1fad7 component/TiKV client #d1fad7 | ||
C: TiKV-Ctl #d1fad7 component/TiKV ctl #d1fad7 | ||
C: Titan #d1fad7 component/Titan #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like we can merge C: RocksDB and C: Titan into C: Engine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
I am not sure whether putting it in RFC is good or not. But to unify the labels for all Repos, I think we should use a place to put it. |
Thanks, @nrc here I just see the color number like #0e8a16, but what does it really look like? How can we know it? |
@@ -0,0 +1,220 @@ | |||
# Goals | |||
|
|||
* synchronise labels between repos |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need to capitalize the first letter?
/cc @dcalvin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should - but it does not matter here, as the point of this document is to finalize the labels.
@siddontang what do you think of the colours in #11729 (comment)? @zz-jason are you happy with the answers to your questions inline? |
LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the status of #11729 (comment) ?
@winkyao @shenli and @siddontang prefer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
/cc @zhouqiang-cl, please pay attention to this PR, which may affect CI, benchbot, etc.
ok |
I vote for |
|
||
``` | ||
C: Build #d1fad7 component/build #d1fad7 | ||
C: Build-Time #d1fad7 component/build time #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
look like build time is a subset of build
C: Copr #d1fad7 component/coprocessor #d1fad7 | ||
C: Doc #d1fad7 component/docs #d1fad7 | ||
C: PD-Client #d1fad7 component/PD client #d1fad7 | ||
C: Perf #d1fad7 component/perf #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since now full names are preferred then it should be component/performance
?
C: Doc #d1fad7 component/docs #d1fad7 | ||
C: PD-Client #d1fad7 component/PD client #d1fad7 | ||
C: Perf #d1fad7 component/perf #d1fad7 | ||
C: Raft #d1fad7 component/raft #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be Raft
instead of raft
?
C: Test/Bench #d1fad7 component/test #d1fad7 | ||
component/bench #d1fad7 | ||
C: TiKV-Client #d1fad7 component/TiKV client #d1fad7 | ||
C: TiKV-Ctl #d1fad7 component/TiKV ctl #d1fad7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TiKV control
?
C: gRPC #d1fad7 component/gRPC #d1fad7 | ||
D: Easy #0e8a16 difficulty/easy #0e8a16 | ||
D: Medium #f4b169 difficulty/medium #0e8a16 | ||
D: Mentor #31c639 difficulty/mentor #0e8a16 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW I'm curious what is a "mentor" difficulty XD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we remove this label?
S: CanMerge #4be524 status/bot merge #e6e6e6 | ||
S: DNM #DDDDDD status/DNM #e6e6e6 | ||
S: Discussion #fbca04 type/discussion #1d76db | ||
S: Duplicate #dddddd status/closed dup #e6e6e6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be the full name "status/closed for duplicate"?
P: Low #eeee00 priority/low #eb6420 | ||
P: Release-blocker #f25c8e priority/blocker #eb6420 | ||
S: BotClose #c6054c status/bot close #e6e6e6 | ||
S: CanMerge #4be524 status/bot merge #e6e6e6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bot close is closed by bot but bot merge is not merged by bot, so I think they should not looks to be similar at least.
S: Duplicate #dddddd status/closed dup #e6e6e6 | ||
S: HelpWanted #fbca04 status/help wanted #e6e6e6 | ||
S: Invalid #dddddd status/closed invalid #e6e6e6 | ||
S: LGT1 #66d7ee status/waiting on review #e6e6e6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like normal PRs should mostly be in a "waiting on review" status and then this label does not have much meaning?
T: CherryPick #1d76db * <type/cherry pick 2.1 or type/cherry pick 3.0> | ||
T: Contributor ⭐️ #1d76db type/contributor ⭐️ #1d76db | ||
T: Enhancement #1d76db type/enhancement #1d76db | ||
T: NeedCherryPick-2.1 #333333 type/cherry pick 2.1 #1d76db |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
T: NeedCherryPick
is not the same as cheery pick. NeedCherryPick is a hint for bot which means bot will create a cherry pick PR for it later and this PR is usually NOT a cheery pick, while T: CherryPick
means this PR is a cheery pick.
S: Waiting #DDDDDD status/waiting on author #e6e6e6 | ||
T: Bug #d93f0b type/bug #1d76db | ||
T: BugFix #1d76db type/bug fix #1d76db | ||
T: CHANGELOG #006b75 type/CHANGELOG #1d76db |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This label is rarely used and I think it can be removed.
D: Mentor #31c639 difficulty/mentor #0e8a16 | ||
P: Critical #ed0000 priority/high #eb6420 | ||
P: High #ed8888 priority/medium #eb6420 | ||
P: Low #eeee00 priority/low #eb6420 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's appropriate for different priorities to have the same color.
S: Discussion #fbca04 type/discussion #1d76db | ||
S: Duplicate #dddddd status/closed dup #e6e6e6 | ||
S: HelpWanted #fbca04 status/help wanted #e6e6e6 | ||
S: Invalid #dddddd status/closed invalid #e6e6e6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In TiKV, Gray status is specifically marked for those PRs that is no need to take a look, e.g. invalid, working in progress, waiting for the author, do not merge, etc. Other status has different (i.e. vivid) colors that means it deserves a look. So it may be not appropriate for all status to have the same gray color.
Top most GitHub engineering projects, order by stars, are following these styles:
Maybe neither |
status/all tests passed #2cbe4e * <status/bot merge> | ||
status/can merge #2cbe4e status/bot merge #e6e6e6 | ||
status/future #fbca04 ? | ||
type/1.0 cherry-pick #c2e0c6 * |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By using labels like type/cherry pick 2.1
to identify whether a PR on the master branch needs to be cherry-picked to release 2.1, we also need labels to identify which branch the PR is submitted on.
A typical use case is we need to check whether there still some un-merged PRs on a release branch, such as release-2.1, before releasing a new version on that release branch.
How about using the following labels to identify which branch the PR is submitted on:
branch/release-2.0
branch/release-2.1
branch/release-3.0
Update @zhouqiang-cl has made (roughly) these changes to the TiKV repo. |
Hi @nrc, since all the repos are following this proposal, can we close or merge this PR? |
For discussion only. See the document for description, etc: rendered
PTAL everyone!
Leave comments by reviewing