openstack
/
nova
Code Issues Proposed changes

Merge "Don't generate service UUID for deleted services" into stable/queens

This commit is contained in:
Zuul 2019-08-09 17:49:03 +00:00 committed by Gerrit Code Review
parent f0c7e33eb0 97e78f8cc1
commit 2cbd630038
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/service.py
View File

@ -257,7 +257,7 @@ class Service(base.NovaPersistentObject, base.NovaObject,
service.obj_reset_changes() service.obj_reset_changes()
# TODO(dpeschman): Drop this once all services have uuids in database # TODO(dpeschman): Drop this once all services have uuids in database
if 'uuid' not in service: if 'uuid' not in service and not service.deleted:
service.uuid = uuidutils.generate_uuid() service.uuid = uuidutils.generate_uuid()
LOG.debug('Generated UUID %(uuid)s for service %(id)i', LOG.debug('Generated UUID %(uuid)s for service %(id)i',
dict(uuid=service.uuid, id=service.id)) dict(uuid=service.uuid, id=service.id))

13
nova/tests/functional/regressions/test_bug_1764556.py
View File

@ -10,13 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from nova import context as nova_context from nova import context as nova_context
from nova.db import api as db from nova.db import api as db
from nova import test from nova import test
from nova.tests import fixtures as nova_fixtures from nova.tests import fixtures as nova_fixtures
from nova.tests.functional.api import client as api_client
from nova.tests.functional import integrated_helpers from nova.tests.functional import integrated_helpers
from nova.tests.unit.image import fake as fake_image from nova.tests.unit.image import fake as fake_image
from nova.tests.unit import policy_fixture from nova.tests.unit import policy_fixture
@ -153,10 +150,6 @@ class InstanceListWithDeletedServicesTestCase(
# Finally, list servers as an admin so it joins on services to get host # Finally, list servers as an admin so it joins on services to get host
# information. # information.
# FIXME(mriedem): This is bug 1764556 where the join on the services servers = self.admin_api.get_servers(detail=True)
# table also pulls the deleted service that doesn't have a uuid and for server in servers:
# attempts to migrate that service to have a uuid, which fails because self.assertEqual('UP', server['host_status'])
# it's not using a read_deleted='yes' context.
ex = self.assertRaises(api_client.OpenStackApiException,
self.admin_api.get_servers, detail=True)
self.assertIn('ServiceNotFound', six.text_type(ex))

24
nova/tests/functional/regressions/test_bug_1778305.py
View File

@ -49,19 +49,13 @@ class InstanceListWithOldDeletedServiceTestCase(test.TestCase):
host='fake-host') host='fake-host')
inst.create() inst.create()
# TODO(melwitt): Remove this assert when the bug is fixed. insts = objects.InstanceList.get_by_filters(
self.assertRaises(nova.exception.ServiceTooOld, self.context, {}, expected_attrs=['services'])
objects.InstanceList.get_by_filters, self.assertEqual(1, len(insts))
self.context, {}, expected_attrs=['services']) self.assertEqual(2, len(insts[0].services))
# TODO(melwitt): Uncomment these asserts when the bug is fixed.
# insts = objects.InstanceList.get_by_filters(
# self.context, {}, expected_attrs=['services'])
# self.assertEqual(1, len(insts))
# self.assertEqual(2, len(insts[0].services))
# Deleted service should not have a UUID # Deleted service should not have a UUID
# for service in insts[0].services: for service in insts[0].services:
# if service.deleted: if service.deleted:
# self.assertNotIn('uuid', service) self.assertNotIn('uuid', service)
# else: else:
# self.assertIsNotNone(service.uuid) self.assertIsNotNone(service.uuid)