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

8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java #3290

Closed
wants to merge 2 commits into from

Conversation

@bplb
Copy link
Member

@bplb bplb commented Mar 31, 2021

Please consider this request to improve the message printed when no ENTRY_MODIFY events are received. In the polling implementation of WatchService currently used on macOS, it would be useful to know the sensitivity of polling in effect for the failing case. It might indicate, for example, that low sensitivity should not be used in the test.


Progress

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

Issue

  • JDK-8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3290

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 31, 2021

👋 Welcome back bpb! 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 added the rfr label Mar 31, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2021

@bplb 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.

@openjdk openjdk bot added the nio label Mar 31, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2021

Webrevs

Path parent = file.getParent();
String msg = String.format("No ENTRY_MODIFY event received for %s (dir: %s, sensitivity: %d)",
file, parent, pathToTime.get(parent));
throw new RuntimeException(msg);
Copy link
Contributor

@AlanBateman AlanBateman Apr 1, 2021

Not clear to me that this helps. Have you looked at changing the 1s at L104. I assume the issue is that the test needs the idle (no events) time increased to deal with cases where the watcher is slow to queue events.

Copy link
Member Author

@bplb bplb Apr 1, 2021

That's a better idea but I think this change should go in also. I have not in any case been able to reproduce it. There is no record of on which specific machines it was sighted.

Copy link
Contributor

@AlanBateman AlanBateman Apr 1, 2021

Okay.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Changes look okay although I don't think changing POLL_TIMEOUT_SECONDS vary by platform is necessary.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 2, 2021

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

8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java

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

  • 885916e: 8262280: Incorrect exception handling for VMThread in class redefinition
  • 7d0a0ba: 8264109: Add vectorized implementation for VectorMask.andNot()
  • 0935eaa: 8264409: AArch64: generate better code for Vector API allTrue
  • 4793557: 8264502: (fc) FileDispatcherImpl.setDirect0 might return uninitialized variable on some platforms
  • da643cd: 8264526: javax/swing/text/html/parser/Parser/8078268/bug8078268.java timeout
  • 66d9961: 8205502: Make exception message from AnnotationInvocationHandler more informative
  • 5e59d28: 8262046: Clean up parallel class loading code and comments
  • 04f24fe: 8264403: [macos]: App names containing '.' characters results in an error message when launching
  • b953386: 8264609: Number.{byteValue, shortValue} spec should use @implSpec
  • 5858399: 8264285: Clean the modification of ccstr JVM flags
  • ... and 218 more: https://git.openjdk.java.net/jdk/compare/6aa28b3bdb78eb041a963d659d61e1622bc43ef8...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.

➡️ 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 label Apr 2, 2021
@bplb
Copy link
Member Author

@bplb bplb commented Apr 2, 2021

/integrate

@openjdk openjdk bot closed this Apr 2, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 2, 2021

@bplb Since your change was applied there have been 234 commits pushed to the master branch:

  • 4133ded: 8264658: ProblemList javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java on linux-x64
  • 220ddbd: 8264657: ProblemList java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java on linux-x64
  • d0f3cc9: 8264656: ProblemList sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java on linux-x64
  • 6c145c4: 8264544: Case-insensitive comparison issue with supplementary characters.
  • f60e81b: 8264548: Dependencies: ClassHierarchyWalker::is_witness() cleanups
  • 177bc84: 8264606: More comment for ECDH public key validation
  • 885916e: 8262280: Incorrect exception handling for VMThread in class redefinition
  • 7d0a0ba: 8264109: Add vectorized implementation for VectorMask.andNot()
  • 0935eaa: 8264409: AArch64: generate better code for Vector API allTrue
  • 4793557: 8264502: (fc) FileDispatcherImpl.setDirect0 might return uninitialized variable on some platforms
  • ... and 224 more: https://git.openjdk.java.net/jdk/compare/6aa28b3bdb78eb041a963d659d61e1622bc43ef8...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3991b32.

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

@bplb bplb deleted the WatchService-8250651 branch Apr 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants