Skip to content

HDDS-17320. SCM client does not recognize RetriableWithNoFailoverException returned by SCM #11698

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

Merged
adoroszlai merged 2 commits into from
Oct 24, 2026
Merged

HDDS-17320. SCM client does not recognize RetriableWithNoFailoverException returned by SCM #11698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19930bb
HDDS-17320. SCM client does not recognize RetriableWithNoFailoverExce…
smengcl Oct 22, 2026
755c894
HDDS-17320. Address review: add String constructor so RemoteException…
smengcl Oct 23, 2026
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
4 changes: 3 additions & 1 deletion hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,9 @@ public static boolean isRetriableWithNoFailoverException(Exception e) {
*/
public static boolean checkRetriableWithNoFailoverException(Exception e) {
Throwable t = unwrapException(e);
return RetriableWithNoFailoverException.class.isInstance(t);
// RemoteException cannot be unwrapped to this exception (no String constructor), so also match the class name.
Comment thread
smengcl marked this conversation as resolved.
Outdated
return t instanceof RetriableWithNoFailoverException || (t instanceof RemoteException
&& RetriableWithNoFailoverException.class.getName().equals(((RemoteException) t).getClassName()));
}

public static Throwable getNotLeaderException(Exception e) {
Expand Down
22 changes: 22 additions & 0 deletions hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/scm/ha/TestSCMHAUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import com.google.protobuf.ServiceException;
import java.io.IOException;
import java.util.Collection;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ha.RetriableWithNoFailoverException;
import org.apache.hadoop.hdds.scm.ha.SCMHAUtils;
import org.apache.hadoop.io.retry.RetryPolicy.RetryAction;
import org.apache.hadoop.io.retry.RetryPolicy.RetryAction.RetryDecision;
import org.apache.hadoop.ipc_.RemoteException;
import org.junit.jupiter.api.Test;

/**
Expand All @@ -51,4 +57,20 @@ void testRemoveSelfId() {
assertEquals(2, nodesWithoutSelf.size());
assertThat(nodesWithoutSelf).doesNotContain(selfId);
}

@Test
void retriesSameScmOnRetriableWithNoFailoverException() {
Exception e = new ServiceException(new RemoteException(RetriableWithNoFailoverException.class.getName(),
"SCM leader is not ready"));
assertThat(SCMHAUtils.checkRetriableWithNoFailoverException(e)).isTrue();
RetryAction action = SCMHAUtils.getRetryAction(0, 0, e, 15, 2000);
assertEquals(RetryDecision.RETRY, action.action);
assertEquals(2000, action.delayMillis);
// Fails after max retries
assertEquals(RetryDecision.FAIL, SCMHAUtils.getRetryAction(0, 15, e, 15, 2000).action);

// Other exceptions are not matched
Exception other = new ServiceException(new RemoteException(IOException.class.getName(), "error"));
assertThat(SCMHAUtils.checkRetriableWithNoFailoverException(other)).isFalse();
}
}