Skip to content

CAMEL-22980 - fix "specify custom port" in infra for Zookeeper#21388

Merged
apupier merged 1 commit intoapache:mainfrom
apupier:22980-revertBreakingChange
Feb 11, 2026
Merged

CAMEL-22980 - fix "specify custom port" in infra for Zookeeper#21388
apupier merged 1 commit intoapache:mainfrom
apupier:22980-revertBreakingChange

Conversation

@apupier
Copy link
Contributor

@apupier apupier commented Feb 10, 2026

Description

Target

  • I checked that the commit is targeting the correct branch (Camel 4 uses the main branch)

Tracking

  • If this is a large change, bug fix, or code improvement, I checked there is a JIRA issue filed for the change (usually before you start working on it).

Apache Camel coding standards and style

  • I checked that each commit in the pull request has a meaningful subject line and body.
  • I have run mvn clean install -DskipTests locally from root folder and I have committed all auto-generated changes.

@apupier apupier requested a review from Croway February 10, 2026 16:09
@github-actions
Copy link
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟

🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run

  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot.

  • You can label PRs using build-all, build-dependents, skip-tests and test-dependents to fine-tune the checks executed by this PR.

  • Build and test logs are available in the Summary page. Only Apache Camel committers have access to the summary.

  • ⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

@Croway
Copy link
Contributor

Croway commented Feb 10, 2026

The custom port is needed by the camel infra command, what is the failure?

: -1;
if (imageName == null) {
return new ZooKeeperContainer(ZooKeeperContainer.CONTAINER_NAME, clientPort);
return new ZooKeeperContainer();
Copy link
Contributor

Choose a reason for hiding this comment

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

are the changes in ZooKeeperLocalContainerInfraService really needed?

aren't the ones in ZooKeeperContainer enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know. My goal was to get back to a more stable main branch as soon as possible. So found the commit introducing the issue and tried to revert. We can adjust the previous work later on so that the main branch (and all other developments) is not impacted

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, the changes to ZooKeeperContainer are ok, but the changes to ZooKeeperLocalContainerInfraService should be reverted, and, in order to support both camel test, and camel infra run with custom or default port scenarios, the following diff can be applied.

out.txt

@apupier
Copy link
Contributor Author

apupier commented Feb 11, 2026

what is the failure?

#21387 (comment)

[�[1;31mERROR�[m] �[1;31mFailures: �[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testJoinAfterConnect:216 expected: <true> but was: <false>�[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testJoinBeforeConnect:267 expected: <true> but was: <false>�[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testRejoinAfterDisconnect:306 expected: <true> but was: <false>�[m
[�[1;31mERROR�[m] �[1;31mErrors: �[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testAddFieldIgnoredOnParse:404 » ConnectionLoss KeeperErrorCode = ConnectionLoss for /singletons/test1770736846801�[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testGroupClose:358 » ConnectionLoss KeeperErrorCode = ConnectionLoss for /singletons/test1770736783644�[m
[�[1;31mERROR�[m] �[1;31m  GroupIT.testOrder:165 » ConditionTimeout Condition with alias 'Await for registration, the group must have an id' didn't complete within 1 minutes because condition with Lambda expression in org.apache.camel.component.zookeepermaster.group.GroupIT was not fulfilled.�[m

@apupier apupier force-pushed the 22980-revertBreakingChange branch from 51c492e to 20118a5 Compare February 11, 2026 09:43
@apupier
Copy link
Contributor Author

apupier commented Feb 11, 2026

failing check is unrelated to this PR. i tis due to a regression on main branch, see this PR #21402 to revert this regression

@Croway
Copy link
Contributor

Croway commented Feb 11, 2026

@apupier In the diff there is a change to ZooKeeperLocalContainerInfraService

-                ? ZooKeeperContainer.CLIENT_PORT
+                ? ContainerEnvironmentUtil.getConfiguredPort(ZooKeeperContainer.CLIENT_PORT)

could you apply this change too?

@davsclaus
Copy link
Contributor

Ah can we get the last bit attempted, and then also rebase on main

Signed-off-by: Aurélien Pupier <apupier@ibm.com>
@apupier apupier force-pushed the 22980-revertBreakingChange branch from 20118a5 to 2c77a47 Compare February 11, 2026 13:30
@apupier apupier changed the title CAMEL-22980 - revert "specify custom port" in infra for Zookeeper CAMEL-22980 - fix "specify custom port" in infra for Zookeeper Feb 11, 2026
@apupier apupier merged commit 3f485f5 into apache:main Feb 11, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants