NullPointerException: change 22069: change not processed by merge strategy
Лёша М
2/*" ]
java.lang.NullPointerException: change 22069: change not processed by merge strategy
at java.base/java.util.Objects.requireNonNull(Objects.java:246)
at com.google.gerrit.server.submit.SubmitStrategyListener.checkCommitStatus(SubmitStrategyListener.java:107)
at com.google.gerrit.server.submit.SubmitStrategyListener.afterUpdateRepos(SubmitStrategyListener.java:57)
at com.google.gerrit.server.update.BatchUpdate.notifyAfterUpdateRepo(BatchUpdate.java:200)
at com.google.gerrit.server.update.BatchUpdate.execute(BatchUpdate.java:158)
at com.google.gerrit.server.update.SubmissionExecutor.execute(SubmissionExecutor.java:61)
at com.google.gerrit.server.submit.MergeOp.integrateIntoHistory(MergeOp.java:666)
at com.google.gerrit.server.submit.MergeOp.lambda$merge$1(MergeOp.java:535)
at com.google.gerrit.server.update.RetryableChangeAction.lambda$new$0(RetryableChangeAction.java:48)
at com.github.rholder.retry.AttemptTimeLimiters$NoAttemptTimeLimit.call(AttemptTimeLimiters.java:78)
at com.github.rholder.retry.Retryer.call(Retryer.java:160)
at com.google.gerrit.server.update.RetryHelper.executeWithTimeoutCount(RetryHelper.java:564)
at com.google.gerrit.server.update.RetryHelper.execute(RetryHelper.java:507)
at com.google.gerrit.server.update.RetryableAction.call(RetryableAction.java:173)
at com.google.gerrit.server.update.RetryableChangeAction.call(RetryableChangeAction.java:84)
at com.google.gerrit.server.submit.MergeOp.merge(MergeOp.java:544)
at com.google.gerrit.server.restapi.change.Submit.mergeChange(Submit.java:214)
at com.google.gerrit.server.restapi.change.Submit.apply(Submit.java:191)
at com.google.gerrit.server.restapi.change.Submit.apply(Submit.java:88)
at com.google.gerrit.httpd.restapi.RestApiServlet.lambda$invokeRestModifyViewWithRetry$7(RestApiServlet.java:915)
at com.github.rholder.retry.AttemptTimeLimiters$NoAttemptTimeLimit.call(AttemptTimeLimiters.java:78)
at com.github.rholder.retry.Retryer.call(Retryer.java:160)
at com.google.gerrit.server.update.RetryHelper.executeWithTimeoutCount(RetryHelper.java:564)
at com.google.gerrit.server.update.RetryHelper.execute(RetryHelper.java:507)
at com.google.gerrit.server.update.RetryableAction.call(RetryableAction.java:173)
at com.google.gerrit.httpd.restapi.RestApiServlet.invokeRestEndpointWithRetry(RestApiServlet.java:990)
at com.google.gerrit.httpd.restapi.RestApiServlet.invokeRestModifyViewWithRetry(RestApiServlet.java:910)
at com.google.gerrit.httpd.restapi.RestApiServlet.service(RestApiServlet.java:560)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:790)
at com.google.inject.servlet.ServletDefinition.doServiceImpl(ServletDefinition.java:290)
at com.google.inject.servlet.ServletDefinition.doService(ServletDefinition.java:280)
at com.google.inject.servlet.ServletDefinition.service(ServletDefinition.java:184)
at com.google.inject.servlet.ManagedServletPipeline.service(ManagedServletPipeline.java:89)
at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:85)
at com.google.gerrit.httpd.raw.StaticModule$PolyGerritFilter.doFilter(StaticModule.java:412)
Dmitrii Filippov
Лёша М
Лёша М
Terry Z
I recently encountered the "change not processed by merge strategy" on 3.7 after upgrading from 2.14. We use an application that uses REST API to "submit" changes. I suspect it is an issue with the "Inherit" permission logic for Submit Type and/or Allow content merges. I was able to work around the issue by setting Submit type and Allow content merges settings in the project instead of the keeping the Inherit (Rebase if necessary) and Inherit(true) values. I will be trying more experiments as I migrate three other gerrit servers from 2.14 to 3.7. I plan to try to set the settings in the parent at various levels deep. Our currently permission inheritance hierarchy has many parents 4+ until reaching All-Projects.
One other thing I noticed was that if the delivery was rebased, the "change not processed by merge strategy" did not occur. Leading me to think that somehow it was defaulting to "Fast forward only" which is why I suspected an error in the inheritance logic where it was picking up a hard coded default value.
I'll post more details about experiments and results as I collect them.
Sven Selberg
I recently encountered the "change not processed by merge strategy" on 3.7 after upgrading from 2.14. We use an application that uses REST API to "submit" changes. I suspect it is an issue with the "Inherit" permission logic for Submit Type and/or Allow content merges. I was able to work around the issue by setting Submit type and Allow content merges settings in the project instead of the keeping the Inherit (Rebase if necessary) and Inherit(true) values. I will be trying more experiments as I migrate three other gerrit servers from 2.14 to 3.7. I plan to try to set the settings in the parent at various levels deep. Our currently permission inheritance hierarchy has many parents 4+ until reaching All-Projects.
One other thing I noticed was that if the delivery was rebased, the "change not processed by merge strategy" did not occur. Leading me to think that somehow it was defaulting to "Fast forward only" which is why I suspected an error in the inheritance logic where it was picking up a hard coded default value.
I'll post more details about experiments and results as I collect them.
On Tuesday, July 25, 2023 at 3:10:37 PM UTC-4 Лёша М wrote:Any chance for any progress on this? This is the top annoyance for us right now.On Saturday, July 8, 2023 at 6:02:06 PM UTC-7 Лёша М wrote:This is great to hear, thanks! Is there a way to get a binary with this fix applied? This bug is really too annoying.