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.

Sign up for GitHub

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

Jump to bottom

[ISSUE #6537] Fix bug MessageStoreConfig.haListenPort item config not… #6538

Merged
merged 14 commits into from
Apr 25, 2023
Merged

[ISSUE #6537] Fix bug MessageStoreConfig.haListenPort item config not… #6538

Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2691b00
[ISSUE #6537] Fix bug MessageStoreConfig.haListenPort item config not…
hhy50 Apr 5, 2023
49dd972
Merge branch 'apache:develop' into develop
hhy50 Apr 8, 2023
0ae70a6
rerun
hhy50 Apr 8, 2023
46ff21a
[ISSUE #6537] fix bug, if user not config haListenPort, then safe set…
hhy50 Apr 10, 2023
51d8d16
Merge remote-tracking branch 'origin/develop' into develop
hhy50 Apr 10, 2023
5295847
Merge branch 'apache:develop' into develop
hhy50 Apr 11, 2023
7ff1068
Merge branch 'apache:develop' into develop
hhy50 Apr 14, 2023
4c5cc9a
Merge branch 'apache:develop' into develop
hhy50 Apr 14, 2023
5105f9a
rerun
hhy50 Apr 15, 2023
58e5899
Merge remote-tracking branch 'origin/develop' into develop
hhy50 Apr 15, 2023
1b0ff0f
Merge branch 'apache:develop' into develop
hhy50 Apr 17, 2023
e76407b
Merge branch 'apache:develop' into develop
hhy50 Apr 19, 2023
7847646
Merge branch 'apache:develop' into develop
hhy50 Apr 23, 2023
dd8464c
Merge branch 'apache:develop' into develop
hhy50 Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public static BrokerController buildBrokerController(String[] args) throws Excep
final NettyClientConfig nettyClientConfig = new NettyClientConfig();
final MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
nettyServerConfig.setListenPort(10911);
messageStoreConfig.setHaListenPort(0);

Options options = ServerUtil.buildCommandlineOptions(new Options());
CommandLine commandLine = ServerUtil.parseCmdLine(
Expand Down Expand Up @@ -167,7 +168,10 @@ public static BrokerController buildBrokerController(String[] args) throws Excep
System.exit(-4);
}

messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

If the user has not configured it, could the default port for HA be set to nettyServerConfig.getListenPort() + 1 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

haListenPort default value is nettyServerConfig.getListenPort()'default value +1

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nettyServerConfig.listenPort default value is 10911

image

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO this PR will break the compatibility, that is, the default value of haLitenPort is listenPort + 1. Users setting listenPort but not setting haLitenPort explicitly will find haLitenPort changes after updating to new version.

The more appropriate way may be:

  • if haLitenPort is set explicitly, use the value set by user;
  • if haLitenPort is not set, assign listenPort + 1 to it.

if (messageStoreConfig.getHaListenPort() <= 0) {
messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1);
}

brokerConfig.setInBrokerContainer(false);

System.setProperty("brokerLogDir", "");
Expand Down