bshashikant commented on a change in pull request #2141:
URL: https://github.com/apache/ozone/pull/2141#discussion_r613178939
##########
File path:
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java
##########
@@ -145,13 +152,24 @@ public synchronized ProxyInfo getProxy() {
@Override
public void performFailover(ScmBlockLocationProtocolPB newLeader) {
// Should do nothing here.
- LOG.debug("Failing over to next proxy. {}", getCurrentProxyOMNodeId());
+ LOG.debug("Failing over to next proxy. {}", getCurrentProxySCMNodeId());
}
- public void performFailoverToAssignedLeader(String newLeader) {
+ public void performFailoverToAssignedLeader(String newLeader, Exception e) {
+ ServerNotLeaderException snle =
+ (ServerNotLeaderException) SCMHAUtils.getServerNotLeaderException(e);
+ if (snle != null && snle.getSuggestedLeader() != null) {
+ newLeader = scmProxyInfoMap.values().stream().filter(
+ proxyInfo -> NetUtils.getHostPortString(proxyInfo.getAddress())
+
.equals(snle.getSuggestedLeader())).findFirst().get().getNodeId();
+ LOG.debug("Performing failover to suggested leader {}, nodeId {}",
+ snle.getSuggestedLeader(), newLeader);
+ }
if (newLeader == null) {
// If newLeader is not assigned, it will fail over to next proxy.
nextProxyIndex();
+ LOG.debug("Performing failover to next proxy node {}",
+ currentProxySCMNodeId);
} else {
if (!assignLeaderToNode(newLeader)) {
LOG.debug("Failing over SCM proxy to nodeId: {}", newLeader);
Review comment:
assignLeaderToNode will return true if the new leader is found in the
proxy list. If its not there, default is to fall back to next proxy which IMO
is the right behaviour.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
