Fixed asset names and task workign directory

FairRootGroup · Apr 11, 2022 · c432ef2 · c432ef2
1 parent a91eba0
commit c432ef2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -5,6 +5,7 @@
 ### DDS common
 Fixed: On task done remove agents from the agent to tasks mapping.    
 Fixed: Replace std::iterator as it's deprecated (C++17).    
+Fixed: Tasks working directory is set to their slot directory instead of $DDS_LOCATION.    
 Added: every DDS module logs now its pid, group id and parent pid. (GH-403)    
 Added: Support for Task Assets. (GH-406)    
 

diff --git a/dds-agent/src/CommanderChannel.cpp b/dds-agent/src/CommanderChannel.cpp
@@ -511,7 +511,7 @@ bool CCommanderChannel::on_cmdASSIGN_USER_TASK(SCommandAttachmentImpl<cmdASSIGN_
     for (const auto& asset : assets)
     {
         stringstream assetFileName;
-        assetFileName << asset->getName() << "_" << task->getName() << ".asset";
+        assetFileName << asset->getName() << ".asset";
         fs::path pathAsset(dir);
         pathAsset /= assetFileName.str();
 

diff --git a/etc/dds_user_task_wrapper.sh.in b/etc/dds_user_task_wrapper.sh.in
@@ -17,6 +17,9 @@ fi
 
 # %DDS_USER_ENVIRONMENT%
 
+# Change the task working dir
+cd "$(dirname "$0")"
+
 # Run user process in background to prevent propogation of the signals
 # Otherwise user task will catch the signals sent to the wrapper
 # %DDS_USER_TASK% &