refactor: Move TaskInstance:GetTaskEnvMap to Supervisor, remove code …

…in Craned Signed-off-by: Li Junlin <xiafeng.li@foxmail.com>
PKUHPC · Dec 24, 2024 · ba3cc54 · ba3cc54
1 parent 96ddb45
commit ba3cc54
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 223 deletions.
diff --git a/src/Craned/Craned/CMakeLists.txt b/src/Craned/Craned/CMakeLists.txt
@@ -3,8 +3,8 @@ add_executable(craned
         CtldClient.cpp
         CgroupManager.h
         CgroupManager.cpp
-        JobManager.h
-        JobManager.cpp
+        TaskManager.h
+        TaskManager.cpp
         CranedServer.h
         CranedServer.cpp
         CranedPublicDefs.h

diff --git a/src/Craned/Craned/Craned.cpp b/src/Craned/Craned/Craned.cpp
@@ -29,7 +29,7 @@
 #include "CranedServer.h"
 #include "CtldClient.h"
 #include "DeviceManager.h"
-#include "JobManager.h"
+#include "TaskManager.h"
 #include "crane/PluginClient.h"
 #include "crane/String.h"
 
@@ -617,7 +617,7 @@ void GlobalVariableInit() {
   g_thread_pool =
       std::make_unique<BS::thread_pool>(std::thread::hardware_concurrency());
 
-  g_job_mgr = std::make_unique<Craned::JobManager>();
+  g_job_mgr = std::make_unique<Craned::TaskManager>();
 
   g_ctld_client = std::make_unique<Craned::CtldClient>();
   g_ctld_client->SetCranedId(g_config.CranedIdOfThisNode);

diff --git a/src/Craned/Craned/CranedServer.cpp b/src/Craned/Craned/CranedServer.cpp
@@ -20,7 +20,7 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include "JobManager.h"
+#include "TaskManager.h"
 
 namespace Craned {