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

8277795: ldap connection timeout not honoured under contention #29

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 4, 2022

I backport this for parity with 11.0.15-oracle.

I had to resolve the second hunk to Connections.java due to conflicts.
Final and private keywords are swapped in 18.
I had to adapt the spelling of a message in the test. 11 does not
capitalize the sentence "connect timed out".


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed
  • Change requires a CSR request to be approved

Issues

  • JDK-8277795: ldap connection timeout not honoured under contention
  • JDK-8280829: ldap connection timeout not honoured under contention (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u pull/29/head:pull/29
$ git checkout pull/29

Update a local copy of the PR:
$ git checkout pull/29
$ git pull https://git.openjdk.java.net/jdk11u pull/29/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 29

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u/pull/29.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport 3d926dd66ef6551e91a4ebbbc59dcff58f5ede5a 8277795: ldap connection timeout not honoured under contention Mar 4, 2022
@openjdk
Copy link

openjdk bot commented Mar 4, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 4, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 4, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 7, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8277795: ldap connection timeout not honoured under contention

Reviewed-by: mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 7, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2022

Mac pre-submit failure: Error. Agent error: java.lang.Exception: Agent 38 timed out
unrelated.
linux pre-submit failure: macroAssembler_x86.cpp # assert(false) failed: DEBUG MESSAGE: exception oop already set
Also unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 7, 2022

Going to push as commit 1cff563.
Since your change was applied there has been 1 commit pushed to the master branch:

  • e339111: 8276141: XPathFactory set/getProperty method

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 7, 2022
@openjdk openjdk bot closed this Mar 7, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 7, 2022
@GoeLin GoeLin deleted the goetz_backport_8277795 branch March 7, 2022 12:51
@openjdk
Copy link

openjdk bot commented Mar 7, 2022

@GoeLin Pushed as commit 1cff563.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants