python-watcher 16.0.0.0rc1__tar.gz → 16.0.1__tar.gz

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/.zuul.yaml

@@ -196,12 +196,25 @@
     name: watcher-grenade
     parent: grenade
     required-projects: *tempest_base_required_projects
-    vars:
+    vars: &grenade_vars
       <<: *tempest_base_vars
+      tempest_test_regex: watcher_tempest_plugin.tests\.(api|scenario)
       devstack_plugins:
         watcher: https://opendev.org/openstack/watcher
     irrelevant-files: *irrelevant_files
 
+- job:
+    name: watcher-grenade-skip-level-always
+    description: |
+      Grenade job that skips the previous release, validating that projects
+      can support upgrades from N-2 to N release. It will always upgrade
+      to the current branch. For example: If N-2 is 2025.1 release then N
+      would be 2026.1.
+    parent: grenade-skip-level-always
+    required-projects: *tempest_base_required_projects
+    vars: *grenade_vars
+    irrelevant-files: *irrelevant_files
+
 - job:
     name: watcher-tempest-prometheus
     parent: watcher-tempest-base-two-node
@@ -372,6 +385,7 @@
       jobs:
         - openstack-tox-py312-threading
         - watcher-grenade
+        - watcher-grenade-skip-level-always
         - watcher-tempest-api-ipv6-only
         - watcher-tempest-gnocchi
         - python-watcherclient-functional:
@@ -384,6 +398,7 @@
       jobs:
         - openstack-tox-py312-threading
         - watcher-grenade
+        - watcher-grenade-skip-level-always
         - watcher-tempest-api-ipv6-only
         - watcher-tempest-gnocchi
         - python-watcherclient-functional:

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/ChangeLog

@@ -1,8 +1,21 @@
 CHANGES
 =======
 
-16.0.0.0rc1
------------
+16.0.1
+------
+
+* Avoid logging messaging transport URLs
+* Fix LP bug link in releasenote for bug 2152645
+* Fix notification updates lost during cluster data model synchronization
+* Add regression test for notification lost during synchronization
+* Update configuration and integrations docs
+* Add debug logging for host rejection in workload\_balance
+* Add watcher-grenade-skip-level-always job
+* Update TOX\_CONSTRAINTS\_FILE for stable/2026.1
+* Update .gitreview for stable/2026.1
+
+16.0.0
+------
 
 * Test zone migration audit without destination
 * Ensure zone migration creates the correct action

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-watcher
-Version: 16.0.0.0rc1
+Version: 16.0.1
 Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/doc/source/configuration/configuring.rst

@@ -195,12 +195,10 @@ The configuration file is organized into the following sections:
 * ``[watcher_decision_engine]`` - Watcher Decision Engine module configuration
 * ``[oslo_messaging_rabbit]`` - Oslo Messaging RabbitMQ driver configuration
 * ``[cinder_client]`` - Cinder client configuration
-* ``[glance_client]`` - Glance client configuration
 * ``[gnocchi_client]`` - Gnocchi client configuration
 * ``[ironic_client]`` - Ironic client configuration
 * ``[keystone_client]`` - Keystone client configuration
-* ``[nova_client]`` - Nova client configuration
-* ``[neutron_client]`` - Neutron client configuration
+* ``[nova]`` - Nova service configuration
 * ``[placement_client]`` - Placement client configuration
 
 The Watcher configuration file is expected to be named
@@ -342,10 +340,11 @@ so that the watcher service is configured for your needs.
         #project_name = <None>
         project_name = KEYSTONE_SERVICE_PROJECT_NAME
 
+
 #. Configure the clients to use a specific version if desired. For example, to
-   configure Watcher to use a Nova client with version 2.1, use::
+   configure Watcher to use Nova with version 2.1, use::
 
-    [nova_client]
+    [nova]
 
     # Version of Nova API to use in novaclient. (string value)
     #api_version = 2.56

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/doc/source/integrations/index.rst

@@ -22,10 +22,6 @@ Integration Status Matrix
          - Supported
          - Minimal
          - Unit
