Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[fix][broker] Fix PulsarService.getLookupServiceAddress returns wrong port if TLS is enabled #21015

Merged
merged 18 commits into from
Sep 18, 2023

Conversation

Technoboy-
Copy link
Contributor

Fixes #21012

Documentation

  • doc
  • doc-required
  • doc-not-needed
  • doc-complete

@Technoboy- Technoboy- self-assigned this Aug 17, 2023
@Technoboy- Technoboy- added this to the 3.2.0 milestone Aug 17, 2023
@github-actions github-actions bot added the doc-not-needed Your PR changes do not impact docs label Aug 17, 2023
@Technoboy- Technoboy- added release/3.0.2 release/2.11.3 release/3.1.1 and removed doc-not-needed Your PR changes do not impact docs labels Aug 17, 2023
@github-actions github-actions bot added the doc-not-needed Your PR changes do not impact docs label Aug 17, 2023
@alpreu
Copy link
Contributor

alpreu commented Aug 17, 2023

Thanks for being so quick with providing a fix 👍
The only question I had when looking at the code is that getLookupServiceAddress() was used in the BrokerRegistry to set the broker id, which will change now - Does this mean when we apply the change that there is stale metadata that has to be cleaned up?

@Technoboy-
Copy link
Contributor Author

Thanks for being so quick with providing a fix 👍 The only question I had when looking at the code is that getLookupServiceAddress() was used in the BrokerRegistry to set the broker id, which will change now - Does this mean when we apply the change that there is stale metadata that has to be cleaned up?

No need to clean-up

@Technoboy- Technoboy- force-pushed the fix-21012 branch 3 times, most recently from b3125a2 to bfab08f Compare September 6, 2023 07:49
@codelipenghui codelipenghui merged commit 1363777 into apache:master Sep 18, 2023
Technoboy- added a commit that referenced this pull request Sep 18, 2023
Technoboy- added a commit that referenced this pull request Sep 21, 2023
…ns wrong port if TLS is enabled (#21015)"

This reverts commit ad69dec.
@lhotari
Copy link
Member

lhotari commented Jan 19, 2024

#21894 makes further improvements in this area and replace "lookupServiceAddress" with "brokerId" and uses it consistenly across the code base.

@Technoboy- what was the reason to not cherry-pick this fix to branch-3.0 and branch-3.1 ? I noticed that you had reverted the change to branch-3.1 . The reason I'm asking is that I am cherry-picking #21894 to branch-3.0 and branch-3.1 and I noticed that tests fail on branch-3.0 . The reason for this is that in master branch, there are different test configuration for tests due to changes made in this PR.
I already cherry-picked #21633 to branch-3.0 and branch-3.1 since that's a bug fix too and without the changes there are some additional merge conflicts when cherry-picking #21894 .

@lhotari
Copy link
Member

lhotari commented Jan 19, 2024

I think that we need to reverse the change made to "fix" #21012 since this change doesn't make sense to me. It will cause confusion if it is changed for no proper reason.

@Technoboy-
Copy link
Contributor Author

Technoboy- commented Jan 19, 2024

what was the reason to not cherry-pick this fix to branch-3.0 and branch-3.1

I’m afraid there are break changes or the fix may miss some places, so keep it on the master. Then #21633 found a missing place. As you know, our tests don't cover all the places; this kind of fix impacts many functions.

@lhotari
Copy link
Member

lhotari commented Jan 26, 2024

I'm cherry-picking this to branch-3.0 and branch-3.1 so that that sequent later changes will merge more cleanly when the changes are cherry-picked. The fixes that will be cherry-picked in this order: #21015, #21633, #21842, #21894, #21937 .
Another reason to cherry-pick is the changes in test configuration. Tests cherry-picked from master might fail in branch-3.1 and branch-3.0 unless this PR is cherry-picked. The reason is that this test removes the TLS setup from most unit tests. That's fine, but it changes behavior and it's better to have the same behavior in the LTS branch too.

lhotari pushed a commit that referenced this pull request Jan 26, 2024
… port if TLS is enabled (#21015)

(cherry picked from commit 1363777)
mukesh-ctds pushed a commit to datastax/pulsar that referenced this pull request Mar 6, 2024
… port if TLS is enabled (apache#21015)

(cherry picked from commit 1363777)
(cherry picked from commit 628e79d)
mukesh-ctds pushed a commit to datastax/pulsar that referenced this pull request Mar 6, 2024
… port if TLS is enabled (apache#21015)

(cherry picked from commit 1363777)
(cherry picked from commit 628e79d)
mukesh-ctds pushed a commit to datastax/pulsar that referenced this pull request Mar 6, 2024
… port if TLS is enabled (apache#21015)

(cherry picked from commit 1363777)
(cherry picked from commit 628e79d)
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] PulsarService.getLookupServiceAddress returns wrong port if TLS is enabled
7 participants