From ed0524606998847a7b1ea9103579d027db092e83 Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Thu, 30 Apr 2020 19:09:17 +0100 Subject: [PATCH] remove support of oslo.messaging 9.8.0 warning message This change removes support for supressing the heartbeat message from olso.messaging before 9.8.0 Change-Id: I2035d5df31e43b730cd472cc438ec863bb538d62 Related-Bug: #1825584 (cherry picked from commit ca2fe01cc1c73e9ca7b2376ea566db0fe45a44ea) --- nova/config.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/nova/config.py b/nova/config.py index 4fbb77e8540b..f39e8554d362 100644 --- a/nova/config.py +++ b/nova/config.py @@ -33,17 +33,8 @@ CONF = nova.conf.CONF def rabbit_heartbeat_filter(log_record): - - # Note the type in the log message was fixed in - # change Id11db4113c9b1c3add602192c1e915218704ef27 - # but we handle both form to allow this to be backported - # without consideration of the version of oslo.messaging used. - # TODO(sean-k-mooney): remove support for typo in follow up - # to allow this to be easily backported without modification. - messages = [ - "Unexpected error during heartbeart thread processing", - "Unexpected error during heartbeat thread processing"] - return not any(msg in log_record.msg for msg in messages) + message = "Unexpected error during heartbeat thread processing" + return message not in log_record.msg def parse_args(argv, default_config_files=None, configure_db=True,