You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/05/06 08:51:28 UTC
[rocketmq] 02/02: Update some service name in ha service
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta-dledger-controller
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ce534eea149a422299d474faac15c73871dc7ba0
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Fri May 6 16:50:51 2022 +0800
Update some service name in ha service
---
.../org/apache/rocketmq/store/ha/DefaultHAConnection.java | 2 +-
.../rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java | 3 +++
.../rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java | 11 +++++++----
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAConnection.java b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAConnection.java
index 3b7241065..d99099844 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAConnection.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAConnection.java
@@ -432,7 +432,7 @@ public class DefaultHAConnection implements HAConnection {
@Override
public String getServiceName() {
if (haService.getDefaultMessageStore().getBrokerConfig().isInBrokerContainer()) {
- return haService.getDefaultMessageStore().getBrokerConfig().getLoggerIdentifier() + WriteSocketService.class.getSimpleName();
+ return haService.getDefaultMessageStore().getBrokerIdentity().getLoggerIdentifier() + WriteSocketService.class.getSimpleName();
}
return WriteSocketService.class.getSimpleName();
}
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java
index 3ddd367a7..0dae7d477 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAClient.java
@@ -128,6 +128,9 @@ public class AutoSwitchHAClient extends ServiceThread implements HAClient {
}
@Override public String getServiceName() {
+ if (haService.getDefaultMessageStore().getBrokerConfig().isInBrokerContainer()) {
+ return haService.getDefaultMessageStore().getBrokerIdentity().getLoggerIdentifier() + AutoSwitchHAClient.class.getSimpleName();
+ }
return AutoSwitchHAClient.class.getSimpleName();
}
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java
index 0b7ce6b39..7f9bdeba7 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAConnection.java
@@ -39,9 +39,9 @@ import org.apache.rocketmq.store.ha.io.HAWriter;
public class AutoSwitchHAConnection implements HAConnection {
/**
- * Header protocol in syncing msg from master.
- * Format: current state + body size + offset + epoch + epochStartOffset + additionalInfo(confirmOffset).
- * If the msg is hankeShakeMsg, the body size = EpochEntrySize * EpochEntryNums, the offset is maxOffset in master.
+ * Header protocol in syncing msg from master. Format: current state + body size + offset + epoch +
+ * epochStartOffset + additionalInfo(confirmOffset). If the msg is hankeShakeMsg, the body size = EpochEntrySize *
+ * EpochEntryNums, the offset is maxOffset in master.
*/
public static final int MSG_HEADER_SIZE = 4 + 4 + 8 + 4 + 8 + 8;
public static final int EPOCH_ENTRY_SIZE = 12;
@@ -218,6 +218,9 @@ public class AutoSwitchHAConnection implements HAConnection {
@Override
public String getServiceName() {
+ if (haService.getDefaultMessageStore().getBrokerConfig().isInBrokerContainer()) {
+ return haService.getDefaultMessageStore().getBrokerIdentity().getLoggerIdentifier() + ReadSocketService.class.getSimpleName();
+ }
return ReadSocketService.class.getSimpleName();
}
@@ -336,7 +339,7 @@ public class AutoSwitchHAConnection implements HAConnection {
@Override
public String getServiceName() {
if (haService.getDefaultMessageStore().getBrokerConfig().isInBrokerContainer()) {
- return haService.getDefaultMessageStore().getBrokerConfig().getLoggerIdentifier() + WriteSocketService.class.getSimpleName();
+ return haService.getDefaultMessageStore().getBrokerIdentity().getLoggerIdentifier() + WriteSocketService.class.getSimpleName();
}
return WriteSocketService.class.getSimpleName();
}