From 9520ba3f8b2430386f44592eef7983ba65a1c28e Mon Sep 17 00:00:00 2001 From: Luis Eduardo Bonatti Date: Wed, 20 Aug 2025 13:38:14 +0000 Subject: [PATCH] Revert "Make configure_logging more robust." This reverts commit fedd7d1995b7890135fe55fb8496106066039c42. Reason for revert: Activate rollback is broken with this change. Reverting to cover the rollback scenario as well. Change-Id: I10163cf3e2c4a532d351cb952c7dbd4484661816 Signed-off-by: Luis Eduardo Bonatti --- software/scripts/create-postgres-database | 2 +- software/scripts/deploy-precheck | 2 +- software/scripts/deploy-start | 2 +- software/scripts/major-release-upload | 2 +- software/scripts/prepare-chroot-mounts | 2 +- software/scripts/prepare-data-migration | 2 +- software/scripts/remove-temporary-data | 2 +- software/scripts/sync-controllers-feed | 2 +- software/scripts/upgrade_utils.py | 6 +++--- software/software/lvm_snapshot.py | 2 +- software/software/utilities/activate.py | 4 ++-- software/software/utilities/activate_rollback.py | 2 +- software/software/utilities/deploy_delete.py | 2 +- software/software/utilities/migrate.py | 2 +- software/software/utilities/utils.py | 6 +++--- software/upgrade-scripts/04-remove-mgmt-node-addresses.py | 2 +- software/upgrade-scripts/05-remove-admin-node-addresses.py | 2 +- software/upgrade-scripts/06-remove_legacy_upgrade_tables.py | 2 +- .../upgrade-scripts/07-populate-ihost-sw-version-field.py | 2 +- software/upgrade-scripts/08-activate-keystone.py | 2 +- .../upgrade-scripts/09-remove-storage-node-addresses.py | 2 +- .../10-add-mgmt-ip-to-kube-apiserver-cert.py | 2 +- software/upgrade-scripts/11-update-static-hieradata.py | 2 +- software/upgrade-scripts/12-update-registry-central.py | 2 +- .../120-kubernetes-service-parameters-apply.py | 2 +- software/upgrade-scripts/13-update-host-address.py | 2 +- software/upgrade-scripts/18-disable-portieris-webhook.py | 2 +- software/upgrade-scripts/197-reset-config-target.py | 2 +- software/upgrade-scripts/198-update-isystem-data.py | 2 +- .../upgrade-scripts/199-reconfigure-keystone-endpoints.py | 2 +- software/upgrade-scripts/20-enable-fluxcd-controllers.py | 2 +- software/upgrade-scripts/202-remove-lvm-snapshots.py | 2 +- software/upgrade-scripts/21-k8s-app-upgrade.py | 2 +- software/upgrade-scripts/22-rollback-fluxcd-controllers.py | 2 +- software/upgrade-scripts/25-update-rate-limit.py | 2 +- software/upgrade-scripts/26-clean-up-deployment-data.py | 2 +- software/upgrade-scripts/27-reconfigure-ipsec.py | 2 +- 37 files changed, 42 insertions(+), 42 deletions(-) diff --git a/software/scripts/create-postgres-database b/software/scripts/create-postgres-database index 930e1eea..6b55951f 100644 --- a/software/scripts/create-postgres-database +++ b/software/scripts/create-postgres-database @@ -119,7 +119,7 @@ class PostgresDatabase: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) port = None error = False diff --git a/software/scripts/deploy-precheck b/software/scripts/deploy-precheck index ca395f2b..4b09393a 100644 --- a/software/scripts/deploy-precheck +++ b/software/scripts/deploy-precheck @@ -513,5 +513,5 @@ def main(argv=None): if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) sys.exit(main()) diff --git a/software/scripts/deploy-start b/software/scripts/deploy-start index 13bc4aa3..4986c489 100755 --- a/software/scripts/deploy-start +++ b/software/scripts/deploy-start @@ -202,7 +202,7 @@ class DeployStart: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) from_version = None to_version = None diff --git a/software/scripts/major-release-upload b/software/scripts/major-release-upload index fb6c5a8f..5abfd156 100644 --- a/software/scripts/major-release-upload +++ b/software/scripts/major-release-upload @@ -388,5 +388,5 @@ def main(): if __name__ == "__main__": - upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) sys.exit(main()) diff --git a/software/scripts/prepare-chroot-mounts b/software/scripts/prepare-chroot-mounts index adb7da81..56f633f3 100644 --- a/software/scripts/prepare-chroot-mounts +++ b/software/scripts/prepare-chroot-mounts @@ -110,7 +110,7 @@ class ChrootMounts: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) checkout_dir = None operation = None diff --git a/software/scripts/prepare-data-migration b/software/scripts/prepare-data-migration index 41c5fe0f..29baa5d2 100644 --- a/software/scripts/prepare-data-migration +++ b/software/scripts/prepare-data-migration @@ -340,5 +340,5 @@ def main(sys_argv): if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) sys.exit(main(sys.argv)) diff --git a/software/scripts/remove-temporary-data b/software/scripts/remove-temporary-data index ebcf270d..93d936cd 100644 --- a/software/scripts/remove-temporary-data +++ b/software/scripts/remove-temporary-data @@ -111,7 +111,7 @@ class RemoveTemporaryData: if __name__ == "__main__": - upgrade_utils.configure_logging("/var/log/software.log", LOG, log_level=logging.INFO) + upgrade_utils.configure_logging("/var/log/software.log", log_level=logging.INFO) checkout_dir = None for arg in range(1, len(sys.argv)): diff --git a/software/scripts/sync-controllers-feed b/software/scripts/sync-controllers-feed index 6b6d1eec..7801f696 100644 --- a/software/scripts/sync-controllers-feed +++ b/software/scripts/sync-controllers-feed @@ -98,5 +98,5 @@ def main(sys_argv): return 1 if __name__ == "__main__": - upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) sys.exit(main(sys.argv)) diff --git a/software/scripts/upgrade_utils.py b/software/scripts/upgrade_utils.py index 86ce3aa6..bf2a284a 100644 --- a/software/scripts/upgrade_utils.py +++ b/software/scripts/upgrade_utils.py @@ -178,7 +178,7 @@ def get_system_info(sysinv_client): return system_info.system_type, system_info.system_mode -def configure_logging(filename, logger, log_level=logging.INFO): +def configure_logging(filename, log_level=logging.INFO): read_log_config() my_exec = os.path.basename(sys.argv[0]) @@ -187,10 +187,10 @@ def configure_logging(filename, logger, log_level=logging.INFO): log_format = log_format.replace('%(exec)s', my_exec) formatter = logging.Formatter(log_format, datefmt="%FT%T") - logger.setLevel(log_level) + LOG.setLevel(log_level) main_log_handler = logging.FileHandler(filename) main_log_handler.setFormatter(formatter) - logger.addHandler(main_log_handler) + LOG.addHandler(main_log_handler) def get_platform_conf(key): diff --git a/software/software/lvm_snapshot.py b/software/software/lvm_snapshot.py index 0597b689..cdd0104f 100644 --- a/software/software/lvm_snapshot.py +++ b/software/software/lvm_snapshot.py @@ -503,5 +503,5 @@ def main(): if __name__ == "__main__": import upgrade_utils # pylint: disable=E0401 - upgrade_utils.configure_logging('/var/log/software.log', LOG, log_level=logging.INFO) + upgrade_utils.configure_logging('/var/log/software.log', log_level=logging.INFO) sys.exit(main()) diff --git a/software/software/utilities/activate.py b/software/software/utilities/activate.py index fda62edb..098de942 100644 --- a/software/software/utilities/activate.py +++ b/software/software/utilities/activate.py @@ -5,7 +5,7 @@ # import argparse -import logging as log +from oslo_log import log from software.states import DEPLOY_STATES from software.utilities.update_deploy_state import update_deploy_state @@ -50,7 +50,7 @@ def do_activate(from_release, to_release, is_major_release): def activate(): # this is the entry point to start activate - configure_logging(LOG) + configure_logging() parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/activate_rollback.py b/software/software/utilities/activate_rollback.py index 249b52da..5626cac3 100644 --- a/software/software/utilities/activate_rollback.py +++ b/software/software/utilities/activate_rollback.py @@ -40,7 +40,7 @@ def do_activate_rollback(from_release, to_release): def activate_rollback(): # this is the entry point to start activate-rollback - configure_logging(LOG) + configure_logging() parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/deploy_delete.py b/software/software/utilities/deploy_delete.py index 1c0e75c0..b5ccf0ea 100644 --- a/software/software/utilities/deploy_delete.py +++ b/software/software/utilities/deploy_delete.py @@ -44,7 +44,7 @@ def do_deploy_delete(from_release, to_release, plugin_path, is_major_release): def deploy_delete(): # this is the entry point to deploy delete plugin - utils.configure_logging(LOG) + utils.configure_logging() parser = argparse.ArgumentParser(add_help=False) plugin_path = os.environ.get('plugin_path') diff --git a/software/software/utilities/migrate.py b/software/software/utilities/migrate.py index c1a73c43..2baa7d5c 100644 --- a/software/software/utilities/migrate.py +++ b/software/software/utilities/migrate.py @@ -843,7 +843,7 @@ def upgrade_controller(from_release, to_release, target_port): def migrate(): # this is the entry point to start data migration - configure_logging(LOG) + configure_logging() parser = argparse.ArgumentParser(add_help=False) parser.add_argument("from_release", diff --git a/software/software/utilities/utils.py b/software/software/utilities/utils.py index d88ca725..8d99294c 100644 --- a/software/software/utilities/utils.py +++ b/software/software/utilities/utils.py @@ -42,7 +42,7 @@ ACTION_ACTIVATE_ROLLBACK = "activate-rollback" ACTION_DELETE = "delete" -def configure_logging(logger): +def configure_logging(): cfg.read_config() my_exec = os.path.basename(sys.argv[0]) @@ -51,10 +51,10 @@ def configure_logging(logger): log_format = log_format.replace('%(exec)s', my_exec) formatter = logging.Formatter(log_format, datefmt="%FT%T") - logger.setLevel(logging.INFO) + LOG.setLevel(logging.INFO) main_log_handler = logging.FileHandler(SOFTWARE_LOG_FILE) main_log_handler.setFormatter(formatter) - logger.addHandler(main_log_handler) + LOG.addHandler(main_log_handler) def get_migration_scripts(migration_script_dir): diff --git a/software/upgrade-scripts/04-remove-mgmt-node-addresses.py b/software/upgrade-scripts/04-remove-mgmt-node-addresses.py index 6e7faaf3..f0ba3cef 100644 --- a/software/upgrade-scripts/04-remove-mgmt-node-addresses.py +++ b/software/upgrade-scripts/04-remove-mgmt-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/05-remove-admin-node-addresses.py b/software/upgrade-scripts/05-remove-admin-node-addresses.py index 13ab0f3b..42a2c3ba 100644 --- a/software/upgrade-scripts/05-remove-admin-node-addresses.py +++ b/software/upgrade-scripts/05-remove-admin-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py b/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py index 2a8e25c3..4f3f290d 100644 --- a/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py +++ b/software/upgrade-scripts/06-remove_legacy_upgrade_tables.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/07-populate-ihost-sw-version-field.py b/software/upgrade-scripts/07-populate-ihost-sw-version-field.py index 4139e05f..b4222b48 100644 --- a/software/upgrade-scripts/07-populate-ihost-sw-version-field.py +++ b/software/upgrade-scripts/07-populate-ihost-sw-version-field.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/08-activate-keystone.py b/software/upgrade-scripts/08-activate-keystone.py index 581964ea..1727a8f9 100755 --- a/software/upgrade-scripts/08-activate-keystone.py +++ b/software/upgrade-scripts/08-activate-keystone.py @@ -58,7 +58,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) res = 0 diff --git a/software/upgrade-scripts/09-remove-storage-node-addresses.py b/software/upgrade-scripts/09-remove-storage-node-addresses.py index 10e06987..696e4cf5 100644 --- a/software/upgrade-scripts/09-remove-storage-node-addresses.py +++ b/software/upgrade-scripts/09-remove-storage-node-addresses.py @@ -47,7 +47,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py b/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py index 83f2d3a5..ab925c53 100644 --- a/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py +++ b/software/upgrade-scripts/10-add-mgmt-ip-to-kube-apiserver-cert.py @@ -75,7 +75,7 @@ def main(): return ERROR arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/11-update-static-hieradata.py b/software/upgrade-scripts/11-update-static-hieradata.py index bcbe794a..577ca3aa 100755 --- a/software/upgrade-scripts/11-update-static-hieradata.py +++ b/software/upgrade-scripts/11-update-static-hieradata.py @@ -44,7 +44,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/12-update-registry-central.py b/software/upgrade-scripts/12-update-registry-central.py index f1a1b8cb..d57edbb6 100755 --- a/software/upgrade-scripts/12-update-registry-central.py +++ b/software/upgrade-scripts/12-update-registry-central.py @@ -88,7 +88,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py b/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py index c8421804..301367d6 100644 --- a/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py +++ b/software/upgrade-scripts/120-kubernetes-service-parameters-apply.py @@ -191,7 +191,7 @@ def main(): return ERROR arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/13-update-host-address.py b/software/upgrade-scripts/13-update-host-address.py index bd2ac5a2..63a2c34e 100755 --- a/software/upgrade-scripts/13-update-host-address.py +++ b/software/upgrade-scripts/13-update-host-address.py @@ -39,7 +39,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() res = 0 LOG.info("%s invoked from_release = %s to_release = %s action = %s" diff --git a/software/upgrade-scripts/18-disable-portieris-webhook.py b/software/upgrade-scripts/18-disable-portieris-webhook.py index 55a5ef7f..c0aeb218 100644 --- a/software/upgrade-scripts/18-disable-portieris-webhook.py +++ b/software/upgrade-scripts/18-disable-portieris-webhook.py @@ -159,7 +159,7 @@ def main(): return ERROR arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s invoked to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/197-reset-config-target.py b/software/upgrade-scripts/197-reset-config-target.py index 94ae6aaa..d5eda058 100755 --- a/software/upgrade-scripts/197-reset-config-target.py +++ b/software/upgrade-scripts/197-reset-config-target.py @@ -40,7 +40,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.debug("%s invoked with from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/198-update-isystem-data.py b/software/upgrade-scripts/198-update-isystem-data.py index 472b6f3f..d2ff812f 100644 --- a/software/upgrade-scripts/198-update-isystem-data.py +++ b/software/upgrade-scripts/198-update-isystem-data.py @@ -40,7 +40,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() if action in ["activate", "activate-rollback"]: try: diff --git a/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py b/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py index afcb6229..9980e9b0 100644 --- a/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py +++ b/software/upgrade-scripts/199-reconfigure-keystone-endpoints.py @@ -58,7 +58,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() # Activate if action == 'activate': diff --git a/software/upgrade-scripts/20-enable-fluxcd-controllers.py b/software/upgrade-scripts/20-enable-fluxcd-controllers.py index adea661b..167f2221 100644 --- a/software/upgrade-scripts/20-enable-fluxcd-controllers.py +++ b/software/upgrade-scripts/20-enable-fluxcd-controllers.py @@ -40,7 +40,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() if action == 'activate' and from_release >= '21.12': LOG.info("%s invoked with from_release = %s to_release = %s " diff --git a/software/upgrade-scripts/202-remove-lvm-snapshots.py b/software/upgrade-scripts/202-remove-lvm-snapshots.py index 6799aaab..aa3d261c 100644 --- a/software/upgrade-scripts/202-remove-lvm-snapshots.py +++ b/software/upgrade-scripts/202-remove-lvm-snapshots.py @@ -61,7 +61,7 @@ def main(): return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info("%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)) diff --git a/software/upgrade-scripts/21-k8s-app-upgrade.py b/software/upgrade-scripts/21-k8s-app-upgrade.py index bdb6369c..5d6f9a2b 100644 --- a/software/upgrade-scripts/21-k8s-app-upgrade.py +++ b/software/upgrade-scripts/21-k8s-app-upgrade.py @@ -126,7 +126,7 @@ def check_apps_update_progress(client, action='update'): def main(): action = sys.argv[3] if action in ('activate', 'activate-rollback'): - configure_logging(LOG) + configure_logging() try: client = get_sysinv_client() update_operation_result = False diff --git a/software/upgrade-scripts/22-rollback-fluxcd-controllers.py b/software/upgrade-scripts/22-rollback-fluxcd-controllers.py index 2962aa5a..1722ac3b 100644 --- a/software/upgrade-scripts/22-rollback-fluxcd-controllers.py +++ b/software/upgrade-scripts/22-rollback-fluxcd-controllers.py @@ -243,7 +243,7 @@ def main(): print(f"Invalid option {sys.argv[arg]}") return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info("%s invoked with from_release %s to_release %s and action %s", sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/25-update-rate-limit.py b/software/upgrade-scripts/25-update-rate-limit.py index 38dcc491..00cf0931 100644 --- a/software/upgrade-scripts/25-update-rate-limit.py +++ b/software/upgrade-scripts/25-update-rate-limit.py @@ -32,7 +32,7 @@ PCI_CLASS = "pci-sriov" DEFAULT_POSTGRES_PORT = "5432" LOG = logging.getLogger('main_logger') -configure_logging(LOG) +configure_logging() def get_db_credentials(): diff --git a/software/upgrade-scripts/26-clean-up-deployment-data.py b/software/upgrade-scripts/26-clean-up-deployment-data.py index 86dbf846..19d18850 100644 --- a/software/upgrade-scripts/26-clean-up-deployment-data.py +++ b/software/upgrade-scripts/26-clean-up-deployment-data.py @@ -43,7 +43,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action) diff --git a/software/upgrade-scripts/27-reconfigure-ipsec.py b/software/upgrade-scripts/27-reconfigure-ipsec.py index 36fed2ad..8b49cc43 100644 --- a/software/upgrade-scripts/27-reconfigure-ipsec.py +++ b/software/upgrade-scripts/27-reconfigure-ipsec.py @@ -45,7 +45,7 @@ def main(): print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 - configure_logging(LOG) + configure_logging() LOG.info( "%s invoked from_release = %s to_release = %s action = %s" % (sys.argv[0], from_release, to_release, action)