-
Notifications
You must be signed in to change notification settings - Fork 381
Make each task attempt run in a dedicated CDI request context #3210
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
.../service/src/main/java/org/apache/polaris/service/context/catalog/RealmContextHolder.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.polaris.service.context.catalog; | ||
|
|
||
| import jakarta.enterprise.context.RequestScoped; | ||
| import jakarta.enterprise.inject.Produces; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
| import org.apache.polaris.core.context.RealmContext; | ||
|
|
||
| @RequestScoped | ||
| public class RealmContextHolder { | ||
| private final AtomicReference<RealmContext> realmContext = new AtomicReference<>(); | ||
|
|
||
| @Produces | ||
| @RequestScoped | ||
| public RealmContext get() { | ||
| // Note: if this producer is called before the context is set a CDI exception will occur. | ||
| return realmContext.get(); | ||
| } | ||
|
|
||
| public void set(RealmContext rc) { | ||
| if (!realmContext.compareAndSet(null, rc)) { | ||
| throw new IllegalStateException("RealmContext already set"); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
runtime/service/src/test/java/org/apache/polaris/service/task/TaskErrorHandler.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.polaris.service.task; | ||
|
|
||
| import io.smallrye.common.annotation.Identifier; | ||
| import jakarta.enterprise.context.ApplicationScoped; | ||
| import java.time.Duration; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.ConcurrentMap; | ||
| import org.apache.commons.lang3.function.TriConsumer; | ||
| import org.assertj.core.api.Assertions; | ||
| import org.awaitility.Awaitility; | ||
|
|
||
| @ApplicationScoped | ||
| @Identifier("task-error-handler") | ||
| public class TaskErrorHandler implements TriConsumer<Long, Boolean, Throwable> { | ||
|
|
||
| private final ConcurrentMap<Long, TaskStatus> tasks = new ConcurrentHashMap<>(); | ||
|
|
||
| private record TaskStatus(boolean completed, Throwable error) {} | ||
|
|
||
| @Override | ||
| public void accept(Long id, Boolean start, Throwable th) { | ||
| if (start) { | ||
| tasks.computeIfAbsent(id, x -> new TaskStatus(false, null)); | ||
| } else { | ||
| tasks.compute(id, (i, s) -> new TaskStatus(true, th != null || s == null ? th : s.error)); | ||
| } | ||
| } | ||
|
|
||
| public void assertNoTaskExceptions() { | ||
| List<Long> ids = new ArrayList<>(tasks.keySet()); | ||
| TaskStatus incomplete = new TaskStatus(false, null); | ||
| Awaitility.await() | ||
| .atMost(Duration.ofSeconds(20)) | ||
| .until(() -> ids.stream().allMatch(id -> tasks.getOrDefault(id, incomplete).completed)); | ||
|
|
||
| for (Long id : ids) { | ||
| TaskStatus s = tasks.remove(id); | ||
| Assertions.assertThatCode( | ||
| () -> { | ||
| if (s.error != null) { | ||
| throw s.error; | ||
| } | ||
| }) | ||
| .doesNotThrowAnyException(); | ||
| Assertions.assertThat(s.completed).isTrue(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: isn't this for Request ID? Is this causing some downstream issues?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this PR
ContainerRequestContextis not longer a CDI bean required by Polaris (see changes inServiceProducers). Therefore, CDI mocks cannot actually be installed for it (test time exception).In general, this particular test class does not validate request ID handling, so mocking request IDs is not actually necessary in this class.
Moreover, the
Mockito.when(containerRequestContext.getProperty(Mockito.anyString())).thenReturn("request-id-1")mock was not specific to request IDs (noteanyString) and in this particular case was likely mocking Realm IDs, which is handled on line 235 now.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adnanhemani : I'm going to merge for now as it's a bug fix PR and I believe this particular change is fine. I'm open to following up on this on
main.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, I confirmed (locally) that
PolarisAdminServiceAuthzTestworks without this piece of code onmaintoo.