door: add zone awareness to nfs, xrootd, and ftp doors

Author: lens161

modules/dcache-ftp/src/main/java/org/dcache/ftp/door/AbstractFtpDoorV1.java

@@ -226,6 +226,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import org.dcache.auth.attributes.Restrictions;
 import org.dcache.auth.attributes.RootDirectory;
 import org.dcache.cells.CellStub;
+import org.dcache.cells.ZoneAware;
 import org.dcache.ftp.TransferMode;
 import org.dcache.ftp.proxy.ActiveAdapter;
 import org.dcache.ftp.proxy.PassiveConnectionHandler;
@@ -348,7 +349,7 @@ public ClientAbortException(int code, String reply) {
 
 public abstract class AbstractFtpDoorV1
       implements LineBasedInterpreter, CellMessageReceiver, CellCommandListener,
-      CellInfoProvider, CellMessageSender, CellIdentityAware {
+      CellInfoProvider, CellMessageSender, CellIdentityAware, ZoneAware {
 
     private static final long MINIMUM_PERFORMANCE_MARKER_PERIOD = 2;
     private static final long MAXIMUM_PERFORMANCE_MARKER_PERIOD = TimeUnit.MINUTES.toSeconds(5);
@@ -377,6 +378,8 @@ public abstract class AbstractFtpDoorV1
     private boolean _logAbortedTransfers;
     private final List<TimerTask> _activeTimerTasks = synchronizedList(new ArrayList<>());
 
+    Optional<String> _zone;
+
     private enum WorkAround {
         /* If globus-url-copy is organising a third-party copy then it will
          * issue a QUIT command to the destination endpoint before
@@ -433,6 +436,10 @@ private enum WorkAround {
         REQUEST_MD5_WHEN_UPLOADING_FILES
     }
 
+    @Override
+    public void setZone(Optional<String> zone) {
+        _zone = zone;
+    }
 
     /**
      * Simple class to allow easy accumulation of space usage.
@@ -3445,6 +3452,7 @@ private void retrieve(String file, long offset, long size,
                     delayedPassive,
                     protocolFamily,
                     version);
+        transfer.setZone(_zone);
         try {
             LOGGER.info("retrieve user={}", getUser());
             LOGGER.info("retrieve addr={}", _remoteSocketAddress);
@@ -3558,6 +3566,7 @@ private void store(String file, Mode mode, TransferMode xferMode,
                     delayedPassive,
                     protocolFamily,
                     version);
+        transfer.setZone(_zone);
         try {
             LOGGER.info("store receiving with mode {}", xferMode);
 

modules/dcache-nfs/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java

@@ -89,6 +89,7 @@
 import org.dcache.auth.attributes.Restrictions;
 import org.dcache.cells.CellStub;
 import org.dcache.cells.CuratorFrameworkAware;
+import org.dcache.cells.ZoneAware;
 import org.dcache.chimera.ChimeraFsException;
 import org.dcache.chimera.FsInode;
 import org.dcache.chimera.FsInodeType;
@@ -196,7 +197,7 @@
 
 public class NFSv41Door extends AbstractCellComponent implements
       NFSv41DeviceManager, CellCommandListener,
-      CellMessageReceiver, CellInfoProvider, CuratorFrameworkAware {
+      CellMessageReceiver, CellInfoProvider, CuratorFrameworkAware, ZoneAware {
 
     private static final Logger _log = LoggerFactory.getLogger(NFSv41Door.class);
 
@@ -221,7 +222,6 @@ public class NFSv41Door extends AbstractCellComponent implements
      */
     private final Map<stateid4, NfsTransfer> _transfers = new ConcurrentHashMap<>();
 
-
     /**
      * Record that binds NFS client with a file handle.
      */
@@ -270,6 +270,8 @@ public record OpenFile(clientid4 clientid, Inode inode) {}
 
     private String _ioQueue;
 
+    private Optional<String> _zone;
+
     /**
      * TCP port number to bind.
      */
@@ -490,6 +492,11 @@ public void setEnableTls(boolean enableTls) {
         _enableTls = enableTls;
     }
 
+    @Override
+    public void setZone(Optional<String> zone) {
+        _zone = zone;
+    }
+
     public VirtualFileSystem wrapWithMonitoring(VirtualFileSystem inner) {
         MonitoringVfs monitor = new MonitoringVfs();
         monitor.setInner(inner);
@@ -837,7 +844,7 @@ public Layout layoutGet(CompoundContext context, LAYOUTGET4args args)
                             :
                             new ReadTransfer(_pnfsHandler, client, layoutType, layoutState, nfsInode,
                                     context.getRpcCall().getCredential().getSubject());
-
+                    transfer.setZone(_zone);
                     _transfers.put(layoutStateid, transfer);
                     layoutStates.put(ioKey, layoutStateid);
 
@@ -859,6 +866,7 @@ public Layout layoutGet(CompoundContext context, LAYOUTGET4args args)
 
                 } else {
                     // keep debug context in sync
+                    transfer.setZone(_zone);
                     transfer.restoreSession();
                     layoutState = transfer.getStateid();
                     NDC.push(pnfsId.toString());

modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdDoor.java

@@ -102,6 +102,7 @@
 import org.dcache.auth.attributes.Restriction;
 import org.dcache.cells.CellStub;
 import org.dcache.cells.MessageCallback;
+import org.dcache.cells.ZoneAware;
 import org.dcache.namespace.ACLPermissionHandler;
 import org.dcache.namespace.ChainedPermissionHandler;
 import org.dcache.namespace.CreateOption;
@@ -150,7 +151,7 @@
 public class XrootdDoor
       extends AbstractCellComponent
       implements CellMessageReceiver,
-      CellCommandListener, CellInfoProvider {
+      CellCommandListener, CellInfoProvider, ZoneAware {
 
     public static final String XROOTD_PROTOCOL_STRING = "Xrootd";
     public static final String XROOTD_PROTOCOL_VERSION =
@@ -225,6 +226,8 @@ public class XrootdDoor
     private int proxyResponseTimeoutInSeconds;
     private InetAddress _internalAddress;
 
+    private Optional<String> _zone;
+
     private UnionLoginStrategy.AccessLevel anonymousUserAccess = AccessLevel.NONE;
 
     @Autowired(required = false)
@@ -304,6 +307,11 @@ public void setProxyTimerExecutor(ScheduledExecutorService proxyTimerExecutor) {
         this.proxyTimerExecutor = proxyTimerExecutor;
     }
 
+    @Override
+    public void setZone(Optional<String> zone){
+        _zone = zone;
+    }
+
     /**
      * Converts a colon separated list of paths to a List of FsPath.
      */
@@ -496,6 +504,7 @@ public synchronized void finished(CacheException error) {
                       }
                   }
               };
+        transfer.setZone(_zone);
         transfer.setCellAddress(getCellAddress());
         transfer.setPoolManagerStub(_poolManagerStub);
         transfer.setPoolStub(_poolStub);
@@ -546,6 +555,7 @@ private InetSocketAddress getMatchingLocalAddress(InetSocketAddress local)
         int handle = transfer.getFileHandle();
 
         InetSocketAddress address = null;
+        transfer.setZone(_zone);
         _transfers.put(handle, transfer);
         String explanation = "unspecified problem";
         try {
@@ -624,6 +634,7 @@ private FsPath getUploadPath(Subject subject, Restriction restriction,
               subject, restriction, opaque);
 
         transfer.setOverwriteAllowed(overwrite);
+        transfer.setZone(_zone);
 
         /*
          *  If this is a destination door/server and the session