Refactor PagedDoraWorker by injecting MetaManager and UfsManager

dora/core/common/src/main/java/alluxio/underfs/UfsManager.java

@@ -26,6 +26,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -89,6 +90,17 @@ public AlluxioURI getUfsMountPointUri() {
     }
   }
 
+  /**
+   * Return a UFS instance if it already exists in the cache, otherwise, creates a new instance and
+   * return it.
+   *
+   * @param ufsUri the UFS path
+   * @param ufsConfSupplier supplier for UFS configuration
+   * @return the UFS instance
+   */
+  UnderFileSystem getOrAdd(AlluxioURI ufsUri,
+                           Supplier<UnderFileSystemConfiguration> ufsConfSupplier);
+
   /**
    * Keeps track of a mount id and maps it to its URI in Alluxio and configuration. This is an
    * Alluxio-only operation and no interaction to UFS will be made.
@@ -131,6 +143,14 @@ void addMountWithRecorder(long mountId, AlluxioURI ufsUri,
    */
   UfsClient get(long mountId) throws NotFoundException, UnavailableException;
 
+  /**
+   * Gets an instance for the given UFS URI and configuration, if such exists.
+   *
+   * @param ufsUri the URI of the UFS
+   * @return a UFS instance, or none if not registered
+   */
+  Optional<UnderFileSystem> get(AlluxioURI ufsUri);
+
   /**
    * @return the UFS client associated with root
    */

dora/core/server/common/src/main/java/alluxio/underfs/AbstractUfsManager.java

@@ -108,14 +108,7 @@ protected AbstractUfsManager() {
     mCloser = Closer.create();
   }
 
-  /**
-   * Return a UFS instance if it already exists in the cache, otherwise, creates a new instance and
-   * return it.
-   *
-   * @param ufsUri  the UFS path
-   * @param ufsConfSupplier supplier for UFS configuration
-   * @return the UFS instance
-   */
+  @Override
   public UnderFileSystem getOrAdd(AlluxioURI ufsUri,
                                   Supplier<UnderFileSystemConfiguration> ufsConfSupplier) {
     Key key = generateKey(ufsUri);
@@ -227,12 +220,7 @@ public void removeMount(long mountId) {
     mMountIdToUfsInfoMap.remove(mountId);
   }
 
-  /**
-   * Gets an instance for the given UFS URI and configuration, if such exists.
-   *
-   * @param ufsUri the URI of the UFS
-   * @return a UFS instance, or none if not registered
-   */
+  @Override
   public Optional<UnderFileSystem> get(AlluxioURI ufsUri) {
     Key key = generateKey(ufsUri);
     return get(key);

dora/core/server/worker/src/main/java/alluxio/worker/DataServerFactory.java

@@ -20,7 +20,7 @@
 import alluxio.underfs.UfsManager;
 import alluxio.util.io.FileUtils;
 import alluxio.util.io.PathUtils;
-import alluxio.worker.dora.DoraWorker;
+import alluxio.worker.dora.PagedDoraWorker;
 import alluxio.worker.grpc.DoraWorkerClientServiceHandler;
 import alluxio.worker.grpc.GrpcDataServer;
 
@@ -59,9 +59,9 @@ protected DataServerFactory(UfsManager ufsManager,
    */
   public DataServer createRemoteGrpcDataServer(DataWorker dataWorker) {
     BlockWorkerGrpc.BlockWorkerImplBase blockWorkerService;
-    if (dataWorker instanceof DoraWorker) {
+    if (dataWorker instanceof PagedDoraWorker) {
       blockWorkerService =
-          new DoraWorkerClientServiceHandler((DoraWorker) dataWorker);
+          new DoraWorkerClientServiceHandler((PagedDoraWorker) dataWorker);
     } else {
       throw new UnsupportedOperationException(dataWorker.getClass().getCanonicalName()
           + " is no longer supported in Alluxio 3.x");
@@ -83,9 +83,9 @@ public DataServer createDomainSocketDataServer(DataWorker worker) {
     }
     LOG.info("Domain socket data server is enabled at {}.", domainSocketPath);
     BlockWorkerGrpc.BlockWorkerImplBase blockWorkerService;
-    if (worker instanceof DoraWorker) {
+    if (worker instanceof PagedDoraWorker) {
       blockWorkerService =
-          new DoraWorkerClientServiceHandler((DoraWorker) worker);
+          new DoraWorkerClientServiceHandler((PagedDoraWorker) worker);
     } else {
       throw new UnsupportedOperationException(worker.getClass().getCanonicalName()
           + " is no longer supported in Alluxio 3.x");

dora/core/server/worker/src/main/java/alluxio/worker/dora/DoraMetaManager.java

@@ -22,6 +22,7 @@
 import alluxio.proto.meta.DoraMeta;
 import alluxio.proto.meta.DoraMeta.FileStatus;
 import alluxio.underfs.Fingerprint;
+import alluxio.underfs.UfsManager;
 import alluxio.underfs.UfsStatus;
 import alluxio.underfs.UnderFileSystem;
 import alluxio.underfs.UnderFileSystemConfiguration;
@@ -33,6 +34,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
+import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,8 +56,7 @@ public class DoraMetaManager implements Closeable {
   private final AlluxioConfiguration mConf;
   private final DoraMetaStore mMetaStore;
   private final CacheManager mCacheManager;
-  private final PagedDoraWorker mDoraWorker;
-  protected final DoraUfsManager mUfsManager;
+  protected final UfsManager mUfsManager;
 
   private static final Logger SAMPLING_LOG = new SamplingLogger(
       LoggerFactory.getLogger(DoraMetaManager.class), 1L * Constants.MINUTE_MS);
@@ -77,20 +78,19 @@ public class DoraMetaManager implements Closeable {
   /**
    * Creates a dora meta manager.
    * @param conf configuration
-   * @param doraWorker the dora worker instance
    * @param cacheManger the cache manager to manage the page cache
    * @param ufsManager the ufs Manager
    */
+  @Inject
   public DoraMetaManager(AlluxioConfiguration conf,
-      PagedDoraWorker doraWorker, CacheManager cacheManger,
-      DoraUfsManager ufsManager) {
+      CacheManager cacheManger,
+      UfsManager ufsManager) {
     mConf = conf;
     String dbDir = mConf.getString(PropertyKey.DORA_WORKER_METASTORE_ROCKSDB_DIR);
     Duration duration = mConf.getDuration(PropertyKey.DORA_WORKER_METASTORE_ROCKSDB_TTL);
     long ttl = (duration.isNegative() || duration.isZero()) ? -1 : duration.getSeconds();
     mMetaStore = new RocksDBDoraMetaStore(dbDir, ttl);
     mCacheManager = cacheManger;
-    mDoraWorker = doraWorker;
     mUfsManager = ufsManager;
   }
 
@@ -120,7 +120,8 @@ public Optional<FileStatus> getFromUfs(String path) throws IOException {
       if (mXAttrWriteToUFSEnabled) {
         xattrMap = ufs.getAttributes(path);
       }
-      DoraMeta.FileStatus fs = mDoraWorker.buildFileStatusFromUfsStatus(status, path, xattrMap);
+      DoraMeta.FileStatus fs = PagedDoraWorker.buildFileStatusFromUfsStatus(
+          mCacheManager.getUsage(), ufs.getUnderFSType(), status, path, xattrMap);
       return Optional.ofNullable(fs);
     } catch (FileNotFoundException e) {
       return Optional.empty();