Skip to content
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

Add TripleConfig to ProtocolConfig as nest configuration #14077

Merged
merged 13 commits into from May 23, 2024

Conversation

finefuture
Copy link
Contributor

What is the purpose of the change

Brief changelog

Verifying this change

Checklist

  • Make sure there is a GitHub_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GitHub issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Check if is necessary to patch to Dubbo 3 if you are work on Dubbo 2.7
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add sample in dubbo samples project.
  • Add some description to dubbo-website project if you are requesting to add a feature.
  • GitHub Actions works fine on your own branch.
  • If this contribution is large, please follow the Software Donation Guide.

@oxsean oxsean requested a review from AlbumenJ April 12, 2024 13:55
@oxsean
Copy link
Collaborator

oxsean commented Apr 23, 2024

@AlbumenJ Could you take a look add TripleConfig into configManager is reasonable?, or is there a better option?

@AlbumenJ
Copy link
Member

AlbumenJ commented May 8, 2024

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

@finefuture
Copy link
Contributor Author

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

@AlbumenJ
Copy link
Member

AlbumenJ commented May 9, 2024

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

  1. Still a little wired
  2. This will change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx

@finefuture
Copy link
Contributor Author

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

  1. Still a little wired
  2. This will change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx

Do you have any ideas? I think the second point is acceptable.

@AlbumenJ
Copy link
Member

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

  1. Still a little wired
  2. This will change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx

Do you have any ideas? I think the second point is acceptable.

If we change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx, all the users who have configured such configuration should change their configuration.

@finefuture
Copy link
Contributor Author

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

  1. Still a little wired
  2. This will change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx

Do you have any ideas? I think the second point is acceptable.

If we change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx, all the users who have configured such configuration should change their configuration.

TripleConfig is newly added in version 3.3. Users should just add new configurations.

In version 3.2:
image

@AlbumenJ
Copy link
Member

Add a special protocol related config to ConfigManager is not a good idea. We need a more reasonable way to manage these special configs.

How about putting it in ProtocolConfig as nest configuration?

  1. Still a little wired
  2. This will change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx

Do you have any ideas? I think the second point is acceptable.

If we change the full key from dubbo.triple.xxx to dubbo.protocol.triple.xxx, all the users who have configured such configuration should change their configuration.

TripleConfig is newly added in version 3.3. Users should just add new configurations.

In version 3.2: image

If so, we can change it

@finefuture finefuture changed the title Add TripleConfig to ConfigManager Add TripleConfig to ProtocolConfig as nest configuration May 15, 2024
@AlbumenJ
Copy link
Member

@EarthChen @oxsean @icodening PTAL

Copy link
Collaborator

@oxsean oxsean left a comment

Choose a reason for hiding this comment

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

@finefuture xsd should remove too.
@AlbumenJ LGTM.

@finefuture
Copy link
Contributor Author

There is a problem here. If the server-side and client-side protocols are inconsistent, configClientPipeline obtains the protocol name of the server side through url.getProtocol. At this time, ProtocolConfig will not be obtained from ConfigManager.

I'm fixing it.

@finefuture
Copy link
Contributor Author

finefuture commented May 16, 2024

There is a problem here. If the server-side and client-side protocols are inconsistent, configClientPipeline obtains the protocol name of the server side through url.getProtocol. At this time, ProtocolConfig will not be obtained from ConfigManager.

I'm fixing it.

This problem can be solved by using the application's own ProtocolConfig. If the user wants to configure triple, he can set it directly under a single protocol. When using multiple protocols, he can set the protocol for which TripleConfig is configured as the default protocol.
And can handle the situation where ProtocolConfig is not set.

return url.getOrDefaultApplicationModel().getApplicationConfigManager().getDefaultProtocols().stream()
        .findFirst()
        .flatMap(protocolConfig -> Optional.ofNullable(protocolConfig.getTriple()))
        .orElseGet(TripleConfig::new);

@AlbumenJ
Copy link
Member

@EarthChen @icodening PTAL

@icodening
Copy link
Contributor

use 'extends' maybe better ?
@AlbumenJ @oxsean

@finefuture
Copy link
Contributor Author

use 'extends' maybe better ? @AlbumenJ @oxsean

Embedded configuration may be better because it can be unified under the dubbo.protocol prefix. You can refer to MetricsConfig, and Prometheus configuration is also used as embedded configuration. If users do not want to use Prometheus, they can choose not to configure it.

Copy link
Contributor

@icodening icodening left a comment

Choose a reason for hiding this comment

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

LGTM

private TripleConfig getTripleConfig(URL url) {
return url.getOrDefaultApplicationModel()
.getApplicationConfigManager()
.getOrAddProtocol(url.getProtocol())
Copy link
Member

Choose a reason for hiding this comment

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

Why use getOrAddProtocol?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because the consumer side may not be configured with tri's ProtocolConfig, it needs to set a default tri's ProtocolConfig for it.
For example: https://github.com/apache/dubbo/blob/3.2/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java

@oxsean
Copy link
Collaborator

oxsean commented May 20, 2024

LGTM.

finefuture and others added 2 commits May 21, 2024 20:41
# Conflicts:
#	dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
Copy link
Member

@EarthChen EarthChen left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

sonarcloud bot commented May 22, 2024

@AlbumenJ AlbumenJ merged commit b5bb044 into apache:3.3 May 23, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants