[JENKINS-68933] Update to Jetty 10, with WebSocket by jglick · Pull Request #6785 · jenkinsci/jenkins

jglick · 2022-07-05T22:47:29Z

Subsumes #6780; reverts #6781, reapplying #6694.

Development loop:

mvnd -Pquick-build install -pl websocket/spi,websocket/jetty9,websocket/jetty10,core,war
mvnd -pl test test -Dtest=JNLPLauncherRealTest\#webSocket

Proposed changelog entries

Upgrading the bundled Jetty to version 10, via Winstone 6.0.

Proposed upgrade guidelines

N/A

Maintainer checklist

Before the changes are marked as ready-for-merge:

There are at least 2 approvals for the pull request and no outstanding requests for change
Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
Changelog entries in the PR title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood
Proper changelog labels are set so that the changelog can be generated automatically
If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

…-JENKINS-68933

…46.v20220331 to 10.0.11" (jenkinsci#6781)" This reverts commit 4ba9c08.

basil

I was exploring this logic earlier today and came to a similar conclusion about isUpgradeRequest. I had been thinking about inlining it, but I guess retaining only the first check as you did here is probably good enough.

This looks good pending a few remaining tasks:

Merge in the static analysis fixes I just made to #6780 because otherwise this won't build in CI
Probably need to add Enforcer excludes for the new modules as well to get Enforcer to pass on the war/ module
Add the call to JettyWebSocketServletContainerInitializer.configure in Winstone per #6785 (comment)
Once the CI build is passing, I would personally like to run another build with the Jetty 10 based JenkinsRule from jenkinsci/jenkins-test-harness#453 and PCT/BOM testing with the same. It should not turn up anything new, but I would rather be safe than sorry. With passing core and BOM/PCT suites with a Jetty 10 based JenkinsRule I would feel very confident about this change.

Happy to help with these tasks, so let me know how we can best drive this forward together.

…-JENKINS-68933

jglick · 2022-07-06T13:49:48Z

BTW regarding isUpgradeRequest: https://github.com/eclipse/jetty.project/blob/475d0512a57da08d0e24ecf6a2d01cfc72e11548/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ProgrammaticWebSocketUpgradeTest.java#L88-L92 does not bother, and https://github.com/eclipse/jetty.project/blob/475d0512a57da08d0e24ecf6a2d01cfc72e11548/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/websocket/WebSocketServerDocs.java#L289-L292 is less than helpful.

jglick · 2022-07-06T14:05:20Z

help with these tasks

I think the first three are now covered, so in principle this PR should now be ready as far as WebSocket support is concerned as soon as the Winstone change is released. If you want to set up a separate draft PR for testing against jenkinsci/jenkins-test-harness#453 that would certainly increase our confidence.

