You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by ti...@apache.org on 2020/01/10 16:20:16 UTC
[incubator-tubemq] branch master updated: [TUBEMQ-16] Correct
BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/master by this push:
new 5a65d68 [TUBEMQ-16] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
5a65d68 is described below
commit 5a65d68b8f2ff9482dad75a1f17da4135bbccaab
Author: Tboy <gu...@immomo.com>
AuthorDate: Sat Jan 11 00:20:06 2020 +0800
[TUBEMQ-16] Correct BdbStoreService#isPrimaryNodeActived to BdbStoreService#isPrimaryNodeActive
This closes #8 .
---
.../tubemq/server/common/utils/WebParameterUtils.java | 2 +-
.../main/java/com/tencent/tubemq/server/master/TMaster.java | 4 ++--
.../tubemq/server/master/bdbstore/BdbStoreService.java | 2 +-
.../server/master/bdbstore/DefaultBdbStoreService.java | 12 ++++++------
.../master/nodemanage/nodebroker/BrokerConfManage.java | 6 +++---
.../tubemq/server/master/web/action/screen/Webapi.java | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java
index 7118e7b..e417cdf 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/WebParameterUtils.java
@@ -288,7 +288,7 @@ public class WebParameterUtils {
public static void reqAuthorizenCheck(TMaster master,
BrokerConfManage brokerConfManage,
String reqToken) throws Exception {
- if (brokerConfManage.isPrimaryNodeActived()) {
+ if (brokerConfManage.isPrimaryNodeActive()) {
throw new Exception(
"Illegal visit: designatedPrimary happened...please check if the other member is down");
}
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/TMaster.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/TMaster.java
index a569d6f..931b585 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/TMaster.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/TMaster.java
@@ -1885,7 +1885,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
logger.info(strBuffer.append("[Rebalance Start] ").append(rebalanceId)
.append(", isMaster=").append(defaultBdbStoreService.isMaster())
.append(", isPrimaryNodeActived=")
- .append(defaultBdbStoreService.isPrimaryNodeActived()).toString());
+ .append(defaultBdbStoreService.isPrimaryNodeActive()).toString());
} else {
logger.info(strBuffer.append("[Rebalance Start] ").append(rebalanceId)
.append(", BDB service is null isMaster= false, isPrimaryNodeActived=false").toString());
@@ -2032,7 +2032,7 @@ public class TMaster extends HasThread implements MasterService, Stoppable {
logger.info(strBuffer.append("[ResetRebalance Start] ").append(rebalanceId)
.append(", isMaster=").append(defaultBdbStoreService.isMaster())
.append(", isPrimaryNodeActived=")
- .append(defaultBdbStoreService.isPrimaryNodeActived()).toString());
+ .append(defaultBdbStoreService.isPrimaryNodeActive()).toString());
} else {
logger.info(strBuffer.append("[ResetRebalance Start] ").append(rebalanceId)
.append(", BDB service is null isMaster= false, isPrimaryNodeActived=false").toString());
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/BdbStoreService.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/BdbStoreService.java
index 6163824..f5d12e1 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/BdbStoreService.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/BdbStoreService.java
@@ -71,7 +71,7 @@ public interface BdbStoreService {
MasterGroupStatus getMasterGroupStatus(boolean isFromHeartbeat);
- boolean isPrimaryNodeActived();
+ boolean isPrimaryNodeActive();
void transferMaster() throws Exception;
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/DefaultBdbStoreService.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/DefaultBdbStoreService.java
index a7ed52d..7de409e 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/DefaultBdbStoreService.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/bdbstore/DefaultBdbStoreService.java
@@ -251,7 +251,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
return null;
}
if (replicationGroup != null) {
- clusterGroupVO.setPrimaryNodeActived(isPrimaryNodeActived());
+ clusterGroupVO.setPrimaryNodeActived(isPrimaryNodeActive());
int count = 0;
boolean hasMaster = false;
List<ClusterNodeVO> clusterNodeVOList = new ArrayList<ClusterNodeVO>();
@@ -283,7 +283,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
}
clusterGroupVO.setNodeData(clusterNodeVOList);
if (hasMaster) {
- if (isPrimaryNodeActived()) {
+ if (isPrimaryNodeActive()) {
clusterGroupVO.setGroupStatus("Running-ReadOnly");
} else {
clusterGroupVO.setGroupStatus("Running-ReadWrite");
@@ -887,7 +887,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
if ((activeNodes >= majoritySize) && isMasterActive) {
masterGroupStatus.setMasterGroupStatus(true, true, true);
connectNodeFailCount = 0;
- if (isPrimaryNodeActived()) {
+ if (isPrimaryNodeActive()) {
repEnv.setRepMutableConfig(repEnv.getRepMutableConfig().setDesignatedPrimary(false));
}
}
@@ -896,7 +896,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
if (connectNodeFailCount > 1000) {
connectNodeFailCount = 3;
}
- if (!isPrimaryNodeActived()) {
+ if (!isPrimaryNodeActive()) {
logger.error("[BDB Error] DesignatedPrimary happened...please check if the other member is down");
repEnv.setRepMutableConfig(repEnv.getRepMutableConfig().setDesignatedPrimary(true));
}
@@ -910,7 +910,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
* @return
*/
@Override
- public boolean isPrimaryNodeActived() {
+ public boolean isPrimaryNodeActive() {
if (repEnv == null) {
return false;
}
@@ -929,7 +929,7 @@ public class DefaultBdbStoreService implements BdbStoreService, Server {
throw new Exception("The BDB store StoreService is reboot now!");
}
if (isMaster()) {
- if (!isPrimaryNodeActived()) {
+ if (!isPrimaryNodeActive()) {
if ((replicas4Transfer != null) && (!replicas4Transfer.isEmpty())) {
logger.info("start transferMaster to replicas: " + replicas4Transfer);
if ((replicas4Transfer != null) && (!replicas4Transfer.isEmpty())) {
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/nodemanage/nodebroker/BrokerConfManage.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/nodemanage/nodebroker/BrokerConfManage.java
index 7257405..2f4216d 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/nodemanage/nodebroker/BrokerConfManage.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/nodemanage/nodebroker/BrokerConfManage.java
@@ -144,8 +144,8 @@ public class BrokerConfManage implements Server {
return mBdbStoreManagerService.isMaster();
}
- public boolean isPrimaryNodeActived() {
- return mBdbStoreManagerService.isPrimaryNodeActived();
+ public boolean isPrimaryNodeActive() {
+ return mBdbStoreManagerService.isPrimaryNodeActive();
}
/**
@@ -155,7 +155,7 @@ public class BrokerConfManage implements Server {
*/
public void transferMaster() throws Exception {
if (mBdbStoreManagerService.isMaster()
- && !mBdbStoreManagerService.isPrimaryNodeActived()) {
+ && !mBdbStoreManagerService.isPrimaryNodeActive()) {
mBdbStoreManagerService.transferMaster();
}
}
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/action/screen/Webapi.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/action/screen/Webapi.java
index 5e68b1d..a3047b1 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/action/screen/Webapi.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/master/web/action/screen/Webapi.java
@@ -94,7 +94,7 @@ public class Webapi implements Action {
strBuffer = processQueryOperate(req, method);
succProcess = true;
} else if ("op_modify".equals(type)) { // modify
- if (brokerConfManage.isPrimaryNodeActived()) {
+ if (brokerConfManage.isPrimaryNodeActive()) {
throw new Exception(
"DesignatedPrimary happened...please check if the other member is down");
}