on expire, if mail could not be sent, delay vm deletion. Record first…

… mail timestamp

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
       uses: osallou/rpmchecker-action@master
       env:
         EXTRA_1: epel-release
-        EXTRA_2: centos-release-openstack-stein
+        EXTRA_2: centos-release-openstack-ussuri
       with:
         path-to-rpm: 'packages/centos'
     - name: show rpmversion

os_vm_expire/cmd/cleaner.py

@@ -246,6 +246,7 @@ def check(started_at):
             res = send_email(entity, token, delete=False)
             if res:
                 entity.notified = True
+                entity.notified_time = now
                 try:
                     entity.save()
                     repositories.commit()
@@ -264,7 +265,20 @@ def check(started_at):
                 except Exception as e:
                     LOG.exception("expiration save error: " + str(e))
                     repositories.rollback()
-        elif entity.expire < now:
+        elif entity.expire < now and entity.notified_last:  # expired and last notification send at least notify_before_days days before
+            mintime = (conf_cleaner.notify_before_days * 3600 * 24)
+            if not entity.notified_time and entity.notified:
+                # backward compat, if notif time not set and notif already sent, set to now()
+                entity.notified_time = now
+                try:
+                    entity.save()
+                    repositories.commit()
+                except Exception as e:
+                    LOG.exception("expiration save error: " + str(e))
+                    repositories.rollback()
+            if (now - entity.notified_time) < mintime:
+                LOG.debug("Last expiration notification %s sent before %d days" % (entity.id, mintime))
+                continue
             # delete
             LOG.debug("Delete VM %s" % (entity.id))
             res = delete_vm(entity.instance_id, entity.project_id, token)

os_vm_expire/model/migration/alembic_migrations/vmexpire_init_ops.py

@@ -45,6 +45,7 @@ def upgrade():
         sa.Column('expire', sa.Integer, index=False, nullable=False),
         sa.Column('notified', sa.Boolean, index=False, nullable=False),
         sa.Column('notified_last', sa.Boolean, index=False, nullable=False),
+        sa.Column('notified_time', sa.Integer, index=False, nullable=True),
         sa.Column('instance_name', sa.String(255), index=False, nullable=True),
         sa.PrimaryKeyConstraint('id')
     )

os_vm_expire/model/models.py

@@ -202,6 +202,10 @@ class VmExpire(BASE, ModelBase):
     notified_last = sa.Column(
         sa.Boolean, index=False,
         nullable=False)
+    notified_time = sa.Column(
+        sa.Integer, index=False,
+        nullable=True
+    )
     instance_name = sa.Column(
         sa.String(255), index=False,
         nullable=True)
@@ -222,6 +226,7 @@ def _do_extra_dict_fields(self):
             'expire': self.expire,
             'notified': self.notified,
             'notified_last': self.notified_last,
+            'notified_time': self.notified_time,
             'user_id': self.user_id,
             'instance_name': self.instance_name
         }

packages/package.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-git --help 1>/dev/null  && pip -h 1>/dev/null  && virtualenv -h 1>/dev/null
+git --help 1>/dev/null  && pip -h 1>/dev/null  && python3 -V 1>/dev/null
 
 # the temp directory used, within $DIR
 # omit the -p parameter to create a temporal directory in the default location
@@ -39,7 +39,7 @@ else
 fi
 git checkout tags/${version}
 
-virtualenv venv
+python3 -mvenv venv
 . venv/bin/activate
 pip install reno
 reno report > CHANGELOG