From b69601138a7a512334594d173b2aee6c3c1991a9 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Mon, 27 Jul 2015 18:18:03 +0200
Subject: [PATCH] Improved the Doxyfile
---
Doxyfile | 6 +++---
scheduler/Scheduler.hpp | 13 +++++++++++++
.../castor/tape/tapeserver/daemon/TapeDaemon.cpp | 4 +++-
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Doxyfile b/Doxyfile
index e466a8a760..6988ed4a69 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -47,7 +47,7 @@ OUTPUT_DIRECTORY = doxygen
# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
-CREATE_SUBDIRS = NO
+CREATE_SUBDIRS = YES
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
# documentation generated by doxygen is written. Doxygen will use this
@@ -372,7 +372,7 @@ INTERNAL_DOCS = NO
# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
-CASE_SENSE_NAMES = YES
+CASE_SENSE_NAMES = NO
# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
# will show members with their full class and namespace scopes in the
@@ -568,7 +568,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = cmdline common nameserver objectstore remotens scheduler xroot_plugins
+INPUT = cmdline common nameserver objectstore remotens scheduler tapeserver xroot_plugins
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp
index f291bf1e2f..d443baa401 100644
--- a/scheduler/Scheduler.hpp
+++ b/scheduler/Scheduler.hpp
@@ -50,6 +50,7 @@ class SecurityIdentity;
class StorageClass;
class Tape;
class TapeMount;
+class TapeSession;
class TapePool;
class UserIdentity;
@@ -645,6 +646,18 @@ public:
std::unique_ptr<TapeMount> getNextMount(const std::string &logicalLibraryName,
const std::string & driveName);
+ /**
+ * Returns the next tape session for the specified logical library.
+ * All the functions of the mount will handled via the mount object
+ * itself. This is the entry point to the tape server's interface
+ *
+ * @param logicalLibraryName The name of the logical library.
+ * @param driveName The drive's name.
+ * @return The next tape mount or NULL if there is currently no work to do.
+ */
+ std::unique_ptr<TapeSession> getNextMount(const std::string &logicalLibraryName,
+ const std::string & driveName);
+
// class ArchiveMount:public TapeMount {
// public:
// class ArchiveJob
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
index df143f2068..760be2e177 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
@@ -614,7 +614,9 @@ void castor::tape::tapeserver::daemon::TapeDaemon::initZmqContext() {
void castor::tape::tapeserver::daemon::TapeDaemon::setUpReactor(
const int reaperSocket) {
createAndRegisterProcessForkerConnectionHandler(reaperSocket);
- createAndRegisterVdqmAcceptHandler();
+ // In the CTA project the tapeserverd daemon does not listen for jobs from the
+ // vdqmd daemon, therefore do not create and register the vdqm accept handler
+ //createAndRegisterVdqmAcceptHandler();
createAndRegisterAdminAcceptHandler();
createAndRegisterLabelCmdAcceptHandler();
createAndRegisterTapeMessageHandler();
--
GitLab