Update task.

Signed-off-by: Klaus Ma <[email protected]>
flame-sh · Jan 11, 2024 · d4ed288 · d4ed288
1 parent b7c79b8
commit d4ed288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 42 deletions.
diff --git a/common/src/apis.rs b/common/src/apis.rs
@@ -166,7 +166,7 @@ impl Session {
         self.status.state == SessionState::Closed
     }
 
-    pub fn add_task(&mut self, task: &Task) {
+    pub fn update_task(&mut self, task: &Task) {
         let task_ptr = TaskPtr::new(task.clone().into());
 
         self.tasks.insert(task.id, task_ptr.clone());
@@ -185,43 +185,6 @@ impl Session {
 
         None
     }
-
-    // pub fn update_task_state(
-    //     &mut self,
-    //     task_ptr: TaskPtr,
-    //     state: TaskState,
-    // ) -> Result<(), FlameError> {
-    //     let mut task = lock_ptr!(task_ptr)?;
-    //     match self.tasks_index.get_mut(&task.state) {
-    //         None => {
-    //             log::error!(
-    //                 "Failed to find task <{}> in state map <{}>.",
-    //                 task.id,
-    //                 task.state.to_string()
-    //             );
-
-    //             return Err(FlameError::NotFound(format!(
-    //                 "task <{}> in state map <{}>",
-    //                 task.id, task.state
-    //             )));
-    //         }
-
-    //         Some(index) => {
-    //             index.remove(&task.id);
-    //         }
-    //     }
-
-    //     self.tasks.remove(&task.id);
-
-    //     task.state = state;
-    //     // Also set completion time.
-    //     if state == TaskState::Succeed || state == TaskState::Failed {
-    //         task.completion_time = Some(Utc::now());
-    //     }
-    //     self.add_task(&task);
-
-    //     Ok(())
-    // }
 }
 
 impl Clone for Session {
@@ -241,7 +204,7 @@ impl Clone for Session {
         for (id, t) in &self.tasks {
             match t.lock() {
                 Ok(t) => {
-                    ssn.add_task(&t);
+                    ssn.update_task(&t);
                 }
                 Err(_) => {
                     log::error!("Failed to lock task: <{}>, ignore it during clone.", id);

diff --git a/session_manager/src/storage/mod.rs b/session_manager/src/storage/mod.rs
@@ -90,7 +90,7 @@ impl Storage {
             let task_list = self.engine.find_tasks(ssn.id).await?;
             let mut ssn = ssn.clone();
             for task in task_list {
-                ssn.add_task(&task);
+                ssn.update_task(&task);
             }
 
             let mut ssn_map = lock_ptr!(self.sessions)?;
@@ -184,7 +184,7 @@ impl Storage {
 
         let ssn = self.get_session_ptr(ssn_id)?;
         let mut ssn = lock_ptr!(ssn)?;
-        ssn.add_task(&task);
+        ssn.update_task(&task);
 
         Ok(task)
     }
@@ -225,7 +225,7 @@ impl Storage {
         let task = self.engine.update_task_state(gid, state).await?;
 
         let mut ssn_ptr = lock_ptr!(ssn)?;
-        ssn_ptr.add_task(&task);
+        ssn_ptr.update_task(&task);
 
         Ok(())
     }