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

src: remove duplicate env field from CryptoJob #31588

Closed
wants to merge 2 commits into from

Conversation

bnoordhuis
Copy link
Member

Alternative take on #31554 that tightens up the use of env() getters.

First:

src: remove duplicate env field from CryptoJob

Add a `ThreadPoolWork::env()` getter and use that. To fix the diamond
problem in class CompressionStream that inherits from both AsyncWrap
and ThreadPoolWork, we add a `CompressionStream::env()` getter that
delegates to `AsyncWrap::env()`.

And then:

src: StreamBase::stream_env() -> StreamBase::env()

Rename `StreamBase::stream_env()` to `StreamBase::env()` and work around
the diamond problem by adding `env()` getters to several classes.

Add a `ThreadPoolWork::env()` getter and use that. To fix the diamond
problem in class CompressionStream that inherits from both AsyncWrap
and ThreadPoolWork, we add a `CompressionStream::env()` getter that
delegates to `AsyncWrap::env()`.

Refs: nodejs#31554 (comment)
Rename `StreamBase::stream_env()` to `StreamBase::env()` and work around
the diamond problem by adding `env()` getters to several classes.

Refs: nodejs#31554 (comment)
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Jan 31, 2020
@nodejs-github-bot
Copy link
Collaborator

@jasnell
Copy link
Member

jasnell commented Jan 31, 2020

Can I ask that you add @conordavenport as a co-author on the first commit here

@bnoordhuis
Copy link
Member Author

I wrote it from scratch, I didn't copy anything from the other PR.

@jasnell
Copy link
Member

jasnell commented Jan 31, 2020

I wrote it from scratch, I didn't copy anything from the other PR.

Yet it duplicates much of that and it's unlikely you would have opened this if not for the other. Is there some kind of harm in listing a co-author that I'm not aware of? Doing so does seem friendlier to a new contributor.

@bnoordhuis
Copy link
Member Author

Is there some kind of harm in listing a co-author that I'm not aware of?

I only do that when I take someone's existing patch and modify it.

jasnell
jasnell previously requested changes Feb 1, 2020
Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

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

Prefer that a fixed up version of #31554 land instead to cover the CryptoJob fixes. The stream_env() changes in this PR are good.

@bnoordhuis
Copy link
Member Author

You should motivate why. If it's just because you're not getting your way, well, that's an abuse of the 'Request changes' button, isn't it?

@bnoordhuis bnoordhuis added the tsc-agenda Issues and PRs to discuss during the meetings of the TSC. label Feb 3, 2020
@bnoordhuis
Copy link
Member Author

I'm labeling this tsc-agenda. What @jasnell did is a clear violation of process and an abuse of privileges. That's unacceptable from any collaborator but especially a TSC member.

@jasnell
Copy link
Member

jasnell commented Feb 3, 2020

I'm labeling this tsc-agenda. What @jasnell did is a clear violation of process and an abuse of privileges. That's unacceptable from any collaborator but especially a TSC member.

The other PR was a) opened first, b) had adequate sign-off and review with no -1's, c) passed CI, d) was updated to address your concern, e) was well passed the 48 hour minimal period to land, f) had zero reasons not to be landed.

@bnoordhuis
Copy link
Member Author

You blocked this PR from getting merged without giving any motivation, even after I requested it. Instead you quietly landed a competing PR that contains changes of your own. That is not appropriate behavior for a TSC member.

@cjihrig
Copy link
Contributor

cjihrig commented Feb 3, 2020

@bnoordhuis by adding this to the TSC agenda, what outcome are you advocating for? My assumption would be a revert of #31554, but I don't want to guess incorrectly. Alternatively, you could probably join the meeting yourself to discuss it.

FWIW, I do believe that blocking this PR was inappropriate, and #31588 (comment) is an accurate description of what happened.

@jasnell
Copy link
Member

jasnell commented Feb 3, 2020

Feel free to revert #31554 if you'd like. I'm not going to engage. We've had many instances of -1's on PRs in favor of competing PRs.

@jasnell jasnell dismissed their stale review February 3, 2020 17:48

Dismissing

@bnoordhuis
Copy link
Member Author

@cjihrig I'm okay with leaving in #31554. I don't want to tell the TSC what to do but I do feel it's important that misconduct from one of its members is discussed.

@jasnell
Copy link
Member

jasnell commented Feb 3, 2020

My apologies for any perceived misconduct. In my -1 on this I did give a justification in that I preferred the changes made in the other PR. This one makes much more extensive changes that may be nice-to-haves but are, in my opinion, better to be split into multiple PRs (specifically, I'd rather see the stream_env commit in a separate PR).

@addaleax
Copy link
Member

There hasn’t been any further discussion since last week’s TSC meeting, so it doesn’t seem to make sense to have it on this week’s agenda. I’ll remove the label.

@addaleax addaleax removed the tsc-agenda Issues and PRs to discuss during the meetings of the TSC. label Feb 10, 2020
@BridgeAR BridgeAR force-pushed the master branch 2 times, most recently from 8ae28ff to 2935f72 Compare May 31, 2020 12:19
@jasnell jasnell added the stalled Issues and PRs that are stalled. label Jun 25, 2020
@jasnell
Copy link
Member

jasnell commented Jun 25, 2020

Closing because this has stalled. Can reopen if there is a desire to revisit

@jasnell jasnell closed this Jun 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. stalled Issues and PRs that are stalled.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants