This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch HDDS-3698-upgrade
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/HDDS-3698-upgrade by this push:
new 0d014c0 HDDS-4314. OM Layout Version Manager init throws silent CNF
error in integration tests. (#1492)
0d014c0 is described below
commit 0d014c00077ec468efb2af7da3ef75e99c9e39bf
Author: avijayanhwx <[email protected]>
AuthorDate: Tue Oct 13 15:56:58 2020 -0700
HDDS-4314. OM Layout Version Manager init throws silent CNF error in
integration tests. (#1492)
---
.../ozone/om/upgrade/OMLayoutVersionManagerImpl.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutVersionManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutVersionManagerImpl.java
index a37862b..1779394 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutVersionManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutVersionManagerImpl.java
@@ -35,6 +35,9 @@ import
org.apache.hadoop.ozone.upgrade.LayoutVersionInstanceFactory;
import org.apache.hadoop.ozone.upgrade.LayoutVersionManager;
import org.apache.hadoop.ozone.upgrade.VersionFactoryKey;
import org.reflections.Reflections;
+import org.reflections.scanners.SubTypesScanner;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,6 +53,8 @@ public final class OMLayoutVersionManagerImpl
private static final Logger LOG =
LoggerFactory.getLogger(OMLayoutVersionManagerImpl.class);
+ private static final String OM_REQUEST_CLASS_PACKAGE =
+ "org.apache.hadoop.ozone.om.request";
private static OMLayoutVersionManagerImpl omVersionManager;
private LayoutVersionInstanceFactory<Class<? extends OMClientRequest>>
requestFactory;
@@ -119,11 +124,14 @@ public final class OMLayoutVersionManagerImpl
}
private void registerOzoneManagerRequests() {
- Reflections reflections = new Reflections(
- "org.apache.hadoop.ozone.om.request");
- Set<Class<? extends OMClientRequest>> subTypes =
- reflections.getSubTypesOf(OMClientRequest.class);
try {
+ Reflections reflections = new Reflections(new ConfigurationBuilder()
+ .setUrls(ClasspathHelper.forPackage(OM_REQUEST_CLASS_PACKAGE))
+ .setScanners(new SubTypesScanner())
+ .setExpandSuperTypes(false));
+
+ Set<Class<? extends OMClientRequest>> subTypes =
+ reflections.getSubTypesOf(OMClientRequest.class);
for (Class<? extends OMClientRequest> requestClass : subTypes) {
if (Modifier.isAbstract(requestClass.getModifiers())) {
continue;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]