8320687: sun.jvmstat.monitor.MonitoredHost.getMonitoredHost() throws unexpected exceptions when invoked concurrently

[phohensee]

Backport for parity with Oracle 17.0.16. Clean except for copyright date in MonitoredHost.java, and replacement of try-with-resources in new test with try-catch because ExecutorService does not implement AutoClosable in 17u. New test passes, as well as the existing tests under test/jdk/sun/jvmstat/monitor.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• JDK-8320687 needs maintainer approval
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8320687: sun.jvmstat.monitor.MonitoredHost.getMonitoredHost() throws unexpected exceptions when invoked concurrently (Bug - P4 - Approved)

Reviewers

• Volker Simonis (@simonis - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3593

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back phh! 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]

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

8320687: sun.jvmstat.monitor.MonitoredHost.getMonitoredHost() throws unexpected exceptions when invoked concurrently

Reviewed-by: simonis

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

• a16a779: 8343037: Missing @SInCE tag on JColorChooser.showDialog overload
• a4770b5: 8357193: [VS 2022 17.14] Warning C5287 in debugInit.c: enum type mismatch during build
• 01a62e3: 8306997: C2: "malformed control flow" assert due to missing safepoint on backedge with a switch
• ... and 13 more: https://git.openjdk.org/jdk17u-dev/compare/08de2ba0e60cf968d2dd6fee3fec83a2471c62ce...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]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 02: Full - Incremental (1a61b606)
• 01: Full - Incremental (23be82f4)
• 00: Full (e52c2042)

[simonis]

Looks good.

[simonis]

As you've already mentioned, the original implementation uses try-with-resources to close the ExecutorService but ExecutorService only implements AutoClosable since JDK 19. Alternatively, we could put the new ExecutorService's close() handling into a finallly block:

        boolean terminated = isTerminated();
        if (!terminated) {
            shutdown();
            boolean interrupted = false;
            while (!terminated) {
                try {
                    terminated = awaitTermination(1L, TimeUnit.DAYS);
                } catch (InterruptedException e) {
                    if (!interrupted) {
                        shutdownNow();
                        interrupted = true;
                    }
                }
            }
            if (interrupted) {
                Thread.currentThread().interrupt();
            }
        }

But that seems to be overkill, taking into account that in the body of the try/catch we already wait for the completion of all ExecutorService tasks. So I leave it up to you if you want the additional safe guard.

[phohensee]

I agree. The test exits immediately in any case, so cleanup doesn't matter.

[openjdk]

⚠️ @phohensee This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[phohensee]

Thanks for your review, @simonis.

[phohensee]

/approval request Backport for parity with Oracle 17.0.16. Clean except for copyright date in MonitoredHost.java, and replacement of try-with-resources in new test with try-catch because ExecutorService does not implement AutoClosable in 17u. New test passes, as well as the existing tests under test/jdk/sun/jvmstat/monitor.

[openjdk]

@phohensee
8320687: The approval request has been updated successfully.

[phohensee]

/integrate

[openjdk]

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

• a16a779: 8343037: Missing @SInCE tag on JColorChooser.showDialog overload
• a4770b5: 8357193: [VS 2022 17.14] Warning C5287 in debugInit.c: enum type mismatch during build
• 01a62e3: 8306997: C2: "malformed control flow" assert due to missing safepoint on backedge with a switch
• ... and 13 more: https://git.openjdk.org/jdk17u-dev/compare/08de2ba0e60cf968d2dd6fee3fec83a2471c62ce...master

Your commit was automatically rebased without conflicts.

[openjdk]

@phohensee Pushed as commit 4070736.

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