Skip to content
Snippets Groups Projects
Commit 35a0b9a4 authored by Steven Murray's avatar Steven Murray
Browse files

Improved log and error messages by replacing RCP with remote-copy. Now all... 

Improved log and error messages by replacing RCP with remote-copy.  Now all messages should use remote-copy.
parent 72e9b1ff
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
castor/tape/aggregator/AggregatorDlfMessageConstants.hpp
+ 7
− 7
View file @ 35a0b9a4
/* This file was generated by ./AggregatorDlfMessagesCodeGenerator on Fri Jan 15 15:40:59 CET 2010
/* This file was generated by ./AggregatorDlfMessagesCodeGenerator on Fri Jan 15 16:05:56 CET 2010
*/
/******************************************************************************
......@@ -43,19 +43,19 @@ AGGREGATOR_FAILED_TO_READ_MESSAGE_HEADER=6, /* "Failed to read message header" *
AGGREGATOR_UNKNOWN_MAGIC=7, /* "Unknown magic number" */
AGGREGATOR_UNKNOWN_REQUEST_TYPE=8, /* "Unknown request type" */
AGGREGATOR_FAILED_TO_READ_MESSAGE_BODY=9, /* "Failed to read message body" */
AGGREGATOR_RECEIVE_RCP_JOB_RQST=10, /* "Receiving RCP job request" */
AGGREGATOR_RECEIVED_RCP_JOB_RQST=11, /* "Received RCP job request" */
AGGREGATOR_SUBMITTING_JOB_TO_RTCPD=12, /* "Submitting remote copy job to RTCPD" */
AGGREGATOR_RECEIVE_RTCOPY_JOB=10, /* "Receiving remote-copy job" */
AGGREGATOR_RECEIVED_RTCOPY_JOB=11, /* "Received remote-copy job" */
AGGREGATOR_SUBMITTING_RTCOPY_JOB_TO_RTCPD=12, /* "Submitting remote-copy job to RTCPD" */
AGGREGATOR_FAILED_TO_SUBMIT_JOB_TO_RTCPD=13, /* "Failed to submit remote copy job to RTCPD" */
AGGREGATOR_FAILED_TO_MARSHALL_RTCP_ACKN=14, /* "Failed to marshall RTCP acknowledge message" */
AGGREGATOR_FAILED_TO_SEND_RCP_JOB_REPLY_TO_VDQM=15, /* "Failed to send RCP job reply to VDQM" */
AGGREGATOR_FAILED_TO_PROCESS_RCP_JOB_SUBMISSION=16, /* "Failed to process RCP job submission message" */
AGGREGATOR_FAILED_TO_SEND_RTCOPY_JOB_REPLY_TO_VDQM=15, /* "Failed to send remote-copy job reply to VDQM" */
AGGREGATOR_FAILED_TO_PROCESS_RCOPY_JOB_SUBMISSION=16, /* "Failed to process remote-copy job submission message" */
AGGREGATOR_RTCPD_HANDLER_SOCKET_IS_NULL=17, /* "The RtcpdHandlerThread has been passed a NULL socket pointer" */
AGGREGATOR_INITIAL_RTCPD_CALLBACK=18, /* "Received initial callback connection from RTCPD" */
AGGREGATOR_RTCPD_CALLBACK=19, /* "Received a callback connection from RTCPD" */
AGGREGATOR_GOT_VOLREQID=20, /* "Got volume request ID from RTCPD" */
AGGREGATOR_FAILED_TO_GET_VOLREQID=21, /* "Failed to get volume request ID from RTCPD" */
AGGREGATOR_FAILED_TO_MARSHALL_RCP_JOB_REPLY_MESSAGE=22, /* "Failed to marshall RCP job reply message" */
AGGREGATOR_FAILED_TO_MARSHALL_RTCOPY_JOB_REPLY_MESSAGE=22, /* "Failed to marshall remote-copy job reply message" */
AGGREGATOR_SIGNALLED_NO_MORE_REQUESTS=23, /* "Signalled no more requests to RTCPD" */
AGGREGATOR_FAILED_TO_COORDINATE_REMOTE_COPY=24, /* "Failed to coordinate remote copy" */
AGGREGATOR_TRANSFER_FAILED=25, /* "Transfer failed" */
......
castor/tape/aggregator/AggregatorDlfMessageStrings.cpp
+ 7
− 7
View file @ 35a0b9a4
/* This file was generated by ./AggregatorDlfMessagesCodeGenerator on Fri Jan 15 15:40:59 CET 2010
/* This file was generated by ./AggregatorDlfMessagesCodeGenerator on Fri Jan 15 16:05:56 CET 2010
*/
/******************************************************************************
......@@ -39,19 +39,19 @@ castor::dlf::Message castor::tape::aggregator::AggregatorDaemon::s_dlfMessages[]
{AGGREGATOR_UNKNOWN_MAGIC, "Unknown magic number"},
{AGGREGATOR_UNKNOWN_REQUEST_TYPE, "Unknown request type"},
{AGGREGATOR_FAILED_TO_READ_MESSAGE_BODY, "Failed to read message body"},
{AGGREGATOR_RECEIVE_RCP_JOB_RQST, "Receiving RCP job request"},
{AGGREGATOR_RECEIVED_RCP_JOB_RQST, "Received RCP job request"},
{AGGREGATOR_SUBMITTING_JOB_TO_RTCPD, "Submitting remote copy job to RTCPD"},
{AGGREGATOR_RECEIVE_RTCOPY_JOB, "Receiving remote-copy job"},
{AGGREGATOR_RECEIVED_RTCOPY_JOB, "Received remote-copy job"},
{AGGREGATOR_SUBMITTING_RTCOPY_JOB_TO_RTCPD, "Submitting remote-copy job to RTCPD"},
{AGGREGATOR_FAILED_TO_SUBMIT_JOB_TO_RTCPD, "Failed to submit remote copy job to RTCPD"},
{AGGREGATOR_FAILED_TO_MARSHALL_RTCP_ACKN, "Failed to marshall RTCP acknowledge message"},
{AGGREGATOR_FAILED_TO_SEND_RCP_JOB_REPLY_TO_VDQM, "Failed to send RCP job reply to VDQM"},
{AGGREGATOR_FAILED_TO_PROCESS_RCP_JOB_SUBMISSION, "Failed to process RCP job submission message"},
{AGGREGATOR_FAILED_TO_SEND_RTCOPY_JOB_REPLY_TO_VDQM, "Failed to send remote-copy job reply to VDQM"},
{AGGREGATOR_FAILED_TO_PROCESS_RCOPY_JOB_SUBMISSION, "Failed to process remote-copy job submission message"},
{AGGREGATOR_RTCPD_HANDLER_SOCKET_IS_NULL, "The RtcpdHandlerThread has been passed a NULL socket pointer"},
{AGGREGATOR_INITIAL_RTCPD_CALLBACK, "Received initial callback connection from RTCPD"},
{AGGREGATOR_RTCPD_CALLBACK, "Received a callback connection from RTCPD"},
{AGGREGATOR_GOT_VOLREQID, "Got volume request ID from RTCPD"},
{AGGREGATOR_FAILED_TO_GET_VOLREQID, "Failed to get volume request ID from RTCPD"},
{AGGREGATOR_FAILED_TO_MARSHALL_RCP_JOB_REPLY_MESSAGE, "Failed to marshall RCP job reply message"},
{AGGREGATOR_FAILED_TO_MARSHALL_RTCOPY_JOB_REPLY_MESSAGE, "Failed to marshall remote-copy job reply message"},
{AGGREGATOR_SIGNALLED_NO_MORE_REQUESTS, "Signalled no more requests to RTCPD"},
{AGGREGATOR_FAILED_TO_COORDINATE_REMOTE_COPY, "Failed to coordinate remote copy"},
{AGGREGATOR_TRANSFER_FAILED, "Transfer failed"},
......
castor/tape/aggregator/AggregatorDlfMessages.csv
+ 6
− 6
View file @ 35a0b9a4
......@@ -8,19 +8,19 @@
7,AGGREGATOR_UNKNOWN_MAGIC,"Unknown magic number"
8,AGGREGATOR_UNKNOWN_REQUEST_TYPE,"Unknown request type"
9,AGGREGATOR_FAILED_TO_READ_MESSAGE_BODY,"Failed to read message body"
10,AGGREGATOR_RECEIVE_RCP_JOB_RQST,"Receiving RCP job request"
11,AGGREGATOR_RECEIVED_RCP_JOB_RQST,"Received RCP job request"
12,AGGREGATOR_SUBMITTING_JOB_TO_RTCPD,"Submitting remote copy job to RTCPD"
10,AGGREGATOR_RECEIVE_RTCOPY_JOB,"Receiving remote-copy job"
11,AGGREGATOR_RECEIVED_RTCOPY_JOB,"Received remote-copy job"
12,AGGREGATOR_SUBMITTING_RTCOPY_JOB_TO_RTCPD,"Submitting remote-copy job to RTCPD"
13,AGGREGATOR_FAILED_TO_SUBMIT_JOB_TO_RTCPD,"Failed to submit remote copy job to RTCPD"
14,AGGREGATOR_FAILED_TO_MARSHALL_RTCP_ACKN,"Failed to marshall RTCP acknowledge message"
15,AGGREGATOR_FAILED_TO_SEND_RCP_JOB_REPLY_TO_VDQM,"Failed to send RCP job reply to VDQM"
16,AGGREGATOR_FAILED_TO_PROCESS_RCP_JOB_SUBMISSION,"Failed to process RCP job submission message"
15,AGGREGATOR_FAILED_TO_SEND_RTCOPY_JOB_REPLY_TO_VDQM,"Failed to send remote-copy job reply to VDQM"
16,AGGREGATOR_FAILED_TO_PROCESS_RCOPY_JOB_SUBMISSION,"Failed to process remote-copy job submission message"
17,AGGREGATOR_RTCPD_HANDLER_SOCKET_IS_NULL,"The RtcpdHandlerThread has been passed a NULL socket pointer"
18,AGGREGATOR_INITIAL_RTCPD_CALLBACK,"Received initial callback connection from RTCPD"
19,AGGREGATOR_RTCPD_CALLBACK,"Received a callback connection from RTCPD"
20,AGGREGATOR_GOT_VOLREQID,"Got volume request ID from RTCPD"
21,AGGREGATOR_FAILED_TO_GET_VOLREQID,"Failed to get volume request ID from RTCPD"
22,AGGREGATOR_FAILED_TO_MARSHALL_RCP_JOB_REPLY_MESSAGE,"Failed to marshall RCP job reply message"
22,AGGREGATOR_FAILED_TO_MARSHALL_RTCOPY_JOB_REPLY_MESSAGE,"Failed to marshall remote-copy job reply message"
23,AGGREGATOR_SIGNALLED_NO_MORE_REQUESTS,"Signalled no more requests to RTCPD"
24,AGGREGATOR_FAILED_TO_COORDINATE_REMOTE_COPY,"Failed to coordinate remote copy"
25,AGGREGATOR_TRANSFER_FAILED,"Transfer failed"
......
castor/tape/aggregator/DriveAllocationProtocolEngine.cpp
+ 1
− 1
View file @ 35a0b9a4
......@@ -78,7 +78,7 @@ castor::tape::tapegateway::Volume
castor::dlf::Param("deviceGroupName", jobRequest.deviceGroupName),
castor::dlf::Param("driveUnit" , jobRequest.driveUnit )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_SYSTEM,
AGGREGATOR_SUBMITTING_JOB_TO_RTCPD, params);
AGGREGATOR_SUBMITTING_RTCOPY_JOB_TO_RTCPD, params);
}
legacymsg::RtcpJobReplyMsgBody rtcpdReply;
......
castor/tape/aggregator/RtcpTxRx.cpp
+ 11
− 11
View file @ 35a0b9a4
......@@ -338,11 +338,11 @@ void castor::tape::aggregator::RtcpTxRx::pingRtcpd(const Cuuid_t &cuuid,
header.lenOrStatus = 0;
try {
// The RTCPD message is a bodiless RTCP message
// The ping message is bodiless
totalLen = legacymsg::marshal(buf, header);
} catch(castor::exception::Exception &ex) {
TAPE_THROW_EX(castor::exception::Internal,
": Failed to marshal RCPD ping message : "
": Failed to marshal rtcpd ping message : "
<< ex.getMessage().str());
}
......@@ -359,7 +359,7 @@ void castor::tape::aggregator::RtcpTxRx::pingRtcpd(const Cuuid_t &cuuid,
net::writeBytes(socketFd, netReadWriteTimeout, totalLen, buf);
} catch(castor::exception::Exception &ex) {
TAPE_THROW_CODE(SECOMERR,
": Failed to send the RCPD ping message to RTCPD"
": Failed to send the rtcpd ping message"
": " << ex.getMessage().str());
}
......@@ -539,7 +539,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
legacymsg::RtcpJobRqstMsgBody &request) throw(castor::exception::Exception) {
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
AGGREGATOR_RECEIVE_RCP_JOB_RQST);
AGGREGATOR_RECEIVE_RTCOPY_JOB);
// Read in the message header
char headerBuf[3 * sizeof(uint32_t)]; // magic + request type + len
......@@ -547,7 +547,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
net::readBytes(socketFd, RTCPDNETRWTIMEOUT, sizeof(headerBuf), headerBuf);
} catch (castor::exception::Exception &ex) {
TAPE_THROW_CODE(SECOMERR,
": Failed to read message header from RCP job submitter"
": Failed to read message header from remote-copy job submitter"
<< ": " << ex.getMessage().str());
}
......@@ -559,7 +559,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
legacymsg::unmarshal(p, remainingLen, header);
} catch(castor::exception::Exception &ex) {
TAPE_THROW_CODE(EBADMSG,
": Failed to unmarshal message header from RCP job submitter"
": Failed to unmarshal message header from remote-copy job submitter"
": " << ex.getMessage().str());
}
......@@ -572,7 +572,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
// If the message body is too large
if(header.lenOrStatus > sizeof(bodyBuf)) {
TAPE_THROW_CODE(EMSGSIZE,
": Message body from RCP job submitter is too large"
": Message body from remote-copy job submitter is too large"
": Maximum: " << sizeof(bodyBuf)
<< ": Received: " << header.lenOrStatus);
}
......@@ -584,7 +584,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
const size_t minimumLen = 4 * sizeof(uint32_t) + 4;
if(header.lenOrStatus < minimumLen) {
TAPE_THROW_CODE(EMSGSIZE,
": Message body from RCP job submitter is too small"
": Message body from remote-copy job submitter is too small"
": Minimum: " << minimumLen
<< ": Received: " << header.lenOrStatus);
}
......@@ -595,7 +595,7 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
net::readBytes(socketFd, RTCPDNETRWTIMEOUT, header.lenOrStatus, bodyBuf);
} catch (castor::exception::Exception &ex) {
TAPE_THROW_CODE(EIO,
": Failed to read message body from RCP job submitter"
": Failed to read message body from remote-copy job submitter"
<< ": "<< ex.getMessage().str());
}
......@@ -606,12 +606,12 @@ void castor::tape::aggregator::RtcpTxRx::receiveRtcpJobRqst(const Cuuid_t &cuuid
legacymsg::unmarshal(p, remainingLen, request);
} catch(castor::exception::Exception &ex) {
TAPE_THROW_EX(castor::exception::Internal,
": Failed to unmarshal message body from RCP job submitter"
": Failed to unmarshal message body from remote-copy job submitter"
<< ": "<< ex.getMessage().str());
}
LogHelper::logMsgBody(cuuid, DLF_LVL_SYSTEM,
AGGREGATOR_RECEIVED_RCP_JOB_RQST, request.volReqId, socketFd, request);
AGGREGATOR_RECEIVED_RTCOPY_JOB, request.volReqId, socketFd, request);
}
//-----------------------------------------------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

imprint | privacy | Conditions of Use