fix cleanup case where vm is not found

genouest · Mar 6, 2019 · 93240eb · 93240eb
1 parent ce45cf0
commit 93240eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/os_vm_expire/cmd/cleaner.py b/os_vm_expire/cmd/cleaner.py
@@ -76,11 +76,14 @@ def delete_vm(instance_id, project_id, token):
         'Accept': 'application/json'
     }
     r = requests.delete(nova_url + '/servers/' + instance_id, headers=headers)
+    if r.status_code == 404:
+        LOG.info('DELETE:VmNotFound:' + str(instance_id) + ':' + str(project_id))
+        return True
     if r.status_code != 204:
-        LOG.error('Failed to delete instance ' + str(instance_id))
+        LOG.error('DELETE:Error:Failed to delete instance ' + str(instance_id))
         return False
     else:
-        LOG.info('DELETE:' + str(instance_id) + ':' + str(project_id))
+        LOG.info('DELETE:deleted:' + str(instance_id) + ':' + str(project_id))
         return True
 
 
@@ -272,7 +275,7 @@ def check(started_at):
                 except Exception as e:
                     LOG.exception("expiration deletion error: " + str(e))
                     repositories.rollback()
-            send_email(entity, token, delete=True)
+                send_email(entity, token, delete=True)
 
 
 class CleanerServer(service.Service):

diff --git a/releasenotes/notes/fix_vm_notfound-2bdd03e6b0f1ceb4.yaml b/releasenotes/notes/fix_vm_notfound-2bdd03e6b0f1ceb4.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix case where VM is not found, email was sent anyway
+    If VM does not exists anymore (error case), consider deletion as ok