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

Should issues creating churn on 100s of files require backports to land? #16249

Closed
MylesBorins opened this issue Oct 17, 2017 · 20 comments
Closed
Labels
discuss Issues opened for discussions and feedbacks. meta Issues and PRs related to the general management of the project.

Comments

@MylesBorins
Copy link
Contributor

I was just reviewing #14162 which created a new lint rule and touched 294 with a very subtle style churn. I have no problems with this type of change landing, but I think that we may want to consider pre-opening backport PRs as part of the sign off requirements.

The potential for running into conflicts mid audit becomes quite large when touching a large percentage of the tests at once like this.

@mscdex mscdex added the meta Issues and PRs related to the general management of the project. label Oct 17, 2017
@joyeecheung
Copy link
Member

joyeecheung commented Oct 17, 2017

SGTM, although we could lower the number 100 if necessary. Maybe a new label like needs-pre-backport so the person landing PRs will be reminded to double-check?

@MylesBorins
Copy link
Contributor Author

another commit touching > 100 files

#13757

This seems to be a pattern in the last couple months that we had not done in the past

@nodejs/tsc how would you suggest going from here? Should we add this to the agenda?

@nodejs/collaborators would enjoy some more insight on this

@Trott
Copy link
Member

Trott commented Oct 18, 2017

I love this idea.

@jasnell
Copy link
Member

jasnell commented Oct 18, 2017

I'm -0 on requiring a backport PR in order for the original to land. I'd be more inclined to not backport these types of changes (and yes, I fully realize that not doing so creates it's own backporting burden)... but I would argue that these kinds of broad brush changes do not necessarily need to be backported at all.

@joyeecheung
Copy link
Member

joyeecheung commented Oct 18, 2017

@jasnell One problem is, if they have touched enough files then not backporting them will result in more conflicts later, because new PRs will come to depend on those changes, especially those touching a lot of tests

@jasnell
Copy link
Member

jasnell commented Oct 18, 2017

Yeah, I've been through that pain first hand, which is why I'm only -0. I don't think this should be a hard rule, but a useful recommendation. There are just going to be cases where backporting them is not necessary

@mcollina
Copy link
Member

I think this is a great idea. It should simplify the work of the release team.

@cjihrig
Copy link
Contributor

cjihrig commented Oct 18, 2017

I think this is a good idea.

@BridgeAR
Copy link
Member

I like the idea. There might be some difficulties with that as well but I think we should give it a try.

@gibfahn
Copy link
Member

gibfahn commented Oct 18, 2017

I like the idea, and I agree that if it touches enough files then backporting is necessary for the sake of the backporting team.

My worry would be that this will lead to us backporting things straight away. How would this work if we wanted to leave the PR to bake in current for a release or two?

@vsemozhetbyt
Copy link
Contributor

I recall that, for some of my big-churn PRs, LTS maintainers ask me to promise to do a backport when the time comes. Maybe we can just formalize such promises? Or this does not guarantee us anything?

@vsemozhetbyt
Copy link
Contributor

vsemozhetbyt commented Oct 18, 2017

We can also ask that all the reviewers with LGTM would promise to help with a backport if the author cannot do it due to some circumstances (+ re-review the backport).

@vsemozhetbyt
Copy link
Contributor

vsemozhetbyt commented Oct 18, 2017

Also, maybe it is worth to mention in the guides that a contributor may need to ask in an issue if some big-churn PR would be accepted (and would have reviewers and backport guarantees) to prevent disappointing and wasting time.

@gibfahn
Copy link
Member

gibfahn commented Oct 18, 2017

I recall that, for some of my big-churn PRs, LTS maintainers ask me to promise to do a backport when the time comes. Maybe we can just formalize such promises? Or this does not guarantee us anything?

We can also ask that all the reviewers with LGTM would promise to help with a backport if the author cannot do it due to some circumstances (+ re-review the backport).

I think we should formalize both of these things for all PRs, to help set expectations. If your PR gets landed and needs a backport, you should be ready to do said backport. Obviously help is available if you're unsure.

@MylesBorins
Copy link
Contributor Author

I like all of these ideas! Does anyone feel like taking the action item of formalizing some of this in the Contributor guide?

@joyeecheung
Copy link
Member

joyeecheung commented Oct 20, 2017

@MylesBorins I think this actually belongs to the collaborator guide?

So far the ideas are:

  • If a PR creates churn on > 100 files, a pre-backporting PR should be requsted/required (not sure about which)
    • The person creating that PR does not have to make the promise, reviewers can do that as well
  • Add a label for this request
  • Suggest that if one wants to make a PR that would create a lof of churn, discuss on the issue tracker first to avoid wasting their time.

@gibfahn
Copy link
Member

gibfahn commented Oct 20, 2017

@MylesBorins I think this actually belongs to the collaborator guide?

This is for all contributors though, not just collaborators, so maybe Contributing makes more sense.

@joyeecheung
Copy link
Member

joyeecheung commented Oct 20, 2017

@gibfahn Yeah. but my instincts was this should be placed where the "semver-major needs two TSC sign-off" is, and turns out that's in the collaborator guide. I guess that makes sense because it's the people landing it should be the most careful.

@MylesBorins
Copy link
Contributor Author

I'll put something together and submit to the collaborator's guide

@srl295
Copy link
Member

srl295 commented Oct 23, 2017 via email

@TimothyGu TimothyGu added the discuss Issues opened for discussions and feedbacks. label Feb 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
discuss Issues opened for discussions and feedbacks. meta Issues and PRs related to the general management of the project.
Projects
None yet
Development

No branches or pull requests