Skip to content

tls: trace errors can show up as SSL errors - #27841

Closed
sam-github wants to merge 2 commits into
nodejs:masterfrom
sam-github:fix-tls-trace-tests
Closed

tls: trace errors can show up as SSL errors#27841
sam-github wants to merge 2 commits into
nodejs:masterfrom
sam-github:fix-tls-trace-tests

Conversation

@sam-github

@sam-githubsam-github commented May 23, 2019

Copy link
Copy Markdown
Contributor

Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.

Fixes: #27636

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-bot

nodejs-github-bot commented May 23, 2019

Copy link
Copy Markdown
Collaborator

Lite-CI: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/3608

@nodejs-github-botnodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. tls Issues and PRs related to the tls subsystem. labels May 23, 2019
@sam-githubsam-github mentioned this pull request May 23, 2019
Closed
bnoordhuis
bnoordhuis approved these changes May 23, 2019
View reviewed changes
Comment threadsrc/tls_wrap.cc Outdated
@nodejs-github-bot

nodejs-github-bot commented May 23, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23302/

@nodejs-github-bot

nodejs-github-bot commented May 24, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23304/

@nodejs-github-bot

nodejs-github-bot commented May 24, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23313/

Trott
Trott approved these changes May 25, 2019
View reviewed changes

@TrottTrott left a comment

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.

Remove the entry for the flaky test from test/parallel/parallel.status?

refack
refack suggested changes May 26, 2019
View reviewed changes

@refackrefack left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

please better names

Comment threadsrc/tls_wrap.cc Outdated
@Trott

Trott commented May 27, 2019

Copy link
Copy Markdown
Member

Looks like it needs a rebase?

@sam-github
sam-githubforce-pushed the fix-tls-trace-tests branch from 3b4cb96 to edec9afCompareMay 27, 2019 17:23
@nodejs-github-bot

nodejs-github-bot commented May 27, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23415/

@sam-github
tls: trace errors can show up as SSL errors
baff45b
Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.
Fixes: nodejs#27636
@sam-github
sam-githubforce-pushed the fix-tls-trace-tests branch from edec9af to baff45bCompareMay 27, 2019 21:20
@refack

refack commented May 27, 2019

Copy link
Copy Markdown
Contributor

Thank you for addressing my CR.

@nodejs-github-bot

nodejs-github-bot commented May 27, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23424/

@Trott

Trott commented May 28, 2019

Copy link
Copy Markdown
Member

The test is still failing in CI. Not sure if that's expected (as perhaps it has multiple issues) or if that's a sign that this isn't quite a complete fix?

@sam-github

sam-github commented May 28, 2019

Copy link
Copy Markdown
ContributorAuthor

@Trott latest ci was all green, but I'll kick off another.

@nodejs-github-bot

nodejs-github-bot commented May 28, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23443/

@nodejs-github-bot

nodejs-github-bot commented May 28, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23449/

@sam-github

sam-github commented May 29, 2019

Copy link
Copy Markdown
ContributorAuthor

test-cpu-prof failed on FreeBSD, but that doesn't seem related. Resuming.

@nodejs-github-bot

nodejs-github-bot commented May 29, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23451/

@sam-github

sam-github commented May 29, 2019

Copy link
Copy Markdown
ContributorAuthor

@Trott I am not seeing signs of instability. Can I land this?

@Trott

Trott commented May 29, 2019

Copy link
Copy Markdown
Member

@Trott I am not seeing signs of instability. Can I land this?

OMG yes, please! Sorry my erroneous observation caused a delay here.

@Trott

Trott commented May 29, 2019

Copy link
Copy Markdown
Member

(Oh, wait, it wasn't erroneous. At the time, the most recent CI was https://ci.nodejs.org/job/node-test-pull-request/23424/ which shows the test still failing. But whatever, if it's all green now, let's land. Maybe this was needed in combination with something else that landed recently.

@sam-github

sam-github commented May 30, 2019

Copy link
Copy Markdown
ContributorAuthor

Landed in b1bd9e3

@sam-github
sam-github deleted the fix-tls-trace-tests branch May 30, 2019 10:55
targos pushed a commit that referenced this pull request May 31, 2019
@sam-github@targos
tls: trace errors can show up as SSL errors
6548b91
Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.
Fixes: #27636
PR-URL: #27841
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@targostargos mentioned this pull request Jun 3, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@TrottTrottTrott approved these changes
@addaleaxaddaleaxaddaleax approved these changes
@cjihrigcjihrigcjihrig approved these changes
@BethGriggsBethGriggsBethGriggs approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c++Issues and PRs that require attention from people who are familiar with C++.tlsIssues and PRs related to the tls subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

investigate flaky test-tls-enable-trace-cli

8 participants

@sam-github@nodejs-github-bot@Trott@refack@bnoordhuis@addaleax@cjihrig@BethGriggs