simbadzina commented on code in PR #5860:
URL: https://github.com/apache/hadoop/pull/5860#discussion_r1269883206
##########
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java:
##########
@@ -1783,16 +1783,26 @@ && isNamespaceStateIdFresh(nsId)
}
private boolean isObserverReadEligible(String nsId, Method method) {
- boolean isReadEnabledForNamespace =
- observerReadEnabledDefault !=
observerReadEnabledOverrides.contains(nsId);
- return isReadEnabledForNamespace && isReadCall(method);
+ return isReadCall(method) && isNamespaceObserverReadEligible(nsId);
+ }
+
+ /**
+ * Check if a namespace is eligible for observer reads.
+ * @param nsId namespaceID
+ * @return whether the 'namespace' has observer reads enabled.
+ */
+ boolean isNamespaceObserverReadEligible(String nsId) {
+ return observerReadEnabledDefault !=
observerReadEnabledOverrides.contains(nsId);
}
/**
* Check if a method is read-only.
* @return whether the 'method' is a read-only operation.
*/
private static boolean isReadCall(Method method) {
+ if (method == null) {
Review Comment:
This is to fix a unit test here:
https://github.com/apache/hadoop/blob/trunk/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouter.java#L200
The ideal fix is mocking Method.class there so that
`RemoteMethod.getMethod()` does not return null and mocking
`Method.isAnnotationPresent()`. However that required updating the version of
Mockito, in order to mock a final class.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
