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

Stapler 1.250 #2722

Merged
merged 2 commits into from
Feb 8, 2017
Merged

Stapler 1.250 #2722

merged 2 commits into from
Feb 8, 2017

Conversation

jglick
Copy link
Member

@jglick jglick commented Jan 18, 2017

Changes

@reviewbybees

@ghost
Copy link

ghost commented Jan 18, 2017

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@daniel-beck daniel-beck added the needs-more-reviews Complex change, which would benefit from more eyes label Jan 18, 2017
@daniel-beck
Copy link
Member

Could we maybe get a more thorough review on this one? IIRC both previous Stapler upgrades broke Jenkins.

@daniel-beck
Copy link
Member

daniel-beck commented Jan 19, 2017

Actual regression.

WARNING: Error while serving http://localhost:51807/jenkins/job/test0/descriptorByName/hudson.scm.CvsRepository/fillCompressionLevelItems
…
Caused by: java.lang.invoke.WrongMethodTypeException: cannot convert MethodHandle()ListBoxModel to (Object)Object
	at java.lang.invoke.MethodHandle.asType(MethodHandle.java:724)
	at java.lang.invoke.MethodHandle.invokeWithArguments(MethodHandle.java:596)
	at org.kohsuke.stapler.Function$MethodFunction.invoke(Function.java:330)

@daniel-beck daniel-beck added the needs-comments-resolved Comments in the PR need to be addressed before it can be considered for merging label Jan 19, 2017
@jglick
Copy link
Member Author

jglick commented Jan 19, 2017

@i386 I am guessing this is a consequence of jenkinsci/stapler#96; do you plan to take a look?

@jglick
Copy link
Member Author

jglick commented Jan 19, 2017

Or perhaps from jenkinsci/stapler@bd67c1e, which does not seem to have been done via PR at all.

@jglick
Copy link
Member Author

jglick commented Jan 19, 2017

Confirmed with git-bisect that jenkinsci/stapler#96 is responsible. Working on a fix.

@jglick jglick added work-in-progress The PR is under active development, not ready to the final review and removed needs-more-reviews Complex change, which would benefit from more eyes needs-comments-resolved Comments in the PR need to be addressed before it can be considered for merging labels Jan 19, 2017
@i386
Copy link

i386 commented Jan 19, 2017

Nice catch @jglick

@jglick jglick changed the title Stapler 1.249 Stapler 1.250 Jan 20, 2017
@jglick jglick added needs-more-reviews Complex change, which would benefit from more eyes and removed work-in-progress The PR is under active development, not ready to the final review labels Jan 20, 2017
@@ -59,6 +59,10 @@
<li class=bug>
<code>IllegalStateException</code> from Winstone when making certain requests with access logging enabled.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-37625">issue 37625</a>)
<li class=bug>
Failure to serialize a single <code>Action</code> could cause an entire REST export response to fail.
Upgraded to Stapler <code>1.249</code> with a fix.
Copy link

Choose a reason for hiding this comment

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

why 1.249 instead of 1.250?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well, 1.249 had the fix for the stated bug, 1.250 just corrected an obscure regression introduced by an unrelated change in 1.249.

Copy link
Member

Choose a reason for hiding this comment

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

I would vote for 1.250. And it is better to just remove changelog change from the PR

@daniel-beck daniel-beck added the on-hold This pull request depends on another event/release, and it cannot be merged right now label Jan 25, 2017
@daniel-beck
Copy link
Member

Given how problematic recent Stapler upgrades were, this shouldn't be merged into the weekly release that will serve as the base for next week's security update.

@jglick jglick removed the on-hold This pull request depends on another event/release, and it cannot be merged right now label Jan 30, 2017
Copy link
Member

@svanoort svanoort left a comment

Choose a reason for hiding this comment

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

🐝 -- I've looked at the changelog and nothing is jumping out at me as immediately problematic (though that may not mean much, since I'm not familiar with common Stapler problem areas).

Built it, ran it locally, installed plugins and created+ran jobs -- seems to run fine, plugins install, etc.

Not sure what else to do to properly exercise this one?

@jglick
Copy link
Member Author

jglick commented Feb 1, 2017

@reviewbybees done

Not sure what else to do to properly exercise this one?

Great, that is more than most PRs will get.

@jglick jglick added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback and removed needs-more-reviews Complex change, which would benefit from more eyes labels Feb 1, 2017
@oleg-nenashev
Copy link
Member

@svanoort @jglick I propose to ensure there is no binary compatibility breakages before merging. Ideally we also need to ensure that ATH/PCT do not become more broken with this change.

@jglick
Copy link
Member Author

jglick commented Feb 3, 2017

ensure there is no binary compatibility breakages before merging

How do you propose to do that?

ensure that ATH/PCT do not become more broken

Without merging? How?

@oleg-nenashev
Copy link
Member

  1. Code review. I went through changes, and they seem to be fine from the compatibility perspective at least
  2. Just build a custom core locally and run tests against it.

@jglick
Copy link
Member Author

jglick commented Feb 6, 2017

Sorry but I do not have the time or resources to run a potentially unbounded set of tests against a local build. Since when is that a prerequisite for merging changes to core?

@oleg-nenashev
Copy link
Member

It is not a prerequisite, but we had pretty bad regressions on this year due to Stapler upgrades.

Feel free to merge if you are ready to take responsibility for handling the fallout if something goes wrong. I did it once on this year, and the Stapler maintainers (@kohsuke and @vivek) did not follow the commitments they made after that fallout. @jglick and we would have another regression, which has been prevented by you.

So I am not comfortable about merging before we test it using the tools we have.

@jglick
Copy link
Member Author

jglick commented Feb 7, 2017

if you are ready to take responsibility for handling the fallout if something goes wrong

Of course if any regression is discovered I would do my best to respond at once.

@daniel-beck
Copy link
Member

If this breaks things again (for the fifth time in a year!) I'm not going to be happy.

@daniel-beck daniel-beck merged commit 56da425 into jenkinsci:master Feb 8, 2017
@jglick jglick deleted the new-stapler branch February 9, 2017 15:40
jglick added a commit that referenced this pull request Feb 9, 2017
…ixed in 2.42; in fact it is toward 2.46.
daniel-beck added a commit that referenced this pull request Feb 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants