JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case #17829

MBaesken · 2024-02-13T13:54:12Z

In case of a bad running LDAP we got this output from test test/jdk/java/nio/channels/unixdomain/SocketOptions.java

java.lang.RuntimeException: wrong username
at SocketOptions.testPeerCred(SocketOptions.java:75)
at SocketOptions.main(SocketOptions.java:52)
at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
at java.base/java.lang.reflect.Method.invoke(Method.java:580)
at com.sun.javatest.regtest.agent.MainWrapper$MainTask.run(MainWrapper.java:138)
at java.base/java.lang.Thread.run(Thread.java:1583)

It would be better to see the compared values (user name data we compare) and get them in the exception output.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case (Enhancement - P4)

Reviewers

Daniel Fuchs (@dfuch - Reviewer) ⚠️ Review applies to 19e7a9b6
Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17829/head:pull/17829
$ git checkout pull/17829

Update a local copy of the PR:
$ git checkout pull/17829
$ git pull https://git.openjdk.org/jdk.git pull/17829/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17829

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17829.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-02-13T13:54:55Z

👋 Welcome back mbaesken! 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 · 2024-02-13T13:55:40Z

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

nio

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 · 2024-02-13T13:58:11Z

Webrevs

01: Full - Incremental (f7366970)
00: Full (19e7a9b6)

dfuch

Since this is a test the proposed changes look reasonable to me. @Michael-Mc-Mahon may have more comments. You may want to consider adding a line break to avoid long lines.

openjdk · 2024-02-13T14:25:54Z

@MBaesken 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:

8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case

Reviewed-by: dfuchs, alanb

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

13d9e8f: 8325590: Regression in round-tripping UTF-16 strings after JDK-8311906
57b04e1: 8325748: Serial: Move Generation::promote to TenuredGeneration
7cd25ed: 8322854: Incorrect rematerialization of scalar replaced objects in C2

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

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

AlanBateman · 2024-02-13T14:43:30Z

test/jdk/java/nio/channels/unixdomain/SocketOptions.java

@@ -72,7 +72,7 @@ static void testPeerCred() throws Exception {
                // Check returned user name

                if (!s1.equals(s2)) {
-                    throw new RuntimeException("wrong username");
+                    throw new RuntimeException("wrong username, we got " + s1 + " but property user.name is " + s2);
                }


It might be better to use "expected" and "actual" instead of "we got" :-)

I assume you'll bump the copyright header before integrating.

Thanks, I adjusted the header and also the output.
Added a line break.

MBaesken · 2024-02-13T15:04:59Z

Since this is a test the proposed changes look reasonable to me. @Michael-Mc-Mahon may have more comments. You may want to consider adding a line break to avoid long lines.

Btw. in some other places we happily print the user name/id in the exception (even in src not test !).
https://github.com/openjdk/jdk/blame/master/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java#L144

leads to (tested running jdk21u-dev), the user name seems to be messed up because of the bad LDAP we had on the test system, that's why only the id shows up in the exception
java.io.IOException: 3199:
at java.base/sun.nio.fs.UnixUserPrincipals.lookupName(UnixUserPrincipals.java:145)
at java.base/sun.nio.fs.UnixUserPrincipals.lookupUser(UnixUserPrincipals.java:167)
at java.base/sun.nio.fs.UnixFileSystem$LookupService$1.lookupPrincipalByName(UnixFileSystem.java:361)
at CheckPermissions.main(CheckPermissions.java:775)
at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
at java.base/java.lang.reflect.Method.invoke(Method.java:580)
at com.sun.javatest.regtest.agent.MainWrapper$MainTask.run(MainWrapper.java:138)
at java.base/java.lang.Thread.run(Thread.java:1583)

MBaesken · 2024-02-14T08:30:27Z

Thanks for the reviews !

/integrate

openjdk · 2024-02-14T08:31:36Z

Going to push as commit d003996.
Since your change was applied there have been 13 commits pushed to the master branch:

ea98de6: 8325449: [BACKOUT] use "dmb.ishst+dmb.ishld" for release barrier
7f6bb71: 8319799: Recursive lightweight locking: x86 implementation
ea41932: 8325395: Missing copyright header in StackFilter.java
8765b17: 8325800: Drop unused cups declaration from Oracle build configuration
628cd8a: 8303866: Allow ZipInputStream.readEnd to parse small Zip64 ZIP files
842b895: 8303891: Speed up Zip64SizeTest using a small ZIP64 file
243fb46: 8325750: Fix spelling of ForceTranslateFailure help message
74b90aa: 8325672: C2: allocate PhaseIdealLoop::_loop_or_ctrl from C->comp_arena()
6dfa7f3: 8325541: C2 SuperWord: refactor filter / split
6b7c971: 8325382: (fc) FileChannel.transferTo throws IOException when position equals size
... and 3 more: https://git.openjdk.org/jdk/compare/7ec2badd2179709819ff4f7c61d9b2da67e13cec...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-02-14T08:31:43Z

@MBaesken Pushed as commit d003996.

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

JDK-8325743

19e7a9b

openjdk bot added the rfr Pull request is ready for review label Feb 13, 2024

openjdk bot added the nio nio-dev@openjdk.org label Feb 13, 2024

dfuch approved these changes Feb 13, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 13, 2024

AlanBateman reviewed Feb 13, 2024

View reviewed changes

adjust output and header

f736697

AlanBateman approved these changes Feb 13, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Feb 14, 2024

openjdk bot closed this Feb 14, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case #17829

JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case #17829

MBaesken commented Feb 13, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 13, 2024

openjdk bot commented Feb 13, 2024

mlbridge bot commented Feb 13, 2024 •

edited

Loading

dfuch left a comment •

edited

Loading

openjdk bot commented Feb 13, 2024 •

edited

Loading

AlanBateman Feb 13, 2024

MBaesken Feb 13, 2024

MBaesken commented Feb 13, 2024 •

edited

Loading

MBaesken commented Feb 14, 2024

openjdk bot commented Feb 14, 2024

openjdk bot commented Feb 14, 2024

JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case #17829

JDK-8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case #17829

Conversation

MBaesken commented Feb 13, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Feb 13, 2024

openjdk bot commented Feb 13, 2024

mlbridge bot commented Feb 13, 2024 • edited Loading

Webrevs

dfuch left a comment • edited Loading

Choose a reason for hiding this comment

openjdk bot commented Feb 13, 2024 • edited Loading

AlanBateman Feb 13, 2024

Choose a reason for hiding this comment

MBaesken Feb 13, 2024

Choose a reason for hiding this comment

MBaesken commented Feb 13, 2024 • edited Loading

MBaesken commented Feb 14, 2024

openjdk bot commented Feb 14, 2024

openjdk bot commented Feb 14, 2024

MBaesken commented Feb 13, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 13, 2024 •

edited

Loading

dfuch left a comment •

edited

Loading

openjdk bot commented Feb 13, 2024 •

edited

Loading

MBaesken commented Feb 13, 2024 •

edited

Loading