Feature improvement, only register one url for port unification. #12528
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
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 |
|---|---|---|
|
|
@@ -183,13 +183,13 @@ private void unRegisterShutdownHook() { | |
| } | ||
|
|
||
| /** | ||
| * Enable registration of instance for pure Consumer process by setting registerConsumer to 'true' | ||
| * by default is false. | ||
| */ | ||
| private boolean isRegisterConsumerInstance() { | ||
| Boolean registerConsumer = getApplication().getRegisterConsumer(); | ||
| if (registerConsumer == null) { | ||
| return false; | ||
| } | ||
| return Boolean.TRUE.equals(registerConsumer); | ||
| } | ||
|
|
@@ -746,23 +746,27 @@ private void startModules() { | |
| } | ||
|
|
||
| @Override | ||
| public void prepareApplicationInstance(ModuleModel moduleModel) { | ||
|
Member
There was a problem hiding this comment. ApplicationDeployer depends on ModuleModel might not a good design.
Contributor
Author
There was a problem hiding this comment. DefaultApplicationDeployer.java public void notifyModuleChanged(ModuleModel moduleModel, DeployState state) {
checkState(moduleModel, state);
}
public void checkState(ModuleModel moduleModel, DeployState moduleState) {
synchronized (stateLock) {
if (!moduleModel.isInternal() && moduleState == DeployState.STARTED) {
prepareApplicationInstance(moduleModel);
}
}It's currently designed to work this way:
ApplicationDeployer depends on ModuleModel mainly querying for statuses such as 'STARTED', 'isInternal', and 'hasRegistryInteraction'. All these statuses can be wrapped into an Event or something, but I think this can be further optimized with this issue #12750 |
||
| if (hasPreparedApplicationInstance.get()) { | ||
| return; | ||
| } | ||
|
|
||
| // export MetricsService | ||
| exportMetricsService(); | ||
|
|
||
| if (isRegisterConsumerInstance() || moduleModel.getDeployer().hasRegistryInteraction()) { | ||
| if (hasPreparedApplicationInstance.compareAndSet(false, true)) { | ||
| // register the local ServiceInstance if required | ||
| registerServiceInstance(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized void exportMetadataService() { | ||
| doExportMetadataService(); | ||
| } | ||
|
|
||
| public void prepareInternalModule() { | ||
| if (hasPreparedInternalModule) { | ||
| return; | ||
|
|
@@ -1081,7 +1085,7 @@ public void notifyModuleChanged(ModuleModel moduleModel, DeployState state) { | |
| public void checkState(ModuleModel moduleModel, DeployState moduleState) { | ||
| synchronized (stateLock) { | ||
| if (!moduleModel.isInternal() && moduleState == DeployState.STARTED) { | ||
| prepareApplicationInstance(moduleModel); | ||
| } | ||
| DeployState newState = calculateState(); | ||
| switch (newState) { | ||
|
|
@@ -1183,8 +1187,8 @@ private void onInitialize() { | |
| } | ||
| } | ||
|
|
||
| private void doExportMetadataService() { | ||
| if (!isStarting() && !isStarted()) { | ||
| return; | ||
| } | ||
| for (DeployListener<ApplicationModel> listener : listeners) { | ||
|
|
||
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
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.
Depends on MetadataService here might not a good design
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.
Consider provide a solution for this issue with #12750
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.
It seems that the full service export process can move from ServiceConfig to a new ModuleLifecycle implement? This might solve this problem
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.
Yes, I think so, this might need some extra efforts to merge this change with Lifecycle mechanism.