You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by bh...@apache.org on 2021/05/13 14:19:52 UTC
[ozone] branch master updated: HDDS-5202. Use scm#checkLeader
before processing client requests . (#2229)
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f8a06e0 HDDS-5202. Use scm#checkLeader before processing client requests . (#2229)
f8a06e0 is described below
commit f8a06e0a4f1ce613510b9cefcfe9bda2fabaf3dc
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Thu May 13 19:49:31 2021 +0530
HDDS-5202. Use scm#checkLeader before processing client requests . (#2229)
---
.../scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java | 2 +-
.../StorageContainerLocationProtocolServerSideTranslatorPB.java | 2 +-
.../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
index 1938afe..95c7e1c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
@@ -104,7 +104,7 @@ public final class ScmBlockLocationProtocolServerSideTranslatorPB
@Override
public SCMBlockLocationResponse send(RpcController controller,
SCMBlockLocationRequest request) throws ServiceException {
- if (!scm.getScmContext().isLeader()) {
+ if (!scm.checkLeader()) {
RatisUtil.checkRatisException(
scm.getScmHAManager().getRatisServer().triggerNotLeaderException(),
scm.getBlockProtocolRpcPort(), scm.getScmId());
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
index bd9e56d..07c1095 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
@@ -145,7 +145,7 @@ public final class StorageContainerLocationProtocolServerSideTranslatorPB
public ScmContainerLocationResponse submitRequest(RpcController controller,
ScmContainerLocationRequest request) throws ServiceException {
// not leader or not belong to admin command.
- if (!scm.getScmContext().isLeader()
+ if (!scm.checkLeader()
&& !ADMIN_COMMAND_TYPE.contains(request.getCmdType())) {
RatisUtil.checkRatisException(
scm.getScmHAManager().getRatisServer().triggerNotLeaderException(),
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 44a7b8a..4ef0e46 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1471,8 +1471,8 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
} else {
// FOR HA setup, the node has to be the leader and ready to serve
// requests.
- return scmContext.isLeader() && getScmHAManager().getRatisServer()
- .getDivision().getInfo().isLeaderReady();
+ return getScmHAManager().getRatisServer().getDivision().getInfo()
+ .isLeaderReady();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org