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

8214026: Canonicalized archive paths appearing in diagnostics #760

Closed
wants to merge 1 commit into from

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Jan 13, 2022

This is a backport of JDK-8214026: Canonicalized archive paths appearing in diagnostics

The original patch applied cleanly.

Testing: tier1 tests pass


Progress

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

Issue

  • JDK-8214026: Canonicalized archive paths appearing in diagnostics

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/760/head:pull/760
$ git checkout pull/760

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 760

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/760.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 13, 2022

👋 Welcome back cushon! 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 bddbbd85f97a29db8236b437e0a391fe316aa5c0 8214026: Canonicalized archive paths appearing in diagnostics Jan 13, 2022
@openjdk
Copy link

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

mlbridge bot commented Jan 13, 2022

Webrevs

@RealCLanger
Copy link
Contributor

RealCLanger commented Jan 14, 2022

Hi @cushon,
The backport is not recognized as clean because you obviously added the fix for https://bugs.openjdk.java.net/browse/JDK-8220634 in it as well. If possible, it would be preferred if you could do the backports in two separate PRs. You can link them as dependent pull requests, if you want.
The (less preferred) alternative is to at least add the other issue via the pull request command "/issue add ..."
Cheers
Christoph

@openjdk openjdk bot added the clean label Jan 14, 2022
@cushon
Copy link
Contributor Author

cushon commented Jan 14, 2022

@RealCLanger thanks, and sorry for the confusion.

I updated this to just apply the first commit, and will open a separate backport of the follow-up fix.

@openjdk
Copy link

openjdk bot commented Jan 14, 2022

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

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

8214026: Canonicalized archive paths appearing in diagnostics

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:

  • 89f4d44: 8210194: [TESTBUG] jvmti_FollowRefObjects.cpp missing initializer for member _jvmtiHeapCallbacks::heap_reference_callback
  • 898b8de: 8277441: CompileQueue::add fails with assert(_last->next() == __null) failed: not last
  • e3da580: 8273704: DrawStringWithInfiniteXform.java failed : drawString with InfiniteXform transform takes long time
  • 96c8499: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • 3a96302: 8251132: make main classes public in vmTestbase/jit tests

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2022
@cushon
Copy link
Contributor Author

cushon commented Jan 14, 2022

You can link them as dependent pull requests, if you want.

One more question - do you have any pointers on the preferred workflow for that? I opened #765 with this PR as the target branch, but I'm not sure that's correct

@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

JDK-8214026 has been tagged jdk11u-fix-yes

@cushon
Copy link
Contributor Author

cushon commented Jan 17, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 17, 2022
@openjdk
Copy link

openjdk bot commented Jan 17, 2022

@cushon
Your change (at version a0170f1) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 17, 2022

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

  • 538013a: 8251126: nsk.share.GoldChecker should read golden file from ${test.src}
  • fac0f5a: 8237798: rewrite vmTestbase/jit/tiered from shell to java
  • f5ade3e: 8262134: compiler/uncommontrap/TestDeoptOOM.java failed with "guarantee(false) failed: wrong number of expression stack elements during deopt"
  • 89f4d44: 8210194: [TESTBUG] jvmti_FollowRefObjects.cpp missing initializer for member _jvmtiHeapCallbacks::heap_reference_callback
  • 898b8de: 8277441: CompileQueue::add fails with assert(_last->next() == __null) failed: not last
  • e3da580: 8273704: DrawStringWithInfiniteXform.java failed : drawString with InfiniteXform transform takes long time
  • 96c8499: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • 3a96302: 8251132: make main classes public in vmTestbase/jit tests

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 17, 2022

@phohensee @cushon Pushed as commit a29949b.

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

@RealCLanger
Copy link
Contributor

You can link them as dependent pull requests, if you want.

One more question - do you have any pointers on the preferred workflow for that? I opened #765 with this PR as the target branch, but I'm not sure that's correct

That was completely correct. As for the process regarding dependent PRs, there is not much description at the moment. It's not mentioned in the general guidelines at https://wiki.openjdk.java.net/display/JDKUpdates/How+to+contribute+a+fix yet.
However, the ground rule to not squash commits from upstream but keep them distinct whenever possible has always been there since I'm working on JDK updates projects...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
3 participants