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

8256417: Exclude TestJFRWithJMX test from running with PodMan #2726

Closed
wants to merge 7 commits into from

Conversation

@mseledts
Copy link
Member

@mseledts mseledts commented Feb 25, 2021


Progress

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

Issue

  • JDK-8256417: Exclude TestJFRWithJMX test from running with PodMan

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2726/head:pull/2726
$ git checkout pull/2726

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 25, 2021

👋 Welcome back mseledtsov! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Feb 25, 2021

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

  • hotspot

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.

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

Please review this small change that excludes the TestJFRWithJMX test from execution on Podman.
In summary, this test requires capabilities that are not available under "rootless" podman.
What was done:

  • added an at-requires method to return the name of the container engine
  • using the above named at requires to exclude this test as described above

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 25, 2021

Webrevs

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

@hseigel @iignatev Could you please take a look?

Loading

@iignatev
Copy link
Member

@iignatev iignatev commented Feb 25, 2021

Hi Misha,

so this test can't be run w/ podman only if the test-user doesn't have root-level privileges? if so, I think it's better to check if we really don't have such priviliges and throw SkippedException (e.g. the same way we do in SATestUtils via Platform.isRoot). that way, the test will still be runnable in some configurations.

-- Igor

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

Igor, thanks for the suggestion. I will update the code to use SkippedException and Platform.isRoot

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

Igor, while following your suggestion of using jtreg.SkippedException, I am thinking about keeping the new VMProps.containerEngine() in the VMProps.java. It can come in handy in the future. I hope you do not mind that.

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

I have updated the changes. @iignatev please review.

Loading

@iignatev
Copy link
Member

@iignatev iignatev commented Feb 25, 2021

Igor, while following your suggestion of using jtreg.SkippedException, I am thinking about keeping the new VMProps.containerEngine() in the VMProps.java. It can come in handy in the future. I hope you do not mind that.

generally speaking, I am no fan of adding things we don't use. instead, I'd suggest you creating Platform::containerEngine (or better Container::engine) and it in the test. and if/when the needs for @requiers container.engine appears, we can add one w/ almost zero effort.

PS you need to update copyright year in all the updated files.

-- Igor

Loading

@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 25, 2021

OK, I will just remove the code from VMProps.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Feb 26, 2021

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

8256417: Exclude TestJFRWithJMX test from running with PodMan

Reviewed-by: iignatyev

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

  • 722142e: 8261520: JDK-8261302 breaks runtime/NMT/CheckForProperDetailStackTrace.java
  • bcca100: 4710675: JTextArea.setComponentOrientation does not work with correct timing
  • fce5765: 8262433: doclint: reference error in module jdk.incubator.foreign
  • 059ede0: 8262428: doclint warnings in java.xml module
  • 8256517: 8262421: doclint warnings in jdk.compiler module
  • 29c603f: 8262227: Change SystemDictionary::find() to return an InstanceKlass*.
  • 35c0a69: 8262416: ProblemList TestHeapDumpForLargeArray.java due to JDK-8262386
  • 228c285: 8261170: Upgrade to freetype 2.10.4
  • ded96dd: 8139348: Deprecate 3DES and RC4 in Kerberos
  • 5a9b701: 8258444: Clean up specifications of java.io.Reader.read(char[],int,int) in subclass overrides
  • ... and 12 more: https://git.openjdk.java.net/jdk/compare/65492129a906e200fae3aef2d965d590c22a0290...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.

Loading

@openjdk openjdk bot added the ready label Feb 26, 2021
@mseledts
Copy link
Member Author

@mseledts mseledts commented Feb 26, 2021

Thank you Igor.
/integrate

Loading

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

@openjdk openjdk bot commented Feb 26, 2021

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

Your commit was automatically rebased without conflicts.

Pushed as commit 07061fc.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants