Commit a2b4d45e authored by Eric Cano's avatar Eric Cano
Browse files

Homogenized logs to only use TPVID, and not vid or VID.

parent 75acdda7
......@@ -242,7 +242,7 @@ castor::messages::Frame castor::acs::AcsMessageHandler::
const uint32_t panel = rqstBody.panel();
const uint32_t drive = rqstBody.drive();
log::Param params[] = {log::Param("vid", vid),
log::Param params[] = {log::Param("TPVID", vid),
log::Param("acs", acs),
log::Param("lsm", lsm),
log::Param("panel", panel),
......@@ -287,7 +287,7 @@ castor::messages::Frame castor::acs::AcsMessageHandler::
const uint32_t panel = rqstBody.panel();
const uint32_t drive = rqstBody.drive();
log::Param params[] = {log::Param("vid", vid),
log::Param params[] = {log::Param("TPVID", vid),
log::Param("acs", acs),
log::Param("lsm", lsm),
log::Param("panel", panel),
......@@ -332,7 +332,7 @@ castor::messages::Frame castor::acs::AcsMessageHandler::
const uint32_t panel = rqstBody.panel();
const uint32_t drive = rqstBody.drive();
log::Param params[] = {log::Param("vid", vid),
log::Param params[] = {log::Param("TPVID", vid),
log::Param("acs", acs),
log::Param("lsm", lsm),
log::Param("panel", panel),
......
......@@ -119,7 +119,7 @@ void castor::acs::AcsPendingRequests::handleCompletedRequests() {
itor != m_acsRequestList.end();itor++) {
AcsRequest *const acsRequest = *itor;
if (acsRequest->isCompleted()) {
log::Param params[] = {log::Param("vid", acsRequest->getVid()),
log::Param params[] = {log::Param("TPVID", acsRequest->getVid()),
log::Param("acs", acsRequest->getAcs()),
log::Param("lsm", acsRequest->getLsm()),
log::Param("panel", acsRequest->getPanel()),
......@@ -141,7 +141,7 @@ void castor::acs::AcsPendingRequests::handleFailedRequests() {
itor != m_acsRequestList.end();itor++) {
AcsRequest *const acsRequest = *itor;
if (acsRequest->isFailed()) {
log::Param params[] = {log::Param("vid", acsRequest->getVid()),
log::Param params[] = {log::Param("TPVID", acsRequest->getVid()),
log::Param("acs", acsRequest->getAcs()),
log::Param("lsm", acsRequest->getLsm()),
log::Param("panel", acsRequest->getPanel()),
......@@ -225,7 +225,7 @@ void castor::acs::AcsPendingRequests::checkAndAddRequestDismountTape(
checkRequest(vid, acs, lsm, panel, drive);
log::Param params[] = {log::Param("vid", vid),
log::Param params[] = {log::Param("TPVID", vid),
log::Param("acs", acs),
log::Param("lsm", lsm),
log::Param("panel", panel),
......
......@@ -45,7 +45,7 @@ namespace unitTests {
// Test that we do not allow duplicate params
LogContext::ScopedParam sp(lc, Param("NSFILEID", 123456));
ASSERT_EQ(2U, lc.size());
LogContext::ScopedParam sp2(lc, Param("VID", "T1234"));
LogContext::ScopedParam sp2(lc, Param("TPVID", "T1234"));
ASSERT_EQ(3U, lc.size());
}
}
......
......@@ -168,7 +168,7 @@ void castor::tape::tapegateway::TapeMigrationMountLinkerThread::run(void*)
} catch (castor::exception::Exception &e) {
castor::dlf::Param params2[] = {
castor::dlf::Param("MigrationMountId", item->migrationMountId),
castor::dlf::Param("VID", vidToUse),
castor::dlf::Param("TPVID", vidToUse),
castor::dlf::Param("TapePool", item->tapePoolName),
castor::dlf::Param("errorCode", sstrerror(e.code())),
castor::dlf::Param("errorMessage", e.getMessage().str())
......@@ -181,7 +181,7 @@ void castor::tape::tapegateway::TapeMigrationMountLinkerThread::run(void*)
castor::dlf::Param("TapePool", item->tapePoolName),
castor::dlf::Param("errorCode", sstrerror(e.code())),
castor::dlf::Param("errorMessage", e.getMessage().str()),
castor::dlf::Param("VID", vidToUse)
castor::dlf::Param("TPVID", vidToUse)
};
castor::dlf::dlf_writep(nullCuuid, DLF_LVL_CRIT, LINKER_VMGR_NS_DISCREPANCY, params2);
// Abort.
......
......@@ -135,7 +135,7 @@ void castor::tape::tapegateway::VdqmRequestsCheckerThread::run(void*)
try {
VmgrTapeGatewayHelper::resetBusyTape(*tapeToReset, m_shuttingDown);
castor::dlf::Param params[] =
{castor::dlf::Param("VID", *tapeToReset)};
{castor::dlf::Param("TPVID", *tapeToReset)};
castor::dlf::dlf_writep(nullCuuid,DLF_LVL_SYSTEM, CHECKER_RELEASING_UNUSED_TAPE, params);
} catch (castor::exception::Exception& e){
castor::dlf::Param params[] = {
......
......@@ -116,7 +116,7 @@ bool castor::tape::tapegateway::VdqmRequestsProducerThread::getTapeToHandle
} else {
// We have something to do, log "found tape to submit"
castor::dlf::Param params[] = {
castor::dlf::Param("VID", vid),
castor::dlf::Param("TPVID", vid),
castor::dlf::Param("vdqmPriority", vdqmPriority),
castor::dlf::Param("mode", mode==WRITE_ENABLE?"WRITE_ENABLE":"WRITE_DISABLE"),
castor::dlf::Param("ProcessingTime", timer.secs())
......
......@@ -303,7 +303,7 @@ castor::tape::tapegateway::VmgrTapeGatewayHelper::getTapeInfo
throw ex;
}
castor::dlf::Param params[] = {
castor::dlf::Param("VID", vid),
castor::dlf::Param("TPVID", vid),
castor::dlf::Param("serrno",save_serrno)};
castor::dlf::dlf_writep(nullCuuid, DLF_LVL_WARNING, VMGR_GATEWAY_HELPER_RETRYING, params);
sleep(5);
......
......@@ -290,7 +290,7 @@ void castor::tape::tapeserver::daemon::CatalogueTransferSession::
checkUserCanRecallFromTape(const std::string &vid) {
std::list<log::Param> params;
params.push_back(log::Param("vid", vid));
params.push_back(log::Param("TPVID", vid));
params.push_back(log::Param("clientEuid", m_vdqmJob.clientEuid));
params.push_back(log::Param("clientEgid", m_vdqmJob.clientEgid));
......@@ -364,7 +364,7 @@ void castor::tape::tapeserver::daemon::CatalogueTransferSession::
checkUserCanMigrateToTape(const std::string &vid) {
std::list<log::Param> params;
params.push_back(log::Param("vid", vid));
params.push_back(log::Param("TPVID", vid));
params.push_back(log::Param("clientEuid", m_vdqmJob.clientEuid));
params.push_back(log::Param("clientEgid", m_vdqmJob.clientEgid));
......
......@@ -91,16 +91,16 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
drive->readExactBlock((void * )&vol1, sizeof(vol1), "[CleanerSession::clean()] - Reading header VOL1");
vol1.verify();
if(m_vid.empty()) { // vid given is empty
log::Param params[] = {log::Param("vid", m_vid)};
log::Param params[] = {log::Param("TPVID", m_vid)};
m_log(LOG_INFO, "Cleaner session received an empty vid.", params);
}
else if(!(m_vid.compare(vol1.getVSN()))) { // vid provided and vid read on VOL1 correspond
log::Param params[] = {log::Param("vid", m_vid)};
log::Param params[] = {log::Param("TPVID", m_vid)};
m_log(LOG_INFO, "Cleaner session received the same vid read on tape.", params);
}
else { // vid provided and vid read on VOL1 don NOT correspond!
log::Param params[] = {log::Param("vid provided", m_vid), log::Param("vid read on label", vol1.getVSN())};
m_log(LOG_WARNING, "Cleaner session received a different vid from the one read on tape.", params);
log::Param params[] = {log::Param("TPVID provided", m_vid), log::Param("TPVID read on label", vol1.getVSN())};
m_log(LOG_WARNING, "Cleaner session received a different TPVID from the one read on tape.", params);
}
} catch(castor::exception::Exception &ne) {
castor::exception::Exception ex;
......
......@@ -251,7 +251,7 @@ void castor::tape::tapeserver::daemon::LabelCmdConnectionHandler::
const throw() {
log::Param params[] = {
log::Param("drive", job.drive),
log::Param("vid", job.vid),
log::Param("TPVID", job.vid),
log::Param("dgn", job.dgn),
log::Param("uid", job.uid),
log::Param("gid", job.gid)};
......
......@@ -78,7 +78,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
log::Param params[] = {
log::Param("uid", m_request.uid),
log::Param("gid", m_request.gid),
log::Param("vid", m_request.vid),
log::Param("TPVID", m_request.vid),
log::Param("drive", m_request.drive),
log::Param("dgn", m_request.dgn)};
......@@ -148,7 +148,7 @@ void castor::tape::tapeserver::daemon::LabelSession::mountTape() {
if(mediachanger::TAPE_LIBRARY_TYPE_MANUAL !=
m_driveConfig.librarySlot.getLibraryType()) {
const log::Param params[] = {
log::Param("vid", m_request.vid),
log::Param("TPVID", m_request.vid),
log::Param("unitName", m_request.drive),
log::Param("librarySlot", m_driveConfig.librarySlot.str())};
m_log(LOG_INFO, "Tape successfully mounted for labeling", params);
......@@ -169,7 +169,7 @@ void castor::tape::tapeserver::daemon::LabelSession::waitUntilTapeLoaded(
try {
drive->waitUntilReady(timeoutSecond);
const log::Param params[] = {
log::Param("vid", m_request.vid),
log::Param("TPVID", m_request.vid),
log::Param("unitName", m_request.drive),
log::Param("librarySlot", m_driveConfig.librarySlot.str())};
m_log(LOG_INFO, "Tape to be labelled has been mounted", params);
......@@ -192,7 +192,7 @@ void castor::tape::tapeserver::daemon::LabelSession::checkTapeIsWritable(
throw ex;
}
const log::Param params[] = {
log::Param("vid", m_request.vid),
log::Param("TPVID", m_request.vid),
log::Param("unitName", m_request.drive),
log::Param("librarySlot", m_driveConfig.librarySlot.str())};
m_log(LOG_INFO, "Tape to be labelled is writable", params);
......
......@@ -288,7 +288,7 @@ castor::tape::tapeserver::daemon::ProcessForker::MsgHandlerResult
// Log the contents of the incomming request
std::list<log::Param> params;
params.push_back(log::Param("unitName", rqst.unitname()));
params.push_back(log::Param("vid", rqst.vid()));
params.push_back(log::Param("TPVID", rqst.vid()));
params.push_back(log::Param("driveReadyDelayInSeconds",
rqst.drivereadydelayinseconds()));
m_log(LOG_INFO, "ProcessForker handling ForkCleaner message", params);
......@@ -397,7 +397,7 @@ castor::tape::tapeserver::daemon::ProcessForker::MsgHandlerResult
// Log the contents of the incomming request
std::list<log::Param> params;
params.push_back(log::Param("unitName", rqst.unitname()));
params.push_back(log::Param("vid", rqst.vid()));
params.push_back(log::Param("TPVID", rqst.vid()));
m_log(LOG_INFO, "ProcessForker handling ForkLabel message", params);
// Fork a label session
......@@ -468,7 +468,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
const utils::DriveConfig driveConfig = getDriveConfig(rqst);
std::list<log::Param> params;
params.push_back(log::Param("unitName", driveConfig.unitName));
params.push_back(log::Param("vid", rqst.vid()));
params.push_back(log::Param("TPVID", rqst.vid()));
m_log(LOG_INFO, "Cleaner-session child-process started", params);
const int sizeOfIOThreadPoolForZMQ = 1;
......@@ -844,7 +844,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
std::list<log::Param> params;
params.push_back(log::Param("unitName", driveConfig.unitName));
params.push_back(log::Param("vid", labelJob.vid));
params.push_back(log::Param("TPVID", labelJob.vid));
m_log(LOG_INFO, "Label-session child-process started", params);
const int sizeOfIOThreadPoolForZMQ = 1;
......
......@@ -1148,7 +1148,7 @@ void castor::tape::tapeserver::daemon::TapeDaemon::notifyVdqmTapeUnmounted(
std::list<log::Param> params;
params.push_back(log::Param("pid", pid));
params.push_back(log::Param("unitName", driveConfig.unitName));
params.push_back(log::Param("vid", vid));
params.push_back(log::Param("TPVID", vid));
params.push_back(log::Param("dgn", driveConfig.dgn));
m_vdqm.tapeUnmounted(m_hostName, driveConfig.unitName, driveConfig.dgn,
......
......@@ -235,7 +235,7 @@ void castor::tape::tapeserver::daemon::TapeReadSingleThread::run() {
void castor::tape::tapeserver::daemon::TapeReadSingleThread::logWithStat(
int level, const std::string& msg, log::ScopedParamContainer& params) {
params.add("type", "read")
.add("VID", m_volInfo.vid)
.add("TPVID", m_volInfo.vid)
.add("mountTime", m_stats.mountTime)
.add("positionTime", m_stats.positionTime)
.add("waitInstructionsTime", m_stats.waitInstructionsTime)
......
......@@ -158,7 +158,8 @@ TapeServerReporter::TapeServerReporter(
void TapeServerReporter::ReportGotReadDetailsFromClient::execute(
TapeServerReporter& parent){
log::ScopedParamContainer sp(parent.m_lc);
sp.add(parent.m_unitName, "unitName").add(parent.m_volume.vid, "vid");
sp.add("unitName", parent.m_unitName)
.add("TPVID", parent.m_volume.vid);
switch(parent.m_volume.clientType) {
case tapegateway::TAPE_GATEWAY:
......
......@@ -112,7 +112,7 @@ protected:
*/
void mountTapeReadOnly(){
castor::log::ScopedParamContainer scoped(m_logContext);
scoped.add("vid",m_volInfo.vid)
scoped.add("TPVID",m_volInfo.vid)
.add("drive_Slot",m_drive.librarySlot.str());
try {
castor::utils::Timer timer;
......@@ -138,7 +138,7 @@ protected:
*/
void mountTapeReadWrite(){
castor::log::ScopedParamContainer scoped(m_logContext);
scoped.add("vid",m_volInfo.vid)
scoped.add("TPVID",m_volInfo.vid)
.add("drive_Slot",m_drive.librarySlot.str());
try {
castor::utils::Timer timer;
......
......@@ -61,7 +61,7 @@ castor::tape::tapeserver::daemon::TapeWriteSingleThread::openWriteSession() {
std::auto_ptr<castor::tape::tapeFile::WriteSession> writeSession;
ScopedParam sp[]={
ScopedParam(m_logContext, Param("vid",m_vid)),
ScopedParam(m_logContext, Param("TPVID",m_vid)),
ScopedParam(m_logContext, Param("lastFseq", m_lastFseq)),
ScopedParam(m_logContext, Param("compression", m_compress))
};
......@@ -268,7 +268,7 @@ void castor::tape::tapeserver::daemon::TapeWriteSingleThread::run() {
void castor::tape::tapeserver::daemon::TapeWriteSingleThread::logWithStats(
int level,const std::string& msg, log::ScopedParamContainer& params){
params.add("type", "write")
.add("VID", m_volInfo.vid)
.add("TPVID", m_volInfo.vid)
.add("mountTime", m_stats.mountTime)
.add("positionTime", m_stats.positionTime)
.add("waitInstructionsTime", m_stats.waitInstructionsTime)
......
......@@ -533,7 +533,7 @@ void castor::vdqm::handler::TapeDriveStatusHandler::handleUnitReleaseStatus()
if(volPriorityId != 0) { // A delete took place
castor::dlf::Param param[] = {
castor::dlf::Param("volPriorityId", volPriorityId),
castor::dlf::Param("vid" , finishedTapeRequestVid),
castor::dlf::Param("TPVID" , finishedTapeRequestVid),
castor::dlf::Param("tpMode" , finishedTapeRequestTpMode),
castor::dlf::Param("lifespanType" , 0),
castor::dlf::Param("priority" , priority),
......@@ -546,7 +546,7 @@ void castor::vdqm::handler::TapeDriveStatusHandler::handleUnitReleaseStatus()
// Else no delete took place
} else {
castor::dlf::Param param[] = {
castor::dlf::Param("vid" , finishedTapeRequestVid),
castor::dlf::Param("TPVID" , finishedTapeRequestVid),
castor::dlf::Param("tpMode" , finishedTapeRequestTpMode),
castor::dlf::Param("lifespanType", 0)};
castor::dlf::dlf_writep(m_cuuid, DLF_LVL_DEBUG,
......
......@@ -37,7 +37,7 @@ void castor::vdqm::handler::VdqmMagic2RequestHandler::handleVolPriority(
castor::dlf::Param("clientUID" , msg.clientUID),
castor::dlf::Param("clientGID" , msg.clientGID),
castor::dlf::Param("clientHost" , msg.clientHost),
castor::dlf::Param("vid" , msg.vid),
castor::dlf::Param("TPVID" , msg.vid),
castor::dlf::Param("tpMode" , msg.tpMode),
castor::dlf::Param("lifespanType", msg.lifespanType)};
castor::dlf::dlf_writep(cuuid, DLF_LVL_SYSTEM,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment