Fix no tape block movement regression

ReleaseNotes.md

@@ -18,6 +18,7 @@
 - cta/CTA#322 - Queues with cleanup heartbeat above zero are not being picked for cleanup
 - cta/CTA#328 - Make root user able to read encrypted files with cta-readtp
 - cta/CTA#329 - Correctly set previous session state to enable cleaner session
+- cta/CTA#330 - Fix no tape block movement regression
 
 # v4.8.6-1
 ### Bug Fixes

tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp

@@ -20,8 +20,7 @@
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-castor::tape::tapeserver::daemon::DataTransferConfig::DataTransferConfig()
-  throw():
+castor::tape::tapeserver::daemon::DataTransferConfig::DataTransferConfig() noexcept:
   bufsz(0),
   nbBufs(0),
   bulkRequestMigrationMaxBytes(0),
@@ -31,8 +30,11 @@ castor::tape::tapeserver::daemon::DataTransferConfig::DataTransferConfig()
   maxBytesBeforeFlush(0),
   maxFilesBeforeFlush(0),
   nbDiskThreads(0),
+  xrootTimeout(0),
   useLbp(false),
   useRAO(false),
   useEncryption(true),
-  externalEncryptionKeyScript(""),
-  externalFreeDiskSpaceScript("") {}
+  tapeLoadTimeout(300),
+  wdNoBlockMoveMaxSecs(10 * 60),
+  wdIdleSessionTimer(10),
+  wdGlobalLockAcqMaxSecs(15 * 60) {}

tapeserver/daemon/DriveHandler.hpp

@@ -43,7 +43,7 @@ namespace daemon {
  */
 class DriveHandler : public SubprocessHandler {
 public:
-  DriveHandler(const TapedConfiguration& tapedConfig, const TpconfigLine& configline, ProcessManager& pm);
+  DriveHandler(const TapedConfiguration& tapedConfig, const TpconfigLine& driveConfig, ProcessManager& pm);
 
   ~DriveHandler() override;
 
@@ -71,7 +71,7 @@ private:
   /** The parameters */
   const TapedConfiguration& m_tapedConfig;
   /** This drive's parameters */
-  const TpconfigLine& m_configLine;
+  const TpconfigLine& m_driveConfig;
   /** Possible outcomes of the previous session/child process.  */
   enum class PreviousSession {
     Initiating, ///< The process is the first to run after daemon startup. A cleanup will be run beforehand.