diff options
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 | ||||
| -rw-r--r-- | nova/tests/unit/db/test_db_api.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 30bbb09c06..7f983d2bfa 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -512,6 +512,7 @@ def service_get_minimum_version(context, binary): min_version = context.session.query( func.min(models.Service.version)).\ filter(models.Service.binary == binary).\ + filter(models.Service.deleted == 0).\ filter(models.Service.forced_down == false()).\ scalar() return min_version diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index cb50fc9675..9e0eda9601 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -3427,6 +3427,10 @@ class ServiceTestCase(test.TestCase, ModelsObjectComparatorMixin): self._create_service({'version': 3, 'host': 'host2', 'binary': 'compute'}) + self._create_service({'version': 0, + 'host': 'host0', + 'binary': 'compute', + 'deleted': 1}) self.assertEqual(2, db.service_get_minimum_version(self.ctxt, 'compute')) |