Repository navigation
[Solace] Fix flaky SolaceIO integration tests #40740
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
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
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,57 @@ | ||
| /* | ||
| * 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.beam.sdk.io.solace.it; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.beam.sdk.PipelineResult; | ||
| import org.apache.beam.sdk.testutils.metrics.MetricsReader; | ||
| import org.joda.time.Duration; | ||
| import org.joda.time.Instant; | ||
|
|
||
| class SolaceTestUtils { | ||
| private static final Duration POLL_INTERVAL = Duration.standardSeconds(1); | ||
|
|
||
| /** | ||
| * Waits until the counter reaches {@code expectedCount} or {@code timeout} passes, then cancels | ||
| * the pipeline and returns the last value of the counter. | ||
| * | ||
| * <p>The Read connector keeps polling the queue forever, so the pipeline never finishes on its | ||
| * own. Waiting for the expected count instead of a fixed amount of time keeps the tests from | ||
| * stopping too early on a slow machine. | ||
| */ | ||
| static long waitForCounterAndCancel( | ||
| PipelineResult pipelineResult, | ||
| String namespace, | ||
| String counterName, | ||
| long expectedCount, | ||
| Duration timeout) | ||
| throws IOException { | ||
| MetricsReader metricsReader = new MetricsReader(pipelineResult, namespace); | ||
| Instant deadline = Instant.now().plus(timeout); | ||
| long count = metricsReader.getCounterMetric(counterName); | ||
| while (count < expectedCount && Instant.now().isBefore(deadline)) { | ||
| PipelineResult.State state = pipelineResult.waitUntilFinish(POLL_INTERVAL); | ||
| count = metricsReader.getCounterMetric(counterName); | ||
| if (state != null && state.isTerminal()) { | ||
| break; | ||
| } | ||
| } | ||
| pipelineResult.cancel(); | ||
|
Contributor
There was a problem hiding this comment. 🟡 Medium: If an exception is thrown inside the |
||
| return count; | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
🟢 Low:
GenericContainer.withExposedPorts(...)overwrites the container's exposed ports list rather than appending to it, which replaces the port added by.withTopic(TOPIC_NAME, Service.SMF)on the line above. While it works here becauseJCSMP_PORT(55555) is the same asService.SMF.getPort(),SolaceContaineralready exposes port 8080 (SEMP_PORT) in its constructor andwithTopic(..., Service.SMF)already callsaddExposedPort(55555), so.withExposedPorts(SEMP_PORT, JCSMP_PORT)is redundant (oraddExposedPortscould be used if you want to be explicit without overwriting).