(There are apparently other regressions like #6694 (comment) and #6694 (comment) which could be addressed as well. I was not planning to look into those, so if you want to look into them, it may make more sense to file a fresh PR subsuming this one which is truly production-ready. My interest was in restoring WS functionality, especially since I was responsible for the reflection tech debt that made it tricky to understand where Jetty 10 was not working; I guess it did not even occur to me at the time that Jetty would change their APIs incompatibly.)

jglick · 2022-07-06T14:22:01Z

Interactively verified wsecho/ (in both text and binary modes, incl. ping visible after 30s with websocat -vv); Pipeline builds on a WS agent; CLI in -webSocket mode.

Otherwise closing connections sometimes produces stack traces ``` WARNING j.websocket.WebSocketSession#error: unhandled WebSocket service error java.nio.channels.ClosedChannelException at org.eclipse.jetty.websocket.core.internal.WebSocketSessionState.onEof(WebSocketSessionState.java:169) at org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession.onEof(WebSocketCoreSession.java:253) at org.eclipse.jetty.websocket.core.internal.WebSocketConnection.fillAndParse(WebSocketConnection.java:482) at org.eclipse.jetty.websocket.core.internal.WebSocketConnection.onFillable(WebSocketConnection.java:340) at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:319) at … ``` or ``` WARNING j.agents.WebSocketAgents$Session#error java.nio.channels.ClosedChannelException at org.eclipse.jetty.websocket.core.internal.WebSocketSessionState.onEof(WebSocketSessionState.java:169) at org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession.onEof(WebSocketCoreSession.java:253) at … ``` though I am not sure if that is actually new behavior.

jglick · 2022-07-06T17:55:30Z

FYI I was topologically merging in the upstream branch, which Git tracks better than cherry-picks. (Until you squash-merge the upstream PR. One reason I prefer to use true merges.)

basil

I was not planning to look into those, so if you want to look into them, it may make more sense to file a fresh PR subsuming this one which is truly production-ready.

Sure, let's get a green CI build for #6785 and let's get #6780 merged and then I can file a new PR for the final reintegration. Many thanks for the collaboration thus far. I plan to do two sets of core PRs (one with regular test harness and one with Jetty 10 test harness) and two corresponding BOM/PCT runs.

…-JENKINS-68933

github-actions · 2022-07-07T15:25:53Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

basil · 2022-07-07T15:57:27Z

Continuing in #6801

…-JENKINS-68933-jetty-10

jglick added 7 commits July 5, 2022 14:46

[JENKINS-68933] Verify basic WebSocket connectivity in RealJenkinsRule

8a14f9d

Removing use of reflection to access Jetty WebSocket types

c670842

Merge branch 'master' of https://github.com/jenkinsci/jenkins into ws…

ce2b909

…-JENKINS-68933

Removing javax.servlet-api from BOM

b6f67d1

Tweaking packaging

476a6fa

Revert "Revert "[JENKINS-68694] Winstone 6.0: Upgrade Jetty from 9.4.…

2398931

…46.v20220331 to 10.0.11" (jenkinsci#6781)" This reverts commit 4ba9c08.

Currently broken draft of Jetty 10 provider

7800ab0

jglick commented Jul 5, 2022

View reviewed changes

Comment thread websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java Outdated

jglick requested review from basil, daniel-beck and timja July 5, 2022 22:48

jglick mentioned this pull request Jul 5, 2022

[JENKINS-68933] Better WebSocket testing, removal of reflection #6780

Merged

6 tasks

basil added 3 commits July 5, 2022 17:47

Checkstyle

944ad29

SpotBugs

d7438dc

Enforcer

a14541b

basil reviewed Jul 6, 2022

View reviewed changes

jglick added 4 commits July 6, 2022 09:02

Merge branch 'master' of https://github.com/jenkinsci/jenkins into ws…

b7bc5c4

…-JENKINS-68933

Skip Javadoc on new modules

01e59fc

Merge branch 'ws-JENKINS-68933' into ws-JENKINS-68933-jetty-10

f53b2df

Skip Javadoc on new module

1453121

jglick mentioned this pull request Jul 6, 2022

Jetty 10 based JenkinsRule jenkinsci/jenkins-test-harness#453

Merged

jglick added 2 commits July 6, 2022 09:29

enforceBytecodeVersion exclude

4880587

Also exclude Jetty10Provider from SpotBugs

042b962

jglick mentioned this pull request Jul 6, 2022

[JENKINS-68933] Enable WebSocket jenkinsci/winstone#240

Merged

jglick added 2 commits July 6, 2022 09:43

Checkstyle

46e1a2e

Pick up jenkinsci/winstone#240

c2ebbc0

jglick added 4 commits July 6, 2022 12:59

jenkinsci/winstone#240 released

96f3ddf

Do not bundle javax.servlet-api: jenkinsci#6780 (comment)

e98f3cd

Do not bundle javax.servlet-api: jenkinsci#6780 (comment)

f190f5d

basil reviewed Jul 6, 2022

View reviewed changes

Comment thread war/pom.xml

basil and others added 5 commits July 6, 2022 13:04

Exclude Jetty 10 from test project

487f5d2

Merge branch 'master' of https://github.com/jenkinsci/jenkins into ws…

9f57b6f

…-JENKINS-68933

Do not propagate winstone dep to test: jenkinsci#6785 (comment)

ac6d1ef

Merge branch 'ws-JENKINS-68933' into ws-JENKINS-68933-jetty-10

69c5832

Do not propagate winstone dep to test: jenkinsci#6785 (comment)

5cacd9f

github-actions Bot added the unresolved-merge-conflict There is a merge conflict with the target branch. label Jul 7, 2022

Merge branch 'master' of https://github.com/jenkinsci/jenkins into ws…

4f6f2cc

…-JENKINS-68933-jetty-10

github-actions Bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label Jul 7, 2022

jglick closed this Jul 7, 2022

jglick mentioned this pull request Jul 7, 2022

[JENKINS-68694] Winstone 6.1: Upgrade Jetty from 9.4.46.v20220331 to 10.0.11 #6801

Merged

12 tasks

basil mentioned this pull request Jul 7, 2022

Permissions for new WebSocket components jenkins-infra/repository-permissions-updater#2638

Merged

14 tasks

Navigation Menu

Uh oh!

Uh oh!

[JENKINS-68933] Update to Jetty 10, with WebSocket - #6785

[JENKINS-68933] Update to Jetty 10, with WebSocket#6785
jglick wants to merge 29 commits into
jenkinsci:masterfrom
jglick:ws-JENKINS-68933-jetty-10

jglick commented Jul 5, 2022 •

edited

Loading

Uh oh!

Uh oh!

basil left a comment

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

basil left a comment

Uh oh!

Uh oh!

github-actions Bot commented Jul 7, 2022

Uh oh!

basil commented Jul 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

jglick commented Jul 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changelog entries

Proposed upgrade guidelines

Maintainer checklist

Uh oh!

Uh oh!

basil left a comment

Choose a reason for hiding this comment

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

jglick commented Jul 6, 2022

Uh oh!

basil left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jul 7, 2022

Uh oh!

basil commented Jul 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jglick commented Jul 5, 2022 •

edited

Loading