Skip to content

HDDS-14705. Ozone clients should retry when OM is in prepare mode #9828

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

Open
dombizita wants to merge 3 commits into
base: master
Choose a base branch
from
+14 −12
Open

HDDS-14705. Ozone clients should retry when OM is in prepare mode #9828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73ae1a7
HDDS-14705. Ozone clients should retry when OM is in prepare mode
dombizita Feb 24, 2026
d804897
Remove unused imports and added a test to verify the logic
dombizita Feb 24, 2026
ef5c3e2
Merge remote-tracking branch 'apache/master' into HDDS-14705
dombizita Mar 6, 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
12 changes: 0 additions & 12 deletions ...ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.exceptions.OMLeaderNotReadyException;
import org.apache.hadoop.ozone.om.exceptions.OMNotLeaderException;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.SecretManager;
import org.apache.ratis.protocol.exceptions.ReadException;
import org.apache.ratis.protocol.exceptions.ReadIndexException;
import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -159,16 +157,6 @@ protected synchronized boolean shouldFailover(Exception ex) {
}
} else if (HddsUtils.shouldNotFailoverOnRpcException(unwrappedException)) {
return false;
} else if (ex instanceof StateMachineException) {
StateMachineException smEx = (StateMachineException) ex;
Throwable cause = smEx.getCause();
if (cause instanceof OMException) {
OMException omEx = (OMException) cause;
// Do not failover if the operation was blocked because the OM was
// prepared.
return omEx.getResult() !=
OMException.ResultCodes.NOT_SUPPORTED_OPERATION_WHEN_PREPARED;
}
}
return true;
}
Expand Down
14 changes: 14 additions & 0 deletions ...ozone/common/src/test/java/org/apache/hadoop/ozone/om/ha/TestOMFailoverProxyProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.ozone.ha.ConfUtils;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -254,4 +256,16 @@ public void testCanonicalTokenServiceName() throws IOException {
}
}

/**
* If OM is in prepare mode it should still retry.
*/
@Test
public void testShouldFailoverOnPreparedStateMachineException() {
OMException omEx = new OMException("prepared",
OMException.ResultCodes.NOT_SUPPORTED_OPERATION_WHEN_PREPARED);
StateMachineException smEx = new StateMachineException("sme", omEx);

assertTrue(provider.shouldFailover(smEx));
}

}