Commit 9ce8dca3 authored by Eric Cano's avatar Eric Cano
Browse files

Fixed more slashes in paramter names (MB/s replaced by MBps) and put all tape...

Fixed more slashes in paramter names (MB/s replaced by MBps) and put all tape server stats in MB (as opposed to Mib).
parent 2f692d74
......@@ -163,8 +163,8 @@ void DiskReadTask::logWithStat(int level,const std::string& msg,log::LogContext&
.addTiming("waitReportingTime",m_stats.waitReportingTime)
.addTiming("checkingErrorTime",m_stats.checkingErrorTime)
.addTiming("openingTime",m_stats.openingTime)
.add("payloadTransferSpeedMB/s",
1.0*m_stats.dataVolume/1024/1024/m_stats.transferTime)
.add("payloadTransferSpeedMBps",
1.0*m_stats.dataVolume/1000/1000/m_stats.transferTime)
.add("FILEID",m_migratedFile->fileid())
.add("path",m_migratedFile->path());
lc.log(level,msg);
......
......@@ -130,9 +130,9 @@ void DiskReadThreadPool::logWithStat(int level, const std::string& message){
.addTiming("poolCheckingErrorTime",m_pooldStat.checkingErrorTime)
.addTiming("poolOpeningTime",m_pooldStat.openingTime)
.add("poolFileCount",m_pooldStat.filesCount)
.add("poolDataVolumeInMB", 1.0*m_pooldStat.dataVolume/1024/1024)
.add("Average_Pool_PayloadTransferSpeedMB/s",
1.0*m_pooldStat.dataVolume/1024/1024/m_pooldStat.transferTime);
.add("poolDataVolumeInMB", 1.0*m_pooldStat.dataVolume/1000/1000)
.add("AveragePoolPayloadTransferSpeedMBps",
1.0*m_pooldStat.dataVolume/1000/1000/m_pooldStat.transferTime);
m_lc.log(level,message);
}
//------------------------------------------------------------------------------
......@@ -178,9 +178,9 @@ logWithStat(int level, const std::string& message){
.addTiming("threadWaitFreeMemoryTime",m_threadStat.waitFreeMemoryTime)
.addTiming("threadCheckingErrorTime",m_threadStat.checkingErrorTime)
.addTiming("threadOpeningTime",m_threadStat.openingTime)
.add("threaDataVolumeInMB", 1.0*m_threadStat.dataVolume/1024/1024)
.add("threadPayloadTransferSpeedMB/s",
1.0*m_threadStat.dataVolume/1024/1024/m_threadStat.transferTime);
.add("threaDataVolumeInMB", 1.0*m_threadStat.dataVolume/1000/1000)
.add("threadPayloadTransferSpeedMBps",
1.0*m_threadStat.dataVolume/1000/1000/m_threadStat.transferTime);
m_lc.log(level,message);
}
}}}}
......
......@@ -199,8 +199,8 @@ void DiskWriteTask::logWithStat(int level,const std::string& msg,log::LogContext
.addTiming("checkingErrorTime",m_stats.checkingErrorTime)
.addTiming("openingTime",m_stats.openingTime)
.addTiming("closingTime",m_stats.closingTime)
.add("payloadTransferSpeedMB/s",
1.0*m_stats.dataVolume/1024/1024/m_stats.transferTime)
.add("payloadTransferSpeedMBps",
1.0*m_stats.dataVolume/1000/1000/m_stats.transferTime)
.add("FILEID",m_recallingFile->fileid())
.add("path",m_recallingFile->path());
lc.log(level,msg);
......
......@@ -124,8 +124,8 @@ void DiskWriteThreadPool::logWithStat(int level, const std::string& message){
.add("poolFileCount",m_pooldStat.filesCount)
.addTiming("poolClosingTime", m_pooldStat.closingTime)
.add("poolDataVolumeInMB", 1.0*m_pooldStat.dataVolume/1024/1024)
.add("poolPayloadTransferSpeedMB/s",
1.0*m_pooldStat.dataVolume/1024/1024/m_pooldStat.transferTime);
.add("poolPayloadTransferSpeedMBps",
1.0*m_pooldStat.dataVolume/1000/1000/m_pooldStat.transferTime);
m_lc.log(level,message);
}
//------------------------------------------------------------------------------
......@@ -189,8 +189,8 @@ logWithStat(int level, const std::string& msg) {
.addTiming("threadOpeningTime",m_threadStat.openingTime)
.addTiming("threadClosingTime", m_threadStat.closingTime)
.add("threaDataVolumeInMB", 1.0*m_threadStat.dataVolume/1024/1024)
.add("threadPayloadTransferSpeedMB/s",
1.0*m_threadStat.dataVolume/1024/1024/m_threadStat.transferTime);
.add("threadPayloadTransferSpeedMBps",
1.0*m_threadStat.dataVolume/1000/1000/m_threadStat.transferTime);
m_lc.log(level,msg);
}
}}}}
......
......@@ -133,12 +133,12 @@ public:
.addTiming("waitReportingTime",localStats.waitReportingTime)
.add("dataVolume",localStats.dataVolume)
.addTiming("totalTime", fileTime)
.add("driveTransferSpeedMiB/s",
.add("driveTransferSpeedMBps",
(localStats.dataVolume+localStats.headerVolume)
/1024/1024
/1000/1000
/localStats.transferTime)
.add("payloadTransferSpeedMB/s",
1.0*localStats.dataVolume/1024/1024/fileTime)
.add("payloadTransferSpeedMBps",
1.0*localStats.dataVolume/1000/1000/fileTime)
.add("fileid",m_fileToRecall->fileid())
.add("fseq",m_fileToRecall->fseq())
.add("fileTransactionId",m_fileToRecall->fileTransactionId());
......
......@@ -263,12 +263,12 @@ namespace daemon {
.add("dataVolume",m_taskStats.dataVolume)
.add("headerVolume",m_taskStats.headerVolume)
.addTiming("totalTime", fileTime)
.add("driveTransferSpeedMiB/s",
.add("driveTransferSpeedMBps",
(m_taskStats.dataVolume+m_taskStats.headerVolume)
/1024/1024
/1000/1000
/m_taskStats.transferTime)
.add("payloadTransferSpeedMB/s",
1.0*m_taskStats.dataVolume/1024/1024/fileTime)
.add("payloadTransferSpeedMBps",
1.0*m_taskStats.dataVolume/1000/1000/fileTime)
.add("fileSize",m_fileToMigrate->fileSize())
.add("fileid",m_fileToMigrate->fileid())
.add("fseq",m_fileToMigrate->fseq())
......
Markdown is supported
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