Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
facb720a
Commit
facb720a
authored
Aug 22, 2016
by
Daniele Kruse
Browse files
Small changes and comments in the tapeserver to get the system going
parent
274f9b62
Changes
3
Hide whitespace changes
Inline
Side-by-side
tapeserver/castor/tape/tapeserver/daemon/Catalogue.cpp
View file @
facb720a
...
...
@@ -138,6 +138,9 @@ void castor::tape::tapeserver::daemon::Catalogue::enterDriveConfig(
m_drives
[
driveConfig
.
getUnitName
()]
=
new
CatalogueDrive
(
m_netTimeout
,
m_log
,
m_processForker
,
m_hostName
,
driveConfig
,
DRIVE_STATE_UP
,
m_catalogueConfig
,
m_sysWrapper
);
// TODO: This has to be changed to DRIVE_STATE_DOWN in production which is the default for all tape drives.
// Daniele changed this to DRIVE_STATE_UP while doing the full system test ,because the tpconfig command is
// not working properly.
// Else the drive is already in the catalogue
}
else
{
castor
::
exception
::
Exception
ex
;
...
...
tapeserver/castor/tape/tapeserver/daemon/CatalogueTest.cpp
View file @
facb720a
...
...
@@ -83,6 +83,9 @@ TEST_F(castor_tape_tapeserver_daemon_CatalogueTest, goodDayPopulate) {
ASSERT_EQ
(
std
::
string
(
"DEV1"
),
unit1Config
.
getDevFilename
());
ASSERT_EQ
(
DRIVE_STATE_UP
,
unit1
.
getState
());
// TODO: This has to be changed to DRIVE_STATE_DOWN in production which is the default for all tape drives.
// Daniele changed this to DRIVE_STATE_UP while doing the full system test ,because the tpconfig command is
// not working properly.
ASSERT_NO_THROW
(
unit1Config
.
getLibrarySlot
());
ASSERT_EQ
(
castor
::
mediachanger
::
TAPE_LIBRARY_TYPE_MANUAL
,
unit1Config
.
getLibrarySlot
().
getLibraryType
());
...
...
@@ -99,6 +102,9 @@ TEST_F(castor_tape_tapeserver_daemon_CatalogueTest, goodDayPopulate) {
ASSERT_EQ
(
std
::
string
(
"DEV2"
),
unit2Config
.
getDevFilename
());
ASSERT_EQ
(
DRIVE_STATE_UP
,
unit2
.
getState
());
// TODO: This has to be changed to DRIVE_STATE_DOWN in production which is the default for all tape drives.
// Daniele changed this to DRIVE_STATE_UP while doing the full system test ,because the tpconfig command is
// not working properly.
ASSERT_NO_THROW
(
unit2Config
.
getLibrarySlot
());
ASSERT_EQ
(
castor
::
mediachanger
::
TAPE_LIBRARY_TYPE_MANUAL
,
unit2Config
.
getLibrarySlot
().
getLibraryType
());
...
...
tapeserver/castor/tape/tapeserver/file/DiskFile.cpp
View file @
facb720a
...
...
@@ -372,7 +372,11 @@ XrootC2FSReadFile::XrootC2FSReadFile(const std::string &url,
XrootReadFile
::
XrootReadFile
(
const
std
::
string
&
xrootUrl
)
{
// Setup parent's variables
m_readPosition
=
0
;
m_URL
=
xrootUrl
;
m_URL
=
xrootUrl
+
"?eos.ruid=0&eos.rgid=0"
;
// TODO: the second part of this string has been added by Daniele
// to temporarily circumvent EOS authorization, while plugging
// everything together to run a full system test. When preparing
// this code for production this line should simply be:
// m_URL = xrootUrl;
// and simply open
using
XrdCl
::
OpenFlags
;
XrootClEx
::
throwOnError
(
m_xrootFile
.
Open
(
m_URL
,
OpenFlags
::
Read
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment