Merge pull request #444 from SUSE/fix_deleting_reset

Fix deleting reset

Author: volodymyrkatkalov

ocw/lib/db.py

@@ -168,6 +168,9 @@ def is_deleting_stale(instance: type[Instance]):
     '''
     Check if the instance has been in a deleting state longer than the configured threshold.
     '''
+    if instance.ignore:
+        return False
+
     # Return False if state is not in deleting states
     if instance.state not in [StateChoice.DELETING]:
         return False
@@ -229,6 +232,9 @@ def reset_stale_deleting() -> None:
 
 
 def delete_instance(instance: type[Instance]) -> None:
+    if instance.ignore:
+        return
+
     if instance.provider == ProviderChoice.AZURE:
         Azure(instance.namespace).delete_resource(instance.instance_id)
     elif instance.provider == ProviderChoice.EC2:

tests/test_db.py

@@ -35,7 +35,7 @@ def delete_instance(self, instance_id, region):
 
 
 class InstanceMock:
-    def __init__(self, provider, state=None, ttl=None, first_seen=None):
+    def __init__(self, provider, state=None, ttl=None, first_seen=None, last_seen=None, deleting_since=None, ignore=False):
         self.state = state if state is not None else None
         self.instance_id = fake.uuid4()
         self.region = None
@@ -46,6 +46,7 @@ def __init__(self, provider, state=None, ttl=None, first_seen=None):
         self.first_seen = first_seen if first_seen else datetime.now(tz=timezone.utc)
         self.last_seen = self.first_seen  # For all_time_fields()
         self.age = timedelta(seconds=0)  # Placeholder
+        self.ignore = ignore
 
     def save(self, update_fields=None):
         self.save_called = True
@@ -221,39 +222,53 @@ def test_reset_stale_deleting(monkeypatch):
             'state': StateChoice.DELETING,
             'deleting_since': now - timedelta(hours=3),  # 3 hours ago
             'should_reset': True,
-            'desc': "Stale (3h > 2h)"
+            'desc': "Stale (3h > 2h)",
+            'pcw_ignore': False
         },
         # Case 2: Not Stale (1h < 2h)
         {
             'instance_id': "test-instance-not-stale",
             'state': StateChoice.DELETING,
             'deleting_since': now - timedelta(hours=1),  # 1 hour ago
             'should_reset': False,
-            'desc': "Not Stale (1h < 2h)"
+            'desc': "Not Stale (1h < 2h)",
+            'pcw_ignore': False
         },
         # Case 3: Non-Deleting (ACTIVE)
         {
             'instance_id': "test-instance-active",
             'state': StateChoice.ACTIVE,
             'deleting_since': now - timedelta(hours=3),  # Shouldn’t matter
             'should_reset': False,
-            'desc': "Non-Deleting (ACTIVE)"
+            'desc': "Non-Deleting (ACTIVE)",
+            'pcw_ignore': False
         },
         # Case 4: Edge (2h = 2h)
         {
             'instance_id': "test-instance-edge",
             'state': StateChoice.DELETING,
             'deleting_since': now - timedelta(hours=2),  # Exactly 2 hours ago
             'should_reset': True,
-            'desc': "Edge (2h = 2h)"
+            'desc': "Edge (2h = 2h)",
+            'pcw_ignore': False
         },
         # Case 5: Edge (1h 59m < 2h)
         {
             'instance_id': "test-instance-edge-2",
             'state': StateChoice.DELETING,
             'deleting_since': now - timedelta(hours=1) - timedelta(minutes=59),  # Exactly 2 hours ago
             'should_reset': False,
-            'desc': "Edge (1h 59m < 2h)"
+            'desc': "Edge (1h 59m < 2h)",
+            'pcw_ignore': False
+        },
+        # Case 6: Stale (3h > 2h) but pcw_ignore tag is True
+        {
+            'instance_id': "test-instance-stale-but-pcw-ignore",
+            'state': StateChoice.DELETING,
+            'deleting_since': now - timedelta(hours=3),  # 3 hours ago
+            'should_reset': False,
+            'desc': "Stale (3h > 2h)",
+            'pcw_ignore': True
         },
     ]
 
@@ -279,11 +294,22 @@ def test_reset_stale_deleting(monkeypatch):
                 active=case['state'] == StateChoice.ACTIVE
             )
             instance.save()
+            tags = {'openqa_ttl': str(default_ttl)}
+            if case['pcw_ignore']:
+                tags[Instance.TAG_IGNORE] = "True"
+
             CspInfo.objects.create(
                 instance=instance,
-                tags=json.dumps({'openqa_ttl': str(default_ttl)}),
+                tags=json.dumps(tags),
                 type="test_type"
             )
+
+            # required so that ignore is recomputed
+            instance.set_alive()
+
+            # required to save the ignore field
+            instance.save()
+
             instances.append(instance)
 
     # Run the function
@@ -302,6 +328,8 @@ def test_reset_stale_deleting(monkeypatch):
         print(f"deleting_since: {instance.deleting_since}")
         print(f"time_in_deleting: {time_in_deleting}s")
         print(f"threshold: {threshold}s")