-       * - :ref:`Glance <glance_integration>`
-         - Experimental
-         - Missing
-         - None
        * - :ref:`Ironic <ironic_integration>`
          - Experimental
          - Minimal
@@ -38,10 +34,6 @@ Integration Status Matrix
          - Deprecated
          - Missing
          - Unit
-       * - :ref:`Neutron <neutron_integration>`
-         - Experimental
-         - Missing
-         - Unit
        * - :ref:`Nova <nova_integration>`
          - Supported
          - Minimal
@@ -64,15 +56,6 @@ model collector that creates a in-memory representation of the storage
 resources, strategies that propose solutions based on storage capacity
 and Actions that perform volume migration.
 
-.. _glance_integration:
-
-Glance
-^^^^^^
-The Image service integration is consumed by Nova Helper to create instances
-from images, which was used older releases of Watcher to cold migrate
-instances. This procedure is not used by Watcher anymore and this integration
-is classified as Experimental and may be removed in future releases.
-
 .. _ironic_integration:
 
 Ironic
@@ -97,15 +80,6 @@ This integration allows managing bare metal servers of a MAAS service,
 which includes Actions that manage the power state of nodes. This
 integration is deprecated and will be removed in a future release.
 
-.. _neutron_integration:
-
-Neutron
-^^^^^^^
-Neutron integration is currently consumed by Nova Helper to create instance,
-which was used by older releases of Watcher to cold migrate instances. This
-procedure is not used by Watcher anymore and this integration is classified
-as Experimental and may be removed in future releases.
-
 .. _nova_integration:
 
 Nova

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/python_watcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-watcher
-Version: 16.0.0.0rc1
+Version: 16.0.1
 Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/python_watcher.egg-info/SOURCES.txt

@@ -90,7 +90,6 @@ devstack/upgrade/resources.sh
 devstack/upgrade/settings
 devstack/upgrade/shutdown.sh
 devstack/upgrade/upgrade.sh
-devstack/upgrade/from_rocky/upgrade-watcher
 doc/dictionary.txt
 doc/requirements.txt
 doc/ext/__init__.py
@@ -282,6 +281,7 @@ releasenotes/notes/audit-scoper-for-storage-data-model-cdccc803542d22db.yaml
 releasenotes/notes/audit-tag-vm-metadata-47a3e4468748853c.yaml
 releasenotes/notes/audit-versioned-notifications-api-bca7738e16954bad.yaml
 releasenotes/notes/automatic-triggering-audit-8a9b0540d547db60.yaml
+releasenotes/notes/avoid-transport-url-in-debug-logs.yaml
 releasenotes/notes/background-jobs-ha-9d3cf3fe356f4705.yaml
 releasenotes/notes/blueprint-add-skip-actions-4a5a997dc1133f13.yaml
 releasenotes/notes/blueprint-remove-cancel-ongoing-actions-11144f2acb562188.yaml
@@ -305,6 +305,7 @@ releasenotes/notes/bug-2129692-a1f941b8fa5a71be.yaml
 releasenotes/notes/bug-2131663-b486d36f77d13a5d.yaml
 releasenotes/notes/bug-2134046-7daa7debfc302122.yaml
 releasenotes/notes/bug-2138857-e3505aa4a20a7831.yaml
+releasenotes/notes/bug-2152645-fix-notification-lost-during-cdm-sync-d8c411727abc6b8a.yaml
 releasenotes/notes/build-baremetal-data-model-in-watcher-3023453a47b61dab.yaml
 releasenotes/notes/cdm-scoping-8d9c307bad46bfa1.yaml
 releasenotes/notes/centralise-config-opts-95670987dfbdb0e7.yaml

python_watcher-16.0.1/python_watcher.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "05aa7074", "is_release": true}

python_watcher-16.0.1/releasenotes/notes/avoid-transport-url-in-debug-logs.yaml

@@ -0,0 +1,8 @@
+---
+security:
+  - |
+    Hardened service debug logging so service start and stop messages no
+    longer include the configured messaging transport URL. This avoids writing
+    credentials embedded in the transport URL to service logs when debug
+    logging is enabled. This is a security hardening enhancement and not a
+    security vulnerability fix.

