Added MoverHandlerPort to DataTransferConfig

castor/acs/castor-tape-acs-dismount.man

@@ -21,7 +21,7 @@ castor-tape-acs-dismount \- dismount a volume
 from the drive located in the specified \fBDRIVE_SLOT\fP of the tape library.
 The format of \fBDRIVE_SLOT\fP is as follows:
 
-.B ACS:LSM:panel:transport
+.B acsACS,LSM,panel,transport
 
 Please note that this command-line tool communicates directly with the CSI of 
 the ACS system. This command-line tool does not communicate with any CASTOR

castor/acs/castor-tape-acs-mount.man

@@ -21,7 +21,7 @@ castor-tape-acs-mount \- mount a volume
 the drive located in the specified \fBDRIVE_SLOT\fP of the tape library.
 The format of \fBDRIVE_SLOT\fP is as follows:
 
-.B ACS:LSM:panel:transport
+.B acsACS,LSM,panel,transport
 
 Please note that this command-line tool communicates directly with the CSI of
 the ACS system. This command-line tool does not communicate with any CASTOR

castor/tape/tapeserver/daemon/DataTransferConfig.cpp

@@ -25,6 +25,7 @@
 #include "castor/tape/tapeserver/Constants.hpp"
 #include "castor/tape/tapeserver/daemon/DataTransferConfig.hpp"
 #include "castor/tape/tapeserver/daemon/Constants.hpp"
+#include "movers/moveropenclose.h"
 
 //------------------------------------------------------------------------------
 // constructor
@@ -39,7 +40,8 @@ castor::tape::tapeserver::daemon::DataTransferConfig::DataTransferConfig()
   bulkRequestRecallMaxFiles(0),
   maxBytesBeforeFlush(0),
   maxFilesBeforeFlush(0),
-  nbDiskThreads(0) {
+  nbDiskThreads(0),
+  moverHandlerPort(0) {
 }
 
 //------------------------------------------------------------------------------
@@ -82,6 +84,8 @@ castor::tape::tapeserver::daemon::DataTransferConfig
     "TapeServer", "RemoteFileProtocol", "RFIO", log);
   config.xrootPrivateKey = castorConf.getConfEntString(
     "XROOT", "PrivateKey", "/opt/xrootd/keys/key.pem", log);
+  config.moverHandlerPort = castorConf.getConfEntInt(
+    "DiskManager", "MoverHandlerPort", MOVERHANDLERPORT, log);
 
   return config;
 }

castor/tape/tapeserver/daemon/DataTransferConfig.hpp

@@ -58,8 +58,8 @@ struct DataTransferConfig {
 
   /**
    * When the tapebridged daemon requests the tapegatewayd daemon for a set of
-   * files to migrate to tape, this parameter defines the maximum number of bytes
-   * the set of files should represent.
+   * files to migrate to tape, this parameter defines the maximum number of
+   * bytes the set of files should represent.
    */
   uint64_t bulkRequestMigrationMaxBytes;
 
@@ -114,6 +114,12 @@ struct DataTransferConfig {
    */
   std::string xrootPrivateKey;
 
+  /**
+   * The TCP/IP port on which the disk manager listens for data-transfer
+   * notifications from XROOT server.
+   */
+  uint16_t moverHandlerPort;
+
   /**
    * Constructor that sets all integer member-variables to 0 and all string
    * member-variables to the empty string.