MGM: add callbacks to Converter job creation and add some logging whe…

…n callbacks are cancelled
cern-eos · Jan 8, 2025 · 2dc4492 · 2dc4492
1 parent facebae
commit 2dc4492
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/mgm/convert/ConversionJob.cc b/mgm/convert/ConversionJob.cc
@@ -366,6 +366,10 @@ void ConversionJob::DoIt() noexcept
     }
   }
 
+  if (mCallback) {
+    eos_static_info("[tpc]: notifying callback with 'cancel' after successfull tpc jobs");
+    mCallback->Cancel();
+  }
   return;
 }
 
@@ -389,6 +393,12 @@ void ConversionJob::HandleError(const std::string& emsg,
   }
 
   mStatus.store(Status::FAILED, std::memory_order_relaxed);
+
+  if (mCallback) {
+    eos_static_info("[tpc]: notifying callback with 'cancel' after error='%s' details-'%s'",
+    emsg.c_str(), details.c_str());
+    mCallback->Cancel();
+  }
 }
 
 //------------------------------------------------------------------------------

diff --git a/mgm/convert/ConverterDriver.cc b/mgm/convert/ConverterDriver.cc
@@ -143,7 +143,7 @@ ConverterDriver::Convert(ThreadAssistant& assistant) noexcept
     auto conversion_info = ConversionInfo::parseConversionString(std::get<1>(info));
 
     if (conversion_info != nullptr) {
-      auto job = std::make_shared<ConversionJob>(fid, *conversion_info.get());
+      auto job = std::make_shared<ConversionJob>(fid, *conversion_info.get(),std::get<2>(info));
       mThreadPool.PushTask<void>([ = ]() {
         job->DoIt();
         HandlePostJobRun(job);
@@ -249,7 +249,9 @@ bool
 ConverterDriver::QdbHelper::AddPendingJob(const JobInfoT& jobinfo)
 {
   try {
-    return mQHashPending.hset(std::to_string(std::get<0>(jobinfo)), std::get<1>(jobinfo));
+    bool hset = mQHashPending.hset(std::to_string(std::get<0>(jobinfo)), std::get<1>(jobinfo));
+    std::cerr << "hset: " << hset << std::endl;
+    return hset;
   } catch (const std::exception& e) {
     eos_static_crit("msg=\"Error encountered while trying to add pending "
                     "conversion job\" emsg=\"%s\" conversion_id=%s",