Skip to content

Conversation

@iklam
Copy link
Member

@iklam iklam commented Oct 14, 2022

This PR reverts JDK-8276687, which has caused tier1 test failures.


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-8295320: [BACKOUT] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10711

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 14, 2022

👋 Welcome back iklam! 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 Pull request is ready for review label Oct 14, 2022
@openjdk
Copy link

openjdk bot commented Oct 14, 2022

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Oct 14, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 14, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 14, 2022

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

8295320: [BACKOUT] 8276687 Remove support for JDK 1.4.1 PerfData shared memory files

Reviewed-by: redestad, kevinw

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:

  • 7133fc9: 7172359: HTML parser StackOverflowError on invalid HTML:
  • tag inside an
  • 3d75e88: 8295270: RISC-V: Clean up and refactoring for assembler functions
  • be3b335: 8295026: Remove unused fields in StyleSheet

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 Oct 14, 2022
@kevinjwalls
Copy link
Contributor

kevinjwalls commented Oct 14, 2022

Hi, are you sure you want to back this out?
I'll click approve as backout change I think looks OK.

I see test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java failing SOMETIMES for me.
I think you already noted that src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
no longer handles IllegalArgumentException

If we handle that then for me the test that failed frequently, runs OK 20 times in a row.

bash-4.2$ git diff
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
index 3ad35e350e4..056671d7841 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
@@ -63,7 +63,7 @@ public class PerfDataBuffer extends AbstractPerfDataBuffer {
         try {
             ByteBuffer bb = perf.attach(vmid.getLocalVmId());
             createPerfDataBuffer(bb, vmid.getLocalVmId());
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             throw new MonitorException("Could not attach to "
                                        + vmid.getLocalVmId(), e);
         }

@dcubed-ojdk
Copy link
Member

@iklam - Are you planning to integrate this [BACKOUT] soon? The CI looks like
a train wreck in Tier1 and Tier3 so far...

@iklam
Copy link
Member Author

iklam commented Oct 14, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 14, 2022

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

  • 2da079c: 8294426: Two fingers tap generates wrong mouse modifiers on M2 MacBooks
  • 449b52f: 8295158: G1: Increase card-based cost sample reporting threshold
  • 312985e: 8295156: G1: Improve constant other time calculation
  • 786ce1c: 8295024: Cyclic constructor error is non-deterministic and inconsistent
  • 1efa93e: 8294844: Improve G1 young gen length revise trigger
  • 3dbc38a: 8295288: Some vm_flags tests associate with a wrong BugID
  • ef5210f: 8295149: Misnomer for_young_gc instead of for_young_only_phase in G1Analytics
  • 64813f4: 8294850: Make rs length/pending card predictors dependent on gc phase
  • 21e4f06: 8295274: HelidonAppTest.java fails "assert(event->should_commit()) failed: invariant" from compiled frame"
  • f31c80d: 8294842: Pass actual pending cards to G1Policy::update_young_length_bounds during young gen revise
  • ... and 3 more: https://git.openjdk.org/jdk/compare/67046ae49a2611644854ed94c1932d518e47854b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 14, 2022

@iklam Pushed as commit dfcd9d5.

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

@iklam
Copy link
Member Author

iklam commented Oct 14, 2022

Hi, are you sure you want to back this out? I'll click approve as backout change I think looks OK.

I see test/hotspot/jtreg/serviceability/dcmd/framework/VMVersionTest.java failing SOMETIMES for me. I think you already noted that src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java no longer handles IllegalArgumentException

If we handle that then for me the test that failed frequently, runs OK 20 times in a row.

bash-4.2$ git diff
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
index 3ad35e350e4..056671d7841 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java
@@ -63,7 +63,7 @@ public class PerfDataBuffer extends AbstractPerfDataBuffer {
         try {
             ByteBuffer bb = perf.attach(vmid.getLocalVmId());
             createPerfDataBuffer(bb, vmid.getLocalVmId());
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             throw new MonitorException("Could not attach to "
                                        + vmid.getLocalVmId(), e);
         }

I want to do more testing and then make a REDO PR for the 1.4.1 code removal. I also want to understand why these tests would sometimes get an IllegalArgumentException.

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

Labels

integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

4 participants