-
Notifications
You must be signed in to change notification settings - Fork 13.9k
[FLINK-38507] OpenTelemetryTraceReporterITCase failed in Test - connect #27792
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
Open
HundalTaran
wants to merge
4
commits into
apache:master
Choose a base branch
from
coder1592084:issue38507
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
131 changes: 131 additions & 0 deletions
131
...s-junit/src/main/java/org/apache/flink/core/testutils/RetryingTestContainerExtension.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,131 @@ | ||
| /* | ||
| * 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.flink.core.testutils; | ||
|
|
||
| import com.github.dockerjava.api.command.PullImageResultCallback; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.testcontainers.DockerClientFactory; | ||
| import org.testcontainers.containers.GenericContainer; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.function.Supplier; | ||
|
|
||
| /** | ||
| * A {@link CustomExtension} that manages a {@link GenericContainer} with retry logic, including | ||
| * re-pulling the Docker image on failure. This handles transient Docker image pull/build failures | ||
| * that can occur in CI environments. | ||
| * | ||
| * @param <T> The {@link GenericContainer} that shall be managed. | ||
| */ | ||
| public class RetryingTestContainerExtension<T extends GenericContainer<T>> | ||
| implements CustomExtension { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(RetryingTestContainerExtension.class); | ||
| private static final int DEFAULT_MAX_RETRIES = 3; | ||
| private static final long DEFAULT_RETRY_DELAY_MS = 2000; | ||
| private static final long IMAGE_PULL_TIMEOUT_MINUTES = 2; | ||
|
|
||
| @Nullable private T testContainer; | ||
|
|
||
| private final Supplier<T> testContainerCreator; | ||
| private final int maxRetries; | ||
| private final long retryDelayMs; | ||
|
|
||
| public RetryingTestContainerExtension(Supplier<T> testContainerCreator) { | ||
| this(testContainerCreator, DEFAULT_MAX_RETRIES, DEFAULT_RETRY_DELAY_MS); | ||
| } | ||
|
|
||
| public RetryingTestContainerExtension( | ||
| Supplier<T> testContainerCreator, int maxRetries, long retryDelayMs) { | ||
| this.testContainerCreator = testContainerCreator; | ||
| this.maxRetries = maxRetries; | ||
| this.retryDelayMs = retryDelayMs; | ||
| } | ||
|
|
||
| public T getTestContainer() { | ||
| assert testContainer != null; | ||
| return testContainer; | ||
| } | ||
|
|
||
| private void terminateTestContainer() { | ||
| if (testContainer != null) { | ||
| testContainer.stop(); | ||
| testContainer = null; | ||
| } | ||
| } | ||
|
|
||
| private void instantiateTestContainer() { | ||
| assert testContainer == null; | ||
| for (int attempt = 1; attempt <= maxRetries; attempt++) { | ||
| try { | ||
| testContainer = testContainerCreator.get(); | ||
| testContainer.start(); | ||
| return; | ||
| } catch (Exception e) { | ||
| LOG.warn( | ||
| "Container start attempt {}/{} failed: {}", | ||
| attempt, | ||
| maxRetries, | ||
| e.getMessage()); | ||
| testContainer = null; | ||
| if (attempt == maxRetries) { | ||
| throw e; | ||
| } | ||
| pullImage(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not pullImage first before start container? |
||
| try { | ||
| Thread.sleep(retryDelayMs); | ||
| } catch (InterruptedException ie) { | ||
| Thread.currentThread().interrupt(); | ||
| throw new RuntimeException("Interrupted during container start retry", ie); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void pullImage() { | ||
| try { | ||
| T tempContainer = testContainerCreator.get(); | ||
| String imageName = tempContainer.getDockerImageName(); | ||
| LOG.info("Re-pulling image {} before retry...", imageName); | ||
| DockerClientFactory.instance() | ||
| .client() | ||
| .pullImageCmd(imageName) | ||
| .exec(new PullImageResultCallback()) | ||
| .awaitCompletion(IMAGE_PULL_TIMEOUT_MINUTES, TimeUnit.MINUTES); | ||
| LOG.info("Image {} pulled successfully", imageName); | ||
| } catch (Exception e) { | ||
| LOG.warn("Failed to pull image: {}", e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void after(ExtensionContext context) throws Exception { | ||
| terminateTestContainer(); | ||
| } | ||
|
|
||
| @Override | ||
| public void before(ExtensionContext context) throws Exception { | ||
| terminateTestContainer(); | ||
| instantiateTestContainer(); | ||
| } | ||
| } | ||
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.
Do we need to call
testContainer.stophere?