+        print(f"pcw_ignore expected: {case['pcw_ignore']}, actual: {instance.ignore}")
+        print(f"should_reset: {case['should_reset']}")
 
         if case['should_reset']:
             assert instance.state == StateChoice.ACTIVE, f"State should reset to ACTIVE for {case['desc']}"
@@ -348,6 +376,24 @@ def test_delete_instances_azure(monkeypatch):
     assert instance.save_called
     assert instance.state == StateChoice.DELETING
 
+    instance_with_state = InstanceMock(ProviderChoice.AZURE, StateChoice.ACTIVE)
+
+    delete_instance(instance_with_state)
+
+    assert instance_with_state.save_called
+    assert instance_with_state.state == StateChoice.DELETING
+
+
+def test_delete_instances_azure_pcw_ignore(monkeypatch):
+    monkeypatch.setattr(Azure, '__new__', lambda cls, namespace: AzureMock())
+
+    instance = InstanceMock(ProviderChoice.AZURE, StateChoice.ACTIVE, None, None, None, None, True)
+
+    delete_instance(instance)
+
+    assert not instance.save_called
+    assert instance.state == StateChoice.ACTIVE
+
 
 def test_delete_instances_ec2(monkeypatch):
     monkeypatch.setattr(EC2, '__new__', lambda cls, namespace: EC2Mock())
@@ -359,6 +405,24 @@ def test_delete_instances_ec2(monkeypatch):
     assert instance.save_called
     assert instance.state == StateChoice.DELETING
 
+    instance_with_state = InstanceMock(ProviderChoice.EC2, StateChoice.ACTIVE)
+
+    delete_instance(instance_with_state)
+
+    assert instance_with_state.save_called
+    assert instance_with_state.state == StateChoice.DELETING
+
+
+def test_delete_instances_ec2_pcw_ignore(monkeypatch):
+    monkeypatch.setattr(EC2, '__new__', lambda cls, namespace: EC2Mock())
+
+    instance = InstanceMock(ProviderChoice.EC2, StateChoice.ACTIVE, None, None, None, None, True)
+
+    delete_instance(instance)
+
+    assert not instance.save_called
+    assert instance.state == StateChoice.ACTIVE
+
 
 def test_delete_instances_gce(monkeypatch):
     monkeypatch.setattr(GCE, '__new__', lambda cls, namespace: GCEMock())
@@ -369,3 +433,21 @@ def test_delete_instances_gce(monkeypatch):
 
     assert instance.save_called
     assert instance.state == StateChoice.DELETING
+
+    instance_with_state = InstanceMock(ProviderChoice.GCE, StateChoice.ACTIVE)
+
+    delete_instance(instance_with_state)
+
+    assert instance_with_state.save_called
+    assert instance_with_state.state == StateChoice.DELETING
+
+
+def test_delete_instances_gce_pcw_ignore(monkeypatch):
+    monkeypatch.setattr(GCE, '__new__', lambda cls, namespace: GCEMock())
+
+    instance = InstanceMock(ProviderChoice.GCE, StateChoice.ACTIVE, None, None, None, None, True)
+
+    delete_instance(instance)
+
+    assert not instance.save_called
+    assert instance.state == StateChoice.ACTIVE

tests/test_models.py

@@ -201,3 +201,36 @@ def test_get_tag(example_instance_data, example_cspinfo_data):
     assert cspinfo.get_tag('openqa_var_name') == "Test Job"
     assert cspinfo.get_tag('non_existent_tag') is None
     assert cspinfo.get_tag('non_existent_tag', default_value="N/A") == "N/A"
+
+
+@pytest.mark.django_db
+def test_ignore(example_instance_data, example_cspinfo_data):
+    instance = Instance.objects.create(**example_instance_data)
+    cspinfo = CspInfo.objects.create(instance=instance, **example_cspinfo_data)
+
+    # Test when pcw_ignore tag is not present
+    cspinfo.tags = '{"openqa_var_server": "http://example.com", "openqa_var_job_id": "12345"}'
+    cspinfo.save()
+    instance.set_alive()
+    assert instance.ignore is False
+
+    # Test when pcw_ignore tag is present and set to true but set_alive wasn't called on instance
+    cspinfo.tags = '{"openqa_var_server": "http://example.com", "openqa_var_job_id": "12345", "pcw_ignore": "true"}'
+    cspinfo.save()
+    assert instance.ignore is False
+
+    # Test when pcw_ignore tag is present and set to true and set_alive was called on instance
+    instance.set_alive()
+    assert instance.ignore is True
+
+    # Test when pcw_ignore tag is present but set to false
+    cspinfo.tags = '{"openqa_var_server": "http://example.com", "openqa_var_job_id": "12345", "pcw_ignore": "false"}'
+    cspinfo.save()
+    instance.set_alive()
+    assert instance.ignore is True
+
+    # Test when tags are empty
+    cspinfo.tags = '{}'
+    cspinfo.save()
+    instance.set_alive()
+    assert instance.ignore is False