8264190: Harden TLS interop tests #3218

fguallini · 2021-03-26T15:31:43Z

Occasional interop tests failures may occur when making use of the test/jdk/javax/net/ssl/TLSCommon/interop framework since there is no assurance the selected available port it is still free at the time a server using the framework starts up, for instance, by command line. To mitigate intermittent failures, this patch updates interop/BaseInteropTest.java in order to validate the server is alive and if not, retry to create a valid server.

In addition, Utilities::isSessionResumed implementation is now comparing equality of first and second session creation time to validate session resumption

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8264190: Harden TLS interop tests

Reviewers

Rajan Halade (@rhalade - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3218

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

Using diff file

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

bridgekeeper · 2021-03-26T15:32:28Z

👋 Welcome back fguallini! 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 · 2021-03-26T15:33:33Z

@fguallini The following label will be automatically applied to this pull request:

security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-03-26T15:43:42Z

Webrevs

test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java

test/jdk/javax/net/ssl/TLSCommon/interop/Utilities.java

rhalade · 2021-03-29T18:45:47Z

test/jdk/javax/net/ssl/TLSCommon/interop/BaseInteropTest.java

+        if (!Utilities.waitFor(Server::isAlive, server)) {
+            // Retry operation, server might have failed to bind a port
+            server.signalStop();
+            server = createServer(useCase, executor);


Can you please define MAX_RETRIES and use loop to retry? This will make it flexible for us to update retries if needed and avoid duplicate code.

Done, also retries value can be now overridden by subclasses if we wanted. In addition, moved Utilities::shell and shellProc to ProcUtils class which is a better location and added support for running win commands

…thods

openjdk · 2021-04-05T18:07:18Z

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8264190: Harden TLS interop tests

Reviewed-by: rhalade

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 224 new commits pushed to the master branch:

9dd9625: 8263763: Synthetic constructor parameters of enum are not considered for annotation indices
1ee80e0: 8261355: No data buffering in SunPKCS11 Cipher encryption when the underlying mechanism has no padding
d84a7e5: 8264124: Update MXBean specification and implementation to extend mapping of CompositeType to records
714ae54: 8258788: incorrect response to change in window insets [lanai]
f479437: 8265082: test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java fails validate-source
27f4b27: 8264623: Change to Xcode 12.4 for building on Macos at Oracle
7c20d97: 8265052: Break circular include dependency in objArrayOop.inline.hpp
b90ad76: 8233567: [TESTBUG] FocusSubRequestTest.java fails on macos
125184e: 8265012: Shenandoah: Backout JDK-8264718
be0d46c: 8262068: Improve G1 Full GC by skipping compaction for regions with high survival ratio
... and 214 more: https://git.openjdk.java.net/jdk/compare/b006f22f1f4312fa318f84c9e0a7cb4c928046ea...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@rhalade) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

fguallini · 2021-04-12T19:47:35Z

/integrate

rhalade · 2021-04-12T19:49:45Z

/sponsor

openjdk · 2021-04-12T21:02:48Z

@fguallini
Your change (at version b29e488) is now ready to be sponsored by a Committer.

openjdk · 2021-04-12T21:05:46Z

@rhalade @fguallini Since your change was applied there have been 225 commits pushed to the master branch:

18bec9c: 8265084: [BACKOUT] 8264954: unified handling for VectorMask object re-materialization during de-optimization
9dd9625: 8263763: Synthetic constructor parameters of enum are not considered for annotation indices
1ee80e0: 8261355: No data buffering in SunPKCS11 Cipher encryption when the underlying mechanism has no padding
d84a7e5: 8264124: Update MXBean specification and implementation to extend mapping of CompositeType to records
714ae54: 8258788: incorrect response to change in window insets [lanai]
f479437: 8265082: test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java fails validate-source
27f4b27: 8264623: Change to Xcode 12.4 for building on Macos at Oracle
7c20d97: 8265052: Break circular include dependency in objArrayOop.inline.hpp
b90ad76: 8233567: [TESTBUG] FocusSubRequestTest.java fails on macos
125184e: 8265012: Shenandoah: Backout JDK-8264718
... and 215 more: https://git.openjdk.java.net/jdk/compare/b006f22f1f4312fa318f84c9e0a7cb4c928046ea...master

Your commit was automatically rebased without conflicts.

Pushed as commit f4e6395.

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

Harden TLS interop tests

e9b984b

openjdk bot added the rfr Pull request is ready for review label Mar 26, 2021

fguallini changed the title ~~8264190: Harden TLS interop tests~~ Draft: 8264190: Harden TLS interop tests Mar 26, 2021

openjdk bot added security security-dev@openjdk.org and removed rfr Pull request is ready for review labels Mar 26, 2021

fguallini changed the title ~~Draft: 8264190: Harden TLS interop tests~~ 8264190: Harden TLS interop tests Mar 26, 2021

openjdk bot added the rfr Pull request is ready for review label Mar 26, 2021

fguallini added 2 commits March 26, 2021 17:16

no need to check if alive while iterating during accept

474f482

Improve JdkServer::close and Utilities::waitFor methods

5688014

fguallini commented Mar 29, 2021

View reviewed changes

test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java Show resolved Hide resolved

fguallini commented Mar 29, 2021

View reviewed changes

test/jdk/javax/net/ssl/TLSCommon/interop/Utilities.java Show resolved Hide resolved

rhalade reviewed Mar 29, 2021

View reviewed changes

add max_retries count, move shell methods to ProcUtils and add win me…

b29e488

…thods

rhalade approved these changes Apr 5, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 5, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 12, 2021

openjdk bot closed this Apr 12, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8264190: Harden TLS interop tests #3218

8264190: Harden TLS interop tests #3218

fguallini commented Mar 26, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 26, 2021

openjdk bot commented Mar 26, 2021

mlbridge bot commented Mar 26, 2021 •

edited

Loading

rhalade Mar 29, 2021

fguallini Mar 31, 2021

openjdk bot commented Apr 5, 2021 •

edited

Loading

fguallini commented Apr 12, 2021

rhalade commented Apr 12, 2021

openjdk bot commented Apr 12, 2021

openjdk bot commented Apr 12, 2021

8264190: Harden TLS interop tests #3218

8264190: Harden TLS interop tests #3218

Conversation

fguallini commented Mar 26, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 26, 2021

openjdk bot commented Mar 26, 2021

mlbridge bot commented Mar 26, 2021 • edited Loading

Webrevs

rhalade Mar 29, 2021

Choose a reason for hiding this comment

fguallini Mar 31, 2021

Choose a reason for hiding this comment

openjdk bot commented Apr 5, 2021 • edited Loading

fguallini commented Apr 12, 2021

rhalade commented Apr 12, 2021

openjdk bot commented Apr 12, 2021

openjdk bot commented Apr 12, 2021

fguallini commented Mar 26, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 26, 2021 •

edited

Loading

openjdk bot commented Apr 5, 2021 •

edited

Loading