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

8238268: Many SA tests are not running on OSX because they do not attempt to use sudo when available #1269

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Jul 22, 2022

This is a backport of JDK-8238268. We need it, because the backport of JDK-8215544 has added code that calls sudo -E on MacOS without the option -n. This call might not return when sudo starts prompting for a password. In our CI it leads to hanging processes when subsequent tests call sudo, even with the -n option. This fix rectifies that behavior. And, after all, it improves test coverage on MacOS, so it's a good backport candidate.


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

Issues

  • JDK-8238268: Many SA tests are not running on OSX because they do not attempt to use sudo when available
  • JDK-8238196: tests that use SA Attach should not be allowed to run against signed binaries on Mac OS X 10.14.5 and later

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1269/head:pull/1269
$ git checkout pull/1269

Update a local copy of the PR:
$ git checkout pull/1269
$ git pull https://git.openjdk.org/jdk11u-dev pull/1269/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1269

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1269.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 22, 2022

👋 Welcome back clanger! 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 a147636157c011dac5d8c7aa6809c3c55f1384fa 8238268: Many SA tests are not running on OSX because they do not attempt to use sudo when available Jul 22, 2022
@openjdk
Copy link

openjdk bot commented Jul 22, 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 Jul 22, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 22, 2022

Webrevs

@RealCLanger RealCLanger force-pushed the RealCLanger-backport-a1476361 branch from 854de39 to 990171d Compare July 22, 2022 22:25
@openjdk-notifier
Copy link

@RealCLanger Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@RealCLanger RealCLanger force-pushed the RealCLanger-backport-a1476361 branch from 990171d to 53f80c4 Compare July 23, 2022 09:26
@openjdk-notifier
Copy link

@RealCLanger Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@RealCLanger
Copy link
Contributor Author

GHA failure would be fixed with #1268

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi

you add a very thorough description why you backport this.
This should go to the JBS fix comment.
Unfortunately it does not help reviewing the change.
I assume you ran SAP testing on this.

Here my comments:

test/hotspot/jtreg/TEST.ROOT
Copyright. ok.

test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java
Why do you remove
processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);

The special check for OSX is removed in several tests.
It looks different in 11 and the original change, but as
the code is removed this does not matter.

test/hotspot/jtreg/serviceability/sa/TestUniverse.java
Chunk for new test not in 11 omitted

test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
Besides replaceing shouldSAAttach by isRoot, isSigned OSX is added.

test/jdk/sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java
Chunk is omitted. Test is not in 11.

test/jtreg-ext/requires/VMProps.java
Copyright.

test/lib/jdk/test/lib/Platform.java
Imports were adapted.
isSignedOSX() is added. What is the original change of this?
Please mention in the JBS FixRequest comment that you
include code from that change.

test/lib/jdk/test/lib/SA/SATestUtils.java
Imports were adapted.

@RealCLanger
Copy link
Contributor Author

Hi Goetz,

thanks for the review. Yes, I have the patch running in the SAP tests without regressions, as far as I can tell.

test/hotspot/jtreg/serviceability/sa/ClhsdbLauncher.java Why do you remove processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);

Hm, when I looked at JDK-8234277, I thought it could be a good idea to do the removal in this change already but maybe you're right and we should keep it consistent. I'm actually not sure about the effects so I'll re-add it.

test/lib/jdk/test/lib/Platform.java Imports were adapted. isSignedOSX() is added. What is the original change of this? Please mention in the JBS FixRequest comment that you include code from that change.

This originally comes from JDK-8238196. Since merely all of the code of that bug is part of this PR as well (either as is or augmented), I'll add JDK-8238196 to this backport, too.

@RealCLanger
Copy link
Contributor Author

/issue add 8238196

@openjdk
Copy link

openjdk bot commented Aug 1, 2022

@RealCLanger
Adding additional issue to issue list: 8238196: tests that use SA Attach should not be allowed to run against signed binaries on Mac OS X 10.14.5 and later.

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarifications. LGTM.

@openjdk
Copy link

openjdk bot commented Aug 2, 2022

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

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

8238268: Many SA tests are not running on OSX because they do not attempt to use sudo when available
8238196: tests that use SA Attach should not be allowed to run against signed binaries on Mac OS X 10.14.5 and later

Reviewed-by: goetz

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

  • 8871303: 8282933: Create a test for JDK-4529616
  • 1ab3f82: 8283507: Create a regression test for RFE 4287690
  • 1533520: 8283621: Write a regression test for CCC4400728
  • b235f51: 8283623: Create an automated regression test for JDK-4525475
  • 5a0824b: 8269039: Disable SHA-1 Signed JARs

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 2, 2022
@RealCLanger
Copy link
Contributor Author

Thanks for the clarifications. LGTM.

Thanks for review and approval.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 2, 2022

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

  • 8871303: 8282933: Create a test for JDK-4529616
  • 1ab3f82: 8283507: Create a regression test for RFE 4287690
  • 1533520: 8283621: Write a regression test for CCC4400728
  • b235f51: 8283623: Create an automated regression test for JDK-4525475
  • 5a0824b: 8269039: Disable SHA-1 Signed JARs

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 2, 2022
@openjdk openjdk bot closed this Aug 2, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 2, 2022
@openjdk
Copy link

openjdk bot commented Aug 2, 2022

@RealCLanger Pushed as commit e80c7e1.

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

@RealCLanger RealCLanger deleted the RealCLanger-backport-a1476361 branch August 3, 2022 09:25
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
2 participants