python_watcher-16.0.1/releasenotes/notes/bug-2152645-fix-notification-lost-during-cdm-sync-d8c411727abc6b8a.yaml

@@ -0,0 +1,12 @@
+---
+fixes:
+  - |
+    Fixed a race condition where cluster data model (CDM) updates delivered
+    by oslo.messaging notification handlers could be silently lost during a
+    periodic CDM synchronization.
+
+    Notifications that arrive during a synchronization now wait until the
+    new model is current before applying their updates, ensuring no state
+    changes are lost.
+
+    See: https://bugs.launchpad.net/watcher/+bug/2152645 for more details.

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/tox.ini

@@ -6,7 +6,7 @@ envlist = py3,pep8
 usedevelop = True
 allowlist_externals = find
                       rm
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2026.1} {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
   OS_STDOUT_CAPTURE=1

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/common/service.py

@@ -240,7 +240,7 @@ class Service(service.ServiceBase):
         )
 
     def start(self):
-        LOG.debug("Connecting to '%s'", CONF.transport_url)
+        LOG.debug("Connecting to messaging transport")
         if self.conductor_topic_handler:
             self.conductor_topic_handler.start()
         if self.notification_handler:
@@ -249,7 +249,7 @@ class Service(service.ServiceBase):
             self.heartbeat.start()
 
     def stop(self):
-        LOG.debug("Disconnecting from '%s'", CONF.transport_url)
+        LOG.debug("Disconnecting from messaging transport")
         if self.conductor_topic_handler:
             self.conductor_topic_handler.stop()
         if self.notification_handler:

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/conf/grafana_client.py

@@ -28,6 +28,7 @@ GRAFANA_CLIENT_OPTS = [
     # A similar structure to the database_map would solve this.
     cfg.StrOpt('token',
                default=None,
+               secret=True,
                help="Authentication token to gain access"),
     # TODO(Dantali0n) each individual metric could have its own base url.
     # A similar structure to the database_map would solve this.

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/conf/maas_client.py

@@ -23,6 +23,7 @@ MAAS_CLIENT_OPTS = [
     cfg.StrOpt('url',
                help='MaaS URL, example: http://1.2.3.4:5240/MAAS'),
     cfg.StrOpt('api_key',
+               secret=True,
                help='MaaS API authentication key.'),
     cfg.IntOpt('timeout',
                default=60,

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/decision_engine/model/collector/base.py

@@ -127,6 +127,7 @@ class BaseClusterDataModelCollector(loadable.LoadableSingleton,
         super().__init__(config)
         self.osc = osc if osc else clients.OpenStackClients()
         self.lock = threading.RLock()
+        self.sync_lock = threading.RLock()
         self._audit_scope_handler = None
         self._cluster_data_model = None
         self._data_model_scope = None
@@ -188,13 +189,16 @@ class BaseClusterDataModelCollector(loadable.LoadableSingleton,
         """Synchronize the cluster data model
 
         Whenever called this synchronization will perform a drop-in replacement
-        with the existing cluster data model
+        with the existing cluster data model. The sync lock is held for the
+        full duration so notification handlers wait until the new model is
+        current before applying updates.
         """
-        try:
-            self.cluster_data_model = self.execute()
-        except Exception as e:
-            LOG.exception(e)
-            self.set_cluster_data_model_as_stale()
+        with self.sync_lock:
+            try:
+                self.cluster_data_model = self.execute()
+            except Exception as e:
+                LOG.exception(e)
+                self.set_cluster_data_model_as_stale()
 
 
 class BaseModelBuilder:

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/decision_engine/model/notification/base.py

@@ -17,6 +17,11 @@
 
 import abc
 
+from oslo_log import log
+
+
+LOG = log.getLogger(__name__)
+
 
 class NotificationEndpoint(metaclass=abc.ABCMeta):
 
@@ -34,3 +39,20 @@ class NotificationEndpoint(metaclass=abc.ABCMeta):
     @property
     def cluster_data_model(self):
         return self.collector.cluster_data_model
+
+    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+        """oslo.messaging entry point.
+
+        Acquires the collector sync lock before processing to ensure
+        notifications are never applied to a model that is about to be
+        replaced by an in-progress synchronization.
+        """
+        with self.collector.sync_lock:
+            self.process_info(
+                ctxt, publisher_id, event_type, payload, metadata
+            )
+
+    @abc.abstractmethod
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
+        """Process the notification. Subclasses must implement this."""
+        raise NotImplementedError()

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/decision_engine/model/notification/cinder.py

@@ -250,7 +250,7 @@ class CapacityNotificationEndpoint(CinderNotification):
             event_type='capacity.pool',
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         ctxt.request_id = metadata['message_id']
         ctxt.project_domain = event_type
         LOG.info("Event '%(event)s' received from %(publisher)s "
@@ -285,7 +285,7 @@ class VolumeCreateEnd(VolumeNotificationEndpoint):
             event_type='volume.create.end',
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         ctxt.request_id = metadata['message_id']
         ctxt.project_domain = event_type
         LOG.info("Event '%(event)s' received from %(publisher)s "
@@ -314,7 +314,7 @@ class VolumeUpdateEnd(VolumeNotificationEndpoint):
             event_type='volume.update.end',
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         ctxt.request_id = metadata['message_id']
         ctxt.project_domain = event_type
         LOG.info("Event '%(event)s' received from %(publisher)s "
@@ -376,7 +376,7 @@ class VolumeDeleteEnd(VolumeNotificationEndpoint):
             event_type='volume.delete.end',
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         ctxt.request_id = metadata['message_id']
         ctxt.project_domain = event_type
         LOG.info("Event '%(event)s' received from %(publisher)s "

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/decision_engine/model/notification/nova.py

@@ -357,7 +357,7 @@ class VersionedNotification(NovaNotification):
             publisher_id=self.publisher_id_regex,
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         LOG.info("Event '%(event)s' received from %(publisher)s "
                  "with metadata %(metadata)s",
                  dict(event=event_type,

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/decision_engine/strategy/strategies/workload_balance.py

@@ -192,33 +192,77 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
             workload = instance_data['workload']
             # calculate the available resources
             free_res = self.compute_model.get_node_free_resources(host)
-            if (free_res['vcpu'] >= required_cores and
-                    free_res['memory'] >= required_mem and
-                    free_res['disk'] >= required_disk):
-                if self._meter == 'instance_cpu_usage':
-                    usage = src_instance_workload + workload
-                    usage_percent = usage / host.vcpus * 100
-                    limit = self.threshold / 100 * host.vcpus
-                    if usage < limit:
-                        destination_hosts.append(instance_data)
-                    LOG.debug(f"Host {host.hostname} evaluated as destination "
-                              f"for {instance_to_migrate.uuid}. Host usage "
-                              f"for cpu would be {usage_percent}."
-                              f"The threshold is: {self.threshold}. "
-                              f"selected: {usage < limit}"
-                              )
-                if self._meter == 'instance_ram_usage':
-                    usage = src_instance_workload + workload
-                    usage_percent = usage / host.memory * 100
-                    limit = self.threshold / 100 * host.memory
-                    if usage < limit:
-                        destination_hosts.append(instance_data)
-                    LOG.debug(f"Host {host.hostname} evaluated as destination "
-                              f"for {instance_to_migrate.uuid}. Host usage "
-                              f"for ram would be {usage_percent}."
-                              f"The threshold is: {self.threshold}. "
-                              f"selected: {usage < limit}"
-                              )
+            if free_res['vcpu'] < required_cores:
+                LOG.debug(
+                    "Host %(host)s rejected for instance %(instance)s: "
+                    "insufficient vCPUs (available: %(available)s, "
+                    "required: %(required)s)",
+                    dict(
+                        host=host.hostname,
+                        instance=instance_to_migrate.uuid,
+                        available=free_res['vcpu'],
+                        required=required_cores,
+                    ),
+                )
+                continue
+            if free_res['memory'] < required_mem:
+                LOG.debug(
+                    "Host %(host)s rejected for instance %(instance)s: "
+                    "insufficient memory (available: %(available)s MB, "
+                    "required: %(required)s MB)",
+                    dict(
+                        host=host.hostname,
+                        instance=instance_to_migrate.uuid,
+                        available=free_res['memory'],
+                        required=required_mem,
+                    ),
+                )
+                continue
+            if free_res['disk'] < required_disk:
+                LOG.debug(
+                    "Host %(host)s rejected for instance %(instance)s: "
+                    "insufficient disk (available: %(available)s GB, "
+                    "required: %(required)s GB)",
+                    dict(
+                        host=host.hostname,
+                        instance=instance_to_migrate.uuid,
+                        available=free_res['disk'],
+                        required=required_disk,
+                    ),
+                )
+                continue
+            if self._meter == 'instance_cpu_usage':
+                usage = src_instance_workload + workload
+                usage_percent = usage / host.vcpus * 100
+                limit = self.threshold / 100 * host.vcpus
+                if usage < limit:
+                    destination_hosts.append(instance_data)
+                LOG.debug(
+                    "Host %s evaluated as destination for %s. "
+                    "Host usage for cpu would be %s."
+                    "The threshold is: %s. selected: %s",
+                    host.hostname,
+                    instance_to_migrate.uuid,
+                    usage_percent,
+                    self.threshold,
+                    usage < limit,
+                )
+            if self._meter == 'instance_ram_usage':
+                usage = src_instance_workload + workload
+                usage_percent = usage / host.memory * 100
+                limit = self.threshold / 100 * host.memory
+                if usage < limit:
+                    destination_hosts.append(instance_data)
+                LOG.debug(
+                    "Host %s evaluated as destination for %s. "
+                    "Host usage for ram would be %s."
+                    "The threshold is: %s. selected: %s",
+                    host.hostname,
+                    instance_to_migrate.uuid,
+                    usage_percent,
+                    self.threshold,
+                    usage < limit,
+                )
         return destination_hosts
 
     def group_hosts_by_cpu_or_ram_util(self):
@@ -326,6 +370,10 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
         instance_to_migrate = self.choose_instance_to_migrate(
             source_nodes, avg_workload, workload_cache)
         if not instance_to_migrate:
+            LOG.debug(
+                "No suitable instance found to migrate from "
+                "any overloaded source node"
+            )
             return self.solution
         source_node, instance_src = instance_to_migrate
         # find the hosts that have enough resource for the VM to be migrated
@@ -334,9 +382,12 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
         # sort the filtered result by workload
         # pick up the lowest one as dest server
         if not destination_hosts:
-            # for instance.
-            LOG.warning("No proper target host could be found, it might "
-                        "be because of there's no enough CPU/Memory/DISK")
+            LOG.warning(
+                "No proper target host could be found for instance "
+                "%(instance)s. Check debug logs for per-host rejection "
+                "details.",
+                dict(instance=instance_src.uuid),
+            )
             return self.solution
         destination_hosts = sorted(destination_hosts,
                                    key=lambda x: (x[self._meter]))

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/tests/unit/common/test_service.py

@@ -108,6 +108,28 @@ class TestService(base.TestCase):
             dummy_service.conductor_topic_handler,
             om.rpc.server.RPCServer)
 
+    @mock.patch.object(service.LOG, 'debug', autospec=True)
+    def test_transport_url_not_logged(self, mock_debug):
+        transport_url = 'rabbit://api:secret-pass@example.com:5672/'
+        CONF.set_override('transport_url', transport_url)
+
+        dummy_service = service.Service(DummyManager)
+        dummy_service.conductor_topic_handler = None
+        dummy_service.notification_handler = None
+        dummy_service.heartbeat = None
+
+        dummy_service.start()
+        dummy_service.stop()
+
+        logged = ' '.join(
+            str(arg) for call in mock_debug.call_args_list for arg in call.args
+        )
+
+        self.assertNotIn(transport_url, logged)
+        self.assertNotIn('secret-pass', logged)
+        mock_debug.assert_any_call("Connecting to messaging transport")
+        mock_debug.assert_any_call("Disconnecting from messaging transport")
+
 
 class TestServiceMonitoringBase(db_base.DbTestCase):
 

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/tests/unit/decision_engine/cluster/test_cluster_data_model_collector.py

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import threading
+
 from unittest import mock
 
 from watcher.decision_engine.model.collector import base
@@ -20,6 +22,7 @@ from watcher.decision_engine.model.collector import cinder
 from watcher.decision_engine.model.collector import ironic
 from watcher.decision_engine.model.collector import nova
 from watcher.decision_engine.model import model_root
+from watcher.decision_engine.model.notification import base as notif_base
 from watcher.tests.unit import base as test_base
 
 
@@ -59,6 +62,77 @@ class TestClusterDataModelCollector(test_base.TestCase):
             collector.get_latest_cluster_data_model())
 
 
+class TestSyncLockNotificationRace(test_base.TestCase):
+    """Regression test for notification updates lost during synchronization.
+
+    When synchronize() is rebuilding the model via execute(), a concurrent
+    notification must not apply its update to the old model that will be
+    discarded. Without sync_lock in synchronize() and in
+    NotificationEndpoint.info(), the notification races execute(), calls
+    add_node() on old_model, and the update is silently lost when
+    synchronize() replaces _cluster_data_model with new_model.
+
+    This test fails without the fix and passes once sync_lock is added to
+    both synchronize() and NotificationEndpoint.info().
+    """
+
+    def test_notification_node_reaches_new_model_not_old(self):
+        collector = DummyClusterDataModelCollector(config=mock.Mock())
+
+        old_model = mock.Mock(spec=model_root.ModelRoot)
+        new_model = mock.Mock(spec=model_root.ModelRoot)
+        collector._cluster_data_model = old_model
+
+        execute_started = threading.Event()
+        execute_may_finish = threading.Event()
+
+        def slow_execute():
+            # execute start to build a new model
+            execute_started.set()
+            # Event to trigger the end of execute()
+            execute_may_finish.wait(timeout=5)
+            return new_model
+
+        dummy_node = mock.Mock()
+
+        # Notification endpoint that adds dummy_node to whatever model
+        # is current at info() time.
+        class AddNodeEndpoint(notif_base.NotificationEndpoint):
+            @property
+            def filter_rule(self):
+                return None
+
+            def process_info(
+                self, ctxt, publisher_id, event_type, payload, metadata
+            ):
+                self.cluster_data_model.add_node(dummy_node)
+
+        endpoint = AddNodeEndpoint(collector)
+
+        with mock.patch.object(collector, 'execute', side_effect=slow_execute):
+            sync_thread = threading.Thread(
+                target=collector.synchronize, daemon=True
+            )
+            sync_thread.start()
+            execute_started.wait(timeout=3)
+
+            # Notification fires while execute() is still running.
+            notif_thread = threading.Thread(
+                target=endpoint.info,
+                args=(mock.Mock(), 'pub', 'event', {}, {}),
+                daemon=True,
+            )
+            notif_thread.start()
+
+            # finish execute() processing
+            execute_may_finish.set()
+            sync_thread.join(timeout=3)
+            notif_thread.join(timeout=3)
+
+        new_model.add_node.assert_called_once_with(dummy_node)
+        old_model.add_node.assert_not_called()
+
+
 class TestComputeDataModelCollector(test_base.TestCase):
 
     def test_model_scope_is_none(self):

{python_watcher-16.0.0.0rc1 → python_watcher-16.0.1}/watcher/tests/unit/decision_engine/model/notification/test_notifications.py

@@ -45,7 +45,7 @@ class DummyNotification(base.NotificationEndpoint):
             payload={'data': {'nested': r'^T.*'}},
         )
 
-    def info(self, ctxt, publisher_id, event_type, payload, metadata):
+    def process_info(self, ctxt, publisher_id, event_type, payload, metadata):
         pass