FTS-1451: Send is_archiving flag in monit complete messages

Author: joaopblopes

src/monitoring/msg-ifce.cpp

@@ -245,6 +245,7 @@ std::string MsgIfce::SendTransferFinishMessage(Producer &producer, const Transfe
     message["job_m_replica"] = json::Boolean(tr_completed.job_m_replica);
     message["job_multihop"] = json::Boolean(tr_completed.job_multihop);
     message["transfer_lasthop"] = json::Boolean(tr_completed.is_lasthop);
+    message["is_archiving"] = json::Boolean(tr_completed.is_archiving);
     message["job_state"] = json::String(tr_completed.job_state);
     message["is_recoverable"] = json::Boolean(tr_completed.is_recoverable);
     message["ipv6"] = json::Boolean(tr_completed.ipv6);

src/monitoring/msg-ifce.h

@@ -50,7 +50,7 @@ struct TransferCompleted
         srm_overhead_time_ms(0), srm_overhead_percentage(0),
         checksum_source_time_ms(0), checksum_dest_time_ms(0),
         retry(0), retry_max(0),
-        job_m_replica(false), job_multihop(false), is_lasthop(false),
+        job_m_replica(false), job_multihop(false), is_lasthop(false), is_archiving(false),
         is_recoverable(false), ipv6(false), eviction_code(-1)
     {}
 
@@ -119,6 +119,7 @@ struct TransferCompleted
     bool        job_m_replica;
     bool        job_multihop;
     bool        is_lasthop;
+    bool        is_archiving;
     std::string job_state;
     bool        is_recoverable;
     bool        ipv6;

src/server/services/transfers/UrlCopyCmd.cpp

@@ -221,7 +221,8 @@ void UrlCopyCmd::setFromTransfer(const TransferFile &transfer,
     setOption("job-id", transfer.jobId);
     setFlag("overwrite", transfer.overwriteFlag == "Y");
     if (transfer.archiveTimeout > 0) {
-        setFlag("dst-file-report", !transfer.dstFileReport.empty());   
+        setFlag("archiving", true);
+        setFlag("dst-file-report", !transfer.dstFileReport.empty());
     }
     setOption("dest-token-desc", transfer.destinationSpaceToken);
     setOption("source-token-desc", transfer.sourceSpaceToken);

src/url-copy/LegacyReporter.cpp

@@ -245,6 +245,7 @@ void LegacyReporter::sendTransferCompleted(const Transfer &transfer, Gfal2Transf
     completed.job_m_replica = transfer.isMultipleReplicaJob;
     completed.job_multihop = transfer.isMultihopJob;
     completed.is_lasthop = transfer.isLastHop;
+    completed.is_archiving = transfer.isArchiving;
     completed.srm_space_token_source = transfer.sourceTokenDescription;
     completed.srm_space_token_dest = transfer.destTokenDescription;
     completed.transfer_timeout = params.getTimeout();

src/url-copy/Transfer.h

@@ -117,6 +117,7 @@ class Transfer
     bool        isLastReplica;
     bool        isMultihopJob;
     bool        isLastHop;
+    bool        isArchiving;
 
     Checksum_mode checksumMode;
 

src/url-copy/UrlCopyOpts.cpp

@@ -40,6 +40,7 @@ const option UrlCopyOpts::long_options[] =
     {"last-replica",      no_argument,       0, 203},
     {"job-multihop",      no_argument,       0, 204},
     {"last-hop",          no_argument,       0, 205},
+    {"archiving",         no_argument,       0, 206},
 
     {"checksum",          required_argument, 0, 300},
     {"checksum-mode",     required_argument, 0, 301},
@@ -253,6 +254,9 @@ void UrlCopyOpts::parse(int argc, char * const argv[])
                 case 205:
                     referenceTransfer.isLastHop = true;
                     break;
+                case 206:
+                    referenceTransfer.isArchiving = true;
+                    break;
 
                 case 300:
                     setChecksum(referenceTransfer, optarg);