Commit fbcaa02c authored by Cedric CAFFY's avatar Cedric CAFFY
Browse files

Removed TID of the name of object addresses

Added microseconds after the creation time of the object (Agent Reference)
parent 4a9c7a6b
......@@ -28,18 +28,18 @@
\node [above, font=\bfseries] (b_title) {User Retrieve Request workflow};
\node [block, below of=b_title, text width=15em] (b_init) {Submission of the Retrieve Request by the user};
\node [block, below of=b_init, text width=15em] (b_statusTTFU) {Status RJS\_ToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueRQTTFU) {Queue in RetrieveQueueToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueRQTTFU) {Queue in RetrieveQueueToTransferForUser (by vid)};
\node [decision, below of=b_queueRQTTFU] (d_transferSucceeded) {Transfer succeeded ?};
\node [block, right of=d_transferSucceeded, node distance = 4cm] (b_requestDeleted) {Delete request};
\node [endCircle, right of=b_requestDeleted, node distance = 2.5cm] (cir_end1) {};
\node [block, below of=d_transferSucceeded, node distance = 2.5cm, text width=15em] (b_addTransferFailure) {Add transfer failure stats to Retrieve Job};
\node [decision, below of=b_addTransferFailure, text width = 6em, node distance = 2.7cm] (d_nbRetrieveRetries) {Number of retries {\textgreater =} max retries ?};
\node [block, below of=d_nbRetrieveRetries, node distance = 2.5cm] (b_statusFailed) {Status RJS\_Failed};
\node [block, below of=b_statusFailed, text width = 15em] (b_queueRQTRFU) {Queue in RetrieveQueueToReportForUser};
\node [block, below of=b_statusFailed, text width = 15em] (b_queueRQTRFU) {Queue in RetrieveQueueToReportForUser (by vid)};
\node [block, below of=b_queueRQTRFU] (b_reportFailureEOS) {Report failure to EOS};
\node [decision, below of=b_reportFailureEOS] (d_reportSucceeded) {Report succeeded ?};
\node [block, right of=d_reportSucceeded, node distance = 4cm] (b_garbageCollect) {Garbage collect the Retrieve Request};
\node [block, right of=b_garbageCollect, node distance = 4cm] (b_queueRQF) {Queue in RetrieveQueueFailed};
\node [block, right of=b_garbageCollect, node distance = 4cm] (b_queueRQF) {Queue in RetrieveQueueFailed (by vid)};
\node [decision, below of=d_reportSucceeded, node distance = 4cm] (d_nbReportRetries) {Number of report retries {\textgreater =} max retries ?};
\node [block, right of=d_nbReportRetries, node distance = 4cm] (b_statusFailed2) {Status RJS\_Failed};
\node [block, left of=d_nbReportRetries, node distance = 4cm] (b_statusTRTUFF) {{Status RJS\_ToReport ToUserForFailure}};
......@@ -75,16 +75,17 @@
\node [above, font=\bfseries] (b_title) {Repack Retrieve Request workflow};
\node [block, below of=b_title, text width=15em] (b_init) {Retrieve subrequest created from the Repack Request expansion};
\node [block, below of=b_init, text width=15em] (b_statusTTFU) {Status RJS\_ToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueRQTTFU) {Queue in RetrieveQueueToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueRQTTFU) {Queue in RetrieveQueueToTransferForUser (by vid)};
\node [decision, below of=b_queueRQTTFU] (d_transferSucceeded) {Transfer succeeded ?};
\node [block, right of=d_transferSucceeded, node distance = 5cm, text width=15em] (b_queueInRQTRTRFS) {Queue in RetrieveQueueToReportToRepackForSuccess};
\node [block, right of=b_queueInRQTRTRFS,node distance = 5cm] (b_updateRepackRequestSuccess) {Update the Repack Request metadata with the success};
\node [block, right of=d_transferSucceeded, node distance = 7cm, text width=15em] (b_statusTRTRFS) {Status RJS\_ToReportTo-RepackForSuccess};
\node [block, below of=b_statusTRTRFS, node distance = 2cm, text width=15em] (b_queueInRQTRTRFS) {Queue in RetrieveQueueToReportToRepackForSuccess (by Repack Request address)};
\node [block, below of=b_queueInRQTRTRFS,node distance = 3cm] (b_updateRepackRequestSuccess) {Update the Repack Request metadata with the success};
\node [block, below of=b_updateRepackRequestSuccess,node distance = 3cm] (b_transformedIntoArchive) {Retrieve Request transformed into Archive Request};
\node [endCircle, below of=b_transformedIntoArchive, node distance = 2cm] (cir_end1) {};
\node [block, below of=d_transferSucceeded, node distance = 2.5cm, text width=15em] (b_addTransferFailure) {Add transfer failure stats to Retrieve Job};
\node [decision, below of=b_addTransferFailure, text width = 6em, node distance = 2.7cm] (d_nbRetrieveRetries) {Number of retries {\textgreater =} max retries ?};
\node [block, below of=d_nbRetrieveRetries, node distance = 2.7cm, text width = 15em] (b_statusTRTRFF) {Status RJS\_ToReport-ToRepackForFailure};
\node [block, below of=b_statusTRTRFF, text width = 15em, node distance = 2cm] (b_queueRQTRFU) {Queue in RetrieveQueueToReportToRepackForFailure};
\node [block, below of=b_statusTRTRFF, text width = 15em, node distance = 2cm] (b_queueRQTRFU) {Queue in RetrieveQueueToReportToRepackForFailure (by Repack Request address};
\node [block, below of=b_queueRQTRFU, node distance = 2cm, text width = 15em] (b_updateRepackRequestFailures) {Update the repack request metadata with the failure};
\node [block, below of=b_updateRepackRequestFailures, node distance = 2cm, text width = 15em] (b_deleteRetrieveSubrequest) {Delete the failed retrieve subrequest};
\node [endCircle, below of=b_deleteRetrieveSubrequest, node distance = 1.5cm] (cir_end2) {};
......@@ -92,8 +93,9 @@
\path [line] (b_init) -- (b_statusTTFU);
\path [line] (b_statusTTFU) -- (b_queueRQTTFU);
\path [line] (b_queueRQTTFU) -- node [right, color=black] {Pop + Retrieve in progress}(d_transferSucceeded);
\path [line] (d_transferSucceeded) -- node [above] {yes} (b_queueInRQTRTRFS);
\path [line] (b_queueInRQTRTRFS) -- node [above] {pop} (b_updateRepackRequestSuccess);
\path [line] (d_transferSucceeded) -- node [above] {yes} (b_statusTRTRFS);
\path [line] (b_statusTRTRFS) -- (b_queueInRQTRTRFS);
\path [line] (b_queueInRQTRTRFS) -- node [right] {pop} (b_updateRepackRequestSuccess);
\path [line] (b_updateRepackRequestSuccess) -- (b_transformedIntoArchive);
\path [line] (b_transformedIntoArchive) -- (cir_end1);
\path [line] (d_transferSucceeded) -- node [right] {no} (b_addTransferFailure);
......@@ -115,10 +117,10 @@
\node [above, font=\bfseries] (b_title) {User Archive Request workflow};
\node [block, below of=b_title, text width=15em] (b_init) {Submission of the Archive Request by the user};
\node [block, below of=b_init, text width=15em] (b_statusTTFU) {Status AJS\_ToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueAQTTFU) {Queue in ArchiveQueueToTransferForUser};
\node [block, below of=b_statusTTFU, text width=15em] (b_queueAQTTFU) {Queue in ArchiveQueueToTransferForUser (by tapepool)};
\node [decision, below of=b_queueAQTTFU] (d_transferSucceeded) {Transfer succeeded ?};
\node [block, right of=d_transferSucceeded, text width=15em,node distance = 7cm] (b_statusTRTUFT) {Status AJS\_ToReport-ToUserForTransfer};
\node [block, below of=b_statusTRTUFT, text width=15em] (b_queueInAQTRFU) {Queue in ArchiveQueueToReportForUser};
\node [block, below of=b_statusTRTUFT, text width=15em] (b_queueInAQTRFU) {Queue in ArchiveQueueToReportForUser (by tapepool)};
\node [block, below of=b_queueInAQTRFU, text width=15em] (b_reportJobToEOS) {Report job success/failure to EOS};
\node [decision, below of=b_reportJobToEOS] (d_reportSucceeded) {Report succeeded ?};
\node [block, below of=d_reportSucceeded, text width=15em, node distance = 2.5cm] (b_addReportFailureStats) {Add report failure stats to Archive Request};
......@@ -128,7 +130,7 @@
\node [block, below of=d_reportSucceeded, text width=15em, node distance = 2.5cm] (b_addReportFailureStats) {Add report failure stats to Archive Request};
\node [decision, below of=b_addReportFailureStats] (d_maxReportRetries) {Number of retries {\textgreater =} max retries ?};
\node [block, below of=d_maxReportRetries,node distance=2.8cm, text width=15em] (b_statusFailed) {Status AJS\_Failed};
\node [block, below of=b_statusFailed, text width=15em] (b_queueAQF) {Queue in ArchiveQueueFailed};
\node [block, below of=b_statusFailed, text width=15em] (b_queueAQF) {Queue in ArchiveQueueFailed (by tapepool)};
\node [endCircle, below of=b_queueAQF] (cir_end2) {};
\node [decision, below of=b_addTransferFailure] (d_maxTransferRetries) {Number of retries {\textgreater =} max retries ?};
\node [block, below of=d_maxTransferRetries, text width=15em, node distance = 3cm] (b_statusTRTUFF) {Status AJS\_ToReport-ToUserForFailure};
......@@ -193,8 +195,8 @@
\path [line] (d_maxTransferRetries) |- node [right]{no} (b_queueAQTTFR);
\path [line] (d_maxTransferRetries) -- node [right]{yes} (b_StatusTRTRFF);
\path [line] (b_StatusTRTRFF) -- (b_queueAQTRTRFF);
\path [line] (b_queueAQTRTRFF) |- (b_updateRepackMetadata);
\path [line] (b_queueAQTRTRFS) |- (b_updateRepackMetadata);
\path [line] (b_queueAQTRTRFF) |- node [right] {pop} (b_updateRepackMetadata);
\path [line] (b_queueAQTRTRFS) |- node [left] {pop} (b_updateRepackMetadata);
\path [line] (b_updateRepackMetadata) -- (b_deleteArchiveJob2);
\path [line] (b_deleteArchiveJob2) |- (cir_end2);
\end {tikzpicture}
......
......@@ -25,6 +25,7 @@
#include <sstream>
#include <unistd.h>
#include <sys/syscall.h>
#include <sys/time.h>
#include <iomanip>
namespace cta { namespace objectstore {
......@@ -36,7 +37,9 @@ m_logger(logger) {
m_nextId=0;
std::stringstream aid;
// Get time
time_t now = time(0);
struct timeval tv;
::gettimeofday(&tv,NULL);
time_t now = tv.tv_sec;
struct tm localNow;
localtime_r(&now, &localNow);
// Get hostname
......@@ -52,7 +55,8 @@ m_logger(logger) {
<< std::setw(2) << localNow.tm_mday << "-"
<< std::setw(2) << localNow.tm_hour << ":"
<< std::setw(2) << localNow.tm_min << ":"
<< std::setw(2) << localNow.tm_sec << "-"
<< std::setw(2) << localNow.tm_sec << ":"
<< tv.tv_usec << "-"
<< id;
m_agentAddress = aid.str();
// Initialize the serialization token for queued actions (lock will make helgrind
......
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