From c78e7f614b2e6bb369787556843fb2689449031e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Czern=C3=BD?= <pczerny@opennebula.systems>
Date: Wed, 19 Oct 2022 09:35:47 +0200
Subject: [PATCH] B #5950: Fix RETIME one onevm recover --delete (#2267)

(cherry picked from commit 28924db84ba7b0f6c78e2ab754c4390b0c86aac3)
---
 src/dm/DispatchManagerActions.cc | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index 210d9ca7ca..aeb6841e5d 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -320,11 +320,27 @@ void DispatchManager::free_vm_resources(unique_ptr<VirtualMachine> vm,
 
     vm->set_exit_time(time(0));
 
-    if (vm->hasHistory() && vm->get_etime() == 0)
+    if (vm->hasHistory())
     {
-        vm->set_etime(time(0));
+        bool update_history = false;
 
-        vmpool->update_history(vm.get());
+        if (vm->get_running_stime() != 0 && vm->get_running_etime() == 0)
+        {
+            update_history = true;
+            vm->set_running_etime(time(0));
+        }
+
+        if (vm->get_etime() == 0)
+        {
+            update_history = true;
+
+            vm->set_etime(time(0));
+        }
+
+        if (update_history)
+        {
+            vmpool->update_history(vm.get());
+        }
     }
 
     VectorAttribute * graphics = vm->get_template_attribute("GRAPHICS");