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
2f217398
Commit
2f217398
authored
Oct 12, 2014
by
Eric Cano
Browse files
Moved Castor.conf reading of XROOT PrivateKey to mother process to fix unit testing.
parent
e1d444b1
Changes
6
Hide whitespace changes
Inline
Side-by-side
castor/messages/ForkDataTransfer.proto
View file @
2f217398
...
...
@@ -50,5 +50,6 @@ message ForkDataTransfer {
required
uint32
diskthreadpoolsize
=
22
;
required
uint32
rmcport
=
23
;
required
string
remotefileprotocol
=
24
;
required
string
xrootprivatekey
=
25
;
}
castor/tape/tapeserver/daemon/DataTransferSession.cpp
View file @
2f217398
...
...
@@ -204,8 +204,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
rrp
,
lc
,
m_castorConf
.
tapeserverdRemoteFileProtocol
,
castor
::
common
::
CastorConfiguration
::
getConfig
().
getConfEntString
(
"XROOT"
,
"PrivateKey"
,
"/opt/xrootd/keys/key.pem"
));
m_castorConf
.
xrootPrivateKey
);
RecallTaskInjector
rti
(
mm
,
trst
,
dwtp
,
m_clientProxy
,
m_castorConf
.
tapebridgeBulkRequestRecallMaxFiles
,
m_castorConf
.
tapebridgeBulkRequestRecallMaxBytes
,
lc
);
...
...
@@ -297,8 +296,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
m_castorConf
.
tapebridgeBulkRequestMigrationMaxBytes
,
lc
,
m_castorConf
.
tapeserverdRemoteFileProtocol
,
castor
::
common
::
CastorConfiguration
::
getConfig
().
getConfEntString
(
"XROOT"
,
"PrivateKey"
,
"/opt/xrootd/keys/key.pem"
));
m_castorConf
.
xrootPrivateKey
);
MigrationTaskInjector
mti
(
mm
,
drtp
,
twst
,
m_clientProxy
,
m_castorConf
.
tapebridgeBulkRequestMigrationMaxBytes
,
m_castorConf
.
tapebridgeBulkRequestMigrationMaxFiles
,
lc
);
...
...
castor/tape/tapeserver/daemon/DataTransferSession.hpp
View file @
2f217398
...
...
@@ -93,6 +93,7 @@ namespace daemon {
// Additions for tapeserverd
uint32_t
tapeserverdDiskThreads
;
std
::
string
tapeserverdRemoteFileProtocol
;
std
::
string
xrootPrivateKey
;
};
/**
* Constructor.
...
...
castor/tape/tapeserver/daemon/ProcessForker.cpp
View file @
2f217398
...
...
@@ -624,6 +624,7 @@ castor::tape::tapeserver::daemon::DataTransferSession::CastorConf
config
.
tapebridgeMaxFilesBeforeFlush
=
msg
.
maxfilesbeforeflush
();
config
.
tapeserverdDiskThreads
=
msg
.
diskthreadpoolsize
();
config
.
tapeserverdRemoteFileProtocol
=
msg
.
remotefileprotocol
();
config
.
xrootPrivateKey
=
msg
.
xrootprivatekey
();
return
config
;
}
...
...
castor/tape/tapeserver/daemon/ProcessForkerProxySocket.cpp
View file @
2f217398
...
...
@@ -161,6 +161,8 @@ castor::messages::ForkDataTransfer
msg
.
set_rmcport
(
rmcPort
);
msg
.
set_remotefileprotocol
(
config
.
tapeserverdRemoteFileProtocol
);
msg
.
set_xrootprivatekey
(
config
.
xrootPrivateKey
);
return
msg
;
}
...
...
castor/tape/tapeserver/daemon/TapeDaemon.cpp
View file @
2f217398
...
...
@@ -1088,6 +1088,8 @@ castor::tape::tapeserver::daemon::DataTransferSession::CastorConf
"RTCPD"
,
"THREAD_POOL"
,
(
uint32_t
)
RTCPD_THREAD_POOL
,
&
m_log
);
castorConf
.
tapeserverdRemoteFileProtocol
=
config
.
getConfEntString
(
"TAPESERVERD"
,
"REMOTEFILEPROTOCOL"
,
"RFIO"
,
&
m_log
);
castorConf
.
xrootPrivateKey
=
config
.
getConfEntString
(
"XROOT"
,
"PRIVATEKEY"
,
"/opt/xrootd/keys/key.pem"
,
&
m_log
);
return
castorConf
;
}
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