python-watcher 16.0.0__py3-none-any.whl → 16.0.1__py3-none-any.whl

{python_watcher-16.0.0.dist-info → python_watcher-16.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-watcher
-Version: 16.0.0
+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.dist-info → python_watcher-16.0.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-python_watcher-16.0.0.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
-python_watcher-16.0.0.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
-python_watcher-16.0.0.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=ZN93-gX9IPi8a2_vO_Wl_GRjafnO2Xm7oEk2ou9Fv04,486
-python_watcher-16.0.0.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
-python_watcher-16.0.0.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
-python_watcher-16.0.0.dist-info/licenses/AUTHORS,sha256=A38NQqsvLAj9OTI09_UiZ7Wv0Bt-XmN2Ie-oVWyLMSo,8276
-python_watcher-16.0.0.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_watcher-16.0.1.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
+python_watcher-16.0.1.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
+python_watcher-16.0.1.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=ZN93-gX9IPi8a2_vO_Wl_GRjafnO2Xm7oEk2ou9Fv04,486
+python_watcher-16.0.1.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
+python_watcher-16.0.1.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-16.0.1.dist-info/licenses/AUTHORS,sha256=A38NQqsvLAj9OTI09_UiZ7Wv0Bt-XmN2Ie-oVWyLMSo,8276
+python_watcher-16.0.1.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
 watcher/__init__.py,sha256=Vs2olXPZ_IAV1rukHYRl3ITzYFBNXX9mIUtFXkMWYwg,640
 watcher/_i18n.py,sha256=fmiL4Nl4XcrhO07jHIk8fkzPaJBuK6pvYlNlSty2p_c,1269
 watcher/eventlet.py,sha256=z6WuDS9HJAq6vRZCg5ozYpWCs3lwhDuv9R70bj8tpQ0,1476
@@ -92,7 +92,7 @@ watcher/common/placement_helper.py,sha256=WtXNYCTRbs1JmrnHUXzjO3ebEyusnxLXHyeUSw
 watcher/common/policy.py,sha256=8WGBY79RJItBN4RphBEacYj7JKtSHJLoVw3WW7oM5oA,4893
 watcher/common/rpc.py,sha256=eM0yHwmMDKHq29oualMp3lbVhEol2ffGTZdIJ9CgO_4,4357
 watcher/common/scheduling.py,sha256=tHf3qI1nZ_bJnC3QXkD7zM_ld7zkeGTNbuXrAP9PWTY,2186
-watcher/common/service.py,sha256=E1GqlgtA4djzo6um3O6QEf5lrNpW2UH6CT-NJ1AObmM,13698
+watcher/common/service.py,sha256=kdCLbEleIK1QCemedEYfb1djMwmmqK0J00AP3HHMj4k,13688
 watcher/common/service_manager.py,sha256=KT-sKrQqhoTX1QSlmPcPZo0OJYnoykEp2yxOJd1XTVk,1387
 watcher/common/utils.py,sha256=GC6rkrQlt5xmMhkdKogksXNzrQgvCbY6QNp-roFwnZ0,5948
 watcher/common/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,11 +128,11 @@ watcher/conf/db.py,sha256=TkdSUfqmq3s7M02lHhg2F3WNw_KVHXQtgYo-Quyz1J8,1317
 watcher/conf/decision_engine.py,sha256=A1ZfeKdKCIAJ1B8122FHA3sCBiafVBy7fVezIniZ-KQ,4030
 watcher/conf/exception.py,sha256=k6BRqb7z27gndxuZffATm0b8qACzh1co2luJy3AJx2w,963
 watcher/conf/gnocchi_client.py,sha256=NXD_ZSTobVOawUtXzd5uo4yn7cbSJbzFe9wNt9LcW-4,1563
-watcher/conf/grafana_client.py,sha256=7F3F0zDdnOdi4Ju_jSLVToB5j26gjxTDAewWjJUanyw,6882
+watcher/conf/grafana_client.py,sha256=7JaaCyImzgwG5m5zZoKqyFUE0_txdx5J6QcyYWSjpv4,6910
 watcher/conf/grafana_translators.py,sha256=-7I2lYtm6MGmDGteFR9TDWWyTby29vd8pLnWROAvYi8,1625
 watcher/conf/ironic_client.py,sha256=6dItPh2QBVvbWmejnC_oZr4W_vEEi1wDhp74Cu_tCfo,1561
 watcher/conf/keystone_client.py,sha256=mbMBo4nhZoKngAQNbqXvrzh1W3opULQ-4ETgFMk_ZGo,1324
-watcher/conf/maas_client.py,sha256=7KGb3yIKWDvCdYA5Kc22uszkFEOp9rcJQHpQFES2dfA,1277
+watcher/conf/maas_client.py,sha256=99UaXMNg_1GPyfU2q4TjjHpRmI6zAStcrYzvo6lDyyg,1305
 watcher/conf/models.py,sha256=Fo1zQMcUjtEIroMZ4mx3kRLr2A_-3JldMZJQZ7SKIko,1390
 watcher/conf/nova.py,sha256=4fjc72SVNVlWoVZfXvX6HBaZu4SkuBgLbi3Mb9jc2nU,4143
 watcher/conf/nova_client.py,sha256=IWvE0jWfqD7ttpr00hVJhHBXyP4fVo6a7rI53k6ySBo,2764
@@ -208,7 +208,7 @@ watcher/decision_engine/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 watcher/decision_engine/model/base.py,sha256=fKQtaGLAaT0OaLxObKMa_MFVNPO_os9E3cYFyWyORSU,1097
 watcher/decision_engine/model/model_root.py,sha256=iDMGHBmJuoB5R04jRVIFGJPFSDRum2oCphcJE2e6SKA,24893
 watcher/decision_engine/model/collector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-watcher/decision_engine/model/collector/base.py,sha256=ORrRnmejMbpBhMprjrDIqxxZgq6mRfeWEugDkNqiMXk,9652
+watcher/decision_engine/model/collector/base.py,sha256=A4TyXdlwvKIABvR5sDO_GkCPWoDqYS9nlHvCSFnoCWY,9891
 watcher/decision_engine/model/collector/cinder.py,sha256=nlkdeBdnsV4OcDzYx18IQ_G9mNfh-bSfB7yKkPjeJX4,11797
 watcher/decision_engine/model/collector/ironic.py,sha256=BPMLbsilwwxl2JihK7Kbxx82FAAvrF5tS7DSKrNRAT4,4229
 watcher/decision_engine/model/collector/manager.py,sha256=kaX4iX9JbpXdp_aQbMTXL-B_D0ohm0OAl8cwjOpOSa4,3229
@@ -222,10 +222,10 @@ watcher/decision_engine/model/element/node.py,sha256=vuyb6BsF61a2Zx-wskFoK2T5A3E
 watcher/decision_engine/model/element/storage_resource.py,sha256=SxEANRSpzOoN08hzVip-Tw-zB6CGea2iIZRRFHHsAQI,902
 watcher/decision_engine/model/element/volume.py,sha256=Jsscli7Y4hYzNgBB1e1xR7_UNcSiEVjiVuarkT61NGk,1830
 watcher/decision_engine/model/notification/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-watcher/decision_engine/model/notification/base.py,sha256=CpjE3ECVJFn7bhLZ-I8dx3XwLXrYvqOsQftt678cah4,1060
-watcher/decision_engine/model/notification/cinder.py,sha256=gD3z5l2paEAHtDpKT3Y-3shcRR09zfkNKiWjEQc1DiU,15013
+watcher/decision_engine/model/notification/base.py,sha256=I5ot0ycC3MKtAJ4WAxTGRpW5UrEWzLiT3bq0WHHXkgw,1796
+watcher/decision_engine/model/notification/cinder.py,sha256=DsD7M0lZ4luJtzx4j7OMRzpxg4KHb9Zu1s8fIF7WHpk,15045
 watcher/decision_engine/model/notification/filtering.py,sha256=XS7l9bSnM-UEYWxqeIxAhQHHlDdsVtRH1ZyqDdy3n3Q,2861
-watcher/decision_engine/model/notification/nova.py,sha256=hUPJQWvgVxahdrWni8aiZPZsBQ9P8JBFjS6jZ4WacPs,15223
+watcher/decision_engine/model/notification/nova.py,sha256=x7kGz1QZy7FiUfXbZnlgdk1nznk-jgboaYSODlD-qgE,15231
 watcher/decision_engine/planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/decision_engine/planner/base.py,sha256=BqyOPXKt5LVyiyAqEtOqvxojSi_NWtMTaMYPsfEPA9g,3043
 watcher/decision_engine/planner/manager.py,sha256=vznpcCBGnAChEevX_X32v0wuBuNlsYigV4Qc7GF3PYY,992
@@ -272,7 +272,7 @@ watcher/decision_engine/strategy/strategies/saving_energy.py,sha256=dpl5vjXlFCd1
 watcher/decision_engine/strategy/strategies/storage_capacity_balance.py,sha256=7wOCAlSlBccRew6uzlZSU4NNsyN1aW44163DMLuLgpI,15588
 watcher/decision_engine/strategy/strategies/uniform_airflow.py,sha256=f1TERvtj7ZcL9NOUcQX2FYd77o4aFWRsjOj3YxdcxS0,13345
 watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py,sha256=cQLAppqzAGskGEE8VkJFGHzEA6XAPqyoXtg9OmzghXw,27135
-watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=GQkai1p7UlkwOucFQcVAUPTqpA6IHl5ArhDBNPfNV2E,15846
+watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=taEvebcCZL7s-9z2goGHHOpP5PUE8JktfDRkrFdv04I,17596
 watcher/decision_engine/strategy/strategies/workload_stabilization.py,sha256=0Sg_WSEHbypRuclkDRC9rLAzH6v3T-wr_lMy4jtEU1U,25392
 watcher/decision_engine/strategy/strategies/zone_migration.py,sha256=Uj1hLXQO2o67OkVF-6BZDx46wJUIpBk4ShIxcqBQWKo,36168
 watcher/hacking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -377,7 +377,7 @@ watcher/tests/unit/common/test_nova_helper.py,sha256=3Hqu1IZ20RGg3foFgV3YpyNLbSX
 watcher/tests/unit/common/test_oslo_service_helper.py,sha256=X3M23ld-l4dB3HeGf-QGYUGvGWq0pvrbMjtu5OWYO94,1682
 watcher/tests/unit/common/test_placement_helper.py,sha256=wXxvNjwCVerTC8uyjbHXgSHJ4Ajr5pCYP2FexlyXSFc,11740
 watcher/tests/unit/common/test_scheduling.py,sha256=qKGYuwBmTit0tmAPNAfxSfoWh67cnlfOKdde9shq9SI,2240
-watcher/tests/unit/common/test_service.py,sha256=0siJCx2sY3pVej2C42YjK14pHzpGaFhGJkxN2TPfWjw,15251
+watcher/tests/unit/common/test_service.py,sha256=4BQ--qhdBoDqnVxcHltJP3YLya1JQb6KbHjU-d726SQ,16117
 watcher/tests/unit/common/test_utils.py,sha256=P718Ob2VG9ps3rl2go_SKTeL3lYI-AKL1YfOxuLLUno,1702
 watcher/tests/unit/common/utils.py,sha256=zkkQeeR9vmE7drsvGMN8q4sXbluCi0KSL23A2puOtx8,6169
 watcher/tests/unit/common/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -419,7 +419,7 @@ watcher/tests/unit/decision_engine/audit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 watcher/tests/unit/decision_engine/audit/test_audit_handlers.py,sha256=wVTW722VhoWNx17jEBYyf6ZHu5bF7LBG7uouC_8NwZY,25408
 watcher/tests/unit/decision_engine/cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/unit/decision_engine/cluster/test_cinder_cdmc.py,sha256=uPPBs5mpSM0U3csQ14eMw5cMXsALMREHbRyOdtzN9F8,5259
-watcher/tests/unit/decision_engine/cluster/test_cluster_data_model_collector.py,sha256=c0bGfkCGPPrISk5X0dNOratz9DyGjs2vCiTjGBQl9ao,3013
+watcher/tests/unit/decision_engine/cluster/test_cluster_data_model_collector.py,sha256=VQ-5NfmpqtzwUCv8wEJwRJZL3E-afBFj_L5pTbxJQfo,5770
 watcher/tests/unit/decision_engine/cluster/test_nova_cdmc.py,sha256=QeMXtRitVMpK7wZGWkPrURVIGQRdnwEK9AKyusRdmpI,32796
 watcher/tests/unit/decision_engine/datasources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/unit/decision_engine/datasources/test_aetos_helper.py,sha256=xMYx5V-3j-DHodQXTHmQnFWxBCP0hlRknXlQy97X_tU,2138
@@ -469,8 +469,8 @@ watcher/tests/unit/decision_engine/model/data/storage_scenario_1.xml,sha256=bB_G
 watcher/tests/unit/decision_engine/model/notification/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/unit/decision_engine/model/notification/fake_managers.py,sha256=CTVikb7tmRPcYNPnbRkMZYPljrwloq9szEadb1ueBaE,2287
 watcher/tests/unit/decision_engine/model/notification/test_cinder_notifications.py,sha256=gOCS1hwnv4lNJMxXLa-EMwOIGIuvgLHJxOLxN9hw4kE,30558
-watcher/tests/unit/decision_engine/model/notification/test_notifications.py,sha256=-RaWNiD2E0vRl5ICIoHO_Gy8C_19il9hJRDk9thu5kk,3669
-watcher/tests/unit/decision_engine/model/notification/test_nova_notifications.py,sha256=PtU0AracAVgGj1bIgwzbtytMfzuAK0LOvlnQJfCFa4c,38650
+watcher/tests/unit/decision_engine/model/notification/test_notifications.py,sha256=icZH8XjoS8nWFsn6ZjKBx0bsB7_ESKrg_g0kyeDn4Vg,3677
+watcher/tests/unit/decision_engine/model/notification/test_nova_notifications.py,sha256=zq5bnJj0Yj21qI50DmYTY_dYo1hSUKCOQ5mU-LSNkVE,39050
 watcher/tests/unit/decision_engine/model/notification/data/capacity.json,sha256=CA-SuGK3Pu0guK9YKg-bR1a_Ek0QOPCG-EeyqTXYadw,318
 watcher/tests/unit/decision_engine/model/notification/data/instance-create-end.json,sha256=aWw_hqFNqosDisDNqPkwlEwxS3fGWtnu6mnYnuMxy0U,4171
 watcher/tests/unit/decision_engine/model/notification/data/instance-delete-end.json,sha256=sgRs0KW-DGncU59d2e5PvG7CsSPYAwKxnOWeV7bx0BI,1726
@@ -551,7 +551,7 @@ watcher/tests/unit/decision_engine/strategy/strategies/test_storage_capacity_bal
 watcher/tests/unit/decision_engine/strategy/strategies/test_strategy_endpoint.py,sha256=kbScw8qxt_Rw1eb5we5b6PgZ7VeqK007l2ogLddg4lA,2865
 watcher/tests/unit/decision_engine/strategy/strategies/test_uniform_airflow.py,sha256=GLrs8Le9xY7CUaZWbJEYl7vvTOi0X_K4stqLoNRLYWc,7225
 watcher/tests/unit/decision_engine/strategy/strategies/test_vm_workload_consolidation.py,sha256=KU7IDQeF3vspveqFlYqZ-tmtn6cvgqhv2BSJFjnZ5Ec,19154
-watcher/tests/unit/decision_engine/strategy/strategies/test_workload_balance.py,sha256=tqIEBlGqqpA9RF6TPFrILSGfz2Wvx7ELnnvffRfiYjE,8339
+watcher/tests/unit/decision_engine/strategy/strategies/test_workload_balance.py,sha256=FG-FzlaIOPIzUUibGSlG7r_nCcm0oYEnbdTysgsRBYQ,8555
 watcher/tests/unit/decision_engine/strategy/strategies/test_workload_stabilization.py,sha256=U7dMJuSlcXhTB7wsoGl0LHQhpW6pbmUrGHf4J0GrObw,14556
 watcher/tests/unit/decision_engine/strategy/strategies/test_zone_migration.py,sha256=aBsI2pSQJWlC3-qReJvmc7yFtdF-6TLw8Bn_EaHv6iA,85348
 watcher/tests/unit/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -575,9 +575,9 @@ watcher/tests/unit/objects/test_strategy.py,sha256=xPMHVzmcKaMaCluF7IG891266Ylzz
 watcher/tests/unit/objects/utils.py,sha256=K2L0PRggr5_iwPyxLvqonL2y10EMAp2FYnhpJCu78aU,8063
 watcher/wsgi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/wsgi/api.py,sha256=F1s1Q_CMuRdgS_f7Gl3XzavjZqdxqO9IHLxSWl6NOO4,789
-python_watcher-16.0.0.dist-info/METADATA,sha256=G4-VxxpVhSaVkvSIF0a84rS7k1O-QMTXkkTbOTH-gNA,3895
-python_watcher-16.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_watcher-16.0.0.dist-info/entry_points.txt,sha256=TAIOgRZMToICTZ6FEGRIRfitQGXlta1r_TUvRc8iv0Y,4542
-python_watcher-16.0.0.dist-info/pbr.json,sha256=H1or3vocXQIvOqKI-UHnLBwCzS6ZXUgPWhsPGukInh4,47
-python_watcher-16.0.0.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
-python_watcher-16.0.0.dist-info/RECORD,,
+python_watcher-16.0.1.dist-info/METADATA,sha256=FKxXjHp0iGB7G12hz6QoJ6Dz9IvEy1vdPLgHGHjRw0Q,3895
+python_watcher-16.0.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_watcher-16.0.1.dist-info/entry_points.txt,sha256=TAIOgRZMToICTZ6FEGRIRfitQGXlta1r_TUvRc8iv0Y,4542
+python_watcher-16.0.1.dist-info/pbr.json,sha256=8CUskEFHoMYPz_b6C9AEAB_Ppo8tlDtUeeepmzPtMBQ,47
+python_watcher-16.0.1.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
+python_watcher-16.0.1.dist-info/RECORD,,

{python_watcher-16.0.0.dist-info → python_watcher-16.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_watcher-16.0.1.dist-info/pbr.json

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

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:

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.

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,

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:

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()

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 "

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,

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]))

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):
 

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):

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
 
 

watcher/tests/unit/decision_engine/model/notification/test_nova_notifications.py

@@ -27,6 +27,7 @@ from watcher.common import exception
 from watcher.common import nova_helper
 from watcher.common import placement_helper
 from watcher.common import service as watcher_service
+from watcher.decision_engine.model.collector import base
 from watcher.decision_engine.model import element
 from watcher.decision_engine.model.notification import nova as novanotification
 from watcher.tests.unit import base as base_test
@@ -111,6 +112,19 @@ class TestReceiveNovaNotifications(NotificationTestCase):
                 expected_message, self.FAKE_METADATA)
 
 
+class DummyClusterDataModelCollector(base.BaseClusterDataModelCollector):
+    @property
+    def notification_endpoints(self):
+        return []
+
+    def get_audit_scope_handler(self, audit_scope):
+        return None
+
+    def execute(self):
+        # Return none since there are not audits
+        return
+
+
 @ddt.ddt
 class TestNovaNotifications(NotificationTestCase):
 
@@ -906,8 +920,9 @@ class TestNovaNotifications(NotificationTestCase):
     def test_info_no_cdm(self):
         # Tests that a notification is received before an audit has been
         # performed which would create the nova CDM.
-        mock_collector = mock.Mock(cluster_data_model=None)
-        handler = novanotification.VersionedNotification(mock_collector)
+        m_config = mock.Mock()
+        _collector = DummyClusterDataModelCollector(config=m_config)
+        handler = novanotification.VersionedNotification(_collector)
         payload = {
             'nova_object.data': {
                 'uuid': '9966d6bd-a45c-4e1c-9d57-3054899a3ec7',

watcher/tests/unit/decision_engine/strategy/strategies/test_workload_balance.py

@@ -117,10 +117,17 @@ class TestWorkloadBalance(TestBaseStrategy):
                       'Higher than threshold 25.0: True'),
             mock.call('Host usage for Node_1: host_cpu_usage_percent is 7.5. '
                       'Higher than threshold 25.0: False'),
-            mock.call('Host hostname_1 evaluated as destination for '
-                      '73b09e16-35b7-4922-804e-e8f5d9b740fc. Host usage for '
-                      'cpu would be 20.0.The threshold is: 25.0. selected: '
-                      'True')]
+            mock.call(
+                'Host %s evaluated as destination for %s. '
+                'Host usage for cpu would be %s.'
+                'The threshold is: %s. selected: %s',
+                'hostname_1',
+                '73b09e16-35b7-4922-804e-e8f5d9b740fc',
+                20.0,
+                25.0,
+                True,
+            ),
+        ]
         mock_debug.assert_has_calls(expected_calls, any_order=True)
 
     @mock.patch.object(workload_balance.LOG, 'debug', autospec=True)
@@ -143,10 +150,17 @@ class TestWorkloadBalance(TestBaseStrategy):
                       '37.121212121212125. Higher than threshold 30.0: True'),
             mock.call('Host usage for Node_1: host_ram_usage_percent is '
                       '18.181818181818183. Higher than threshold 30.0: False'),
-            mock.call('Host hostname_1 evaluated as destination for '
-                      '73b09e16-35b7-4922-804e-e8f5d9b740fc. Host usage for '
-                      'ram would be 25.0.The threshold is: 30.0. selected: '
-                      'True')]
+            mock.call(
+                'Host %s evaluated as destination for %s. '
+                'Host usage for ram would be %s.'
+                'The threshold is: %s. selected: %s',
+                'hostname_1',
+                '73b09e16-35b7-4922-804e-e8f5d9b740fc',
+                25.0,
+                30.0,
+                True,
+            ),
+        ]
         mock_debug.assert_has_calls(expected_calls, any_order=True)
 
     def test_execute_no_workload(self):

python_watcher-16.0.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "336ef360", "is_release": true}