From 7ecc99753c7f8cb6a7aea7e57157d07685e385bc Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 3 Mar 2026 11:37:54 -0500 Subject: [PATCH] pybind/mgr: call new _ceph_exit for killpoints Fixes: https://tracker.ceph.com/issues/74605 Fixes: 78983ad0d0cce422da32dc4876ac186f6d32c3f5 Fixes: ceph/ceph.git#66244 Signed-off-by: Patrick Donnelly (cherry picked from commit b286ca57ad189dec421b6cd71a6f5b5e0327e401) --- src/pybind/mgr/mgr_module.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index b872c2c8e7a3..368639587928 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -36,7 +36,6 @@ import threading from collections import defaultdict from contextlib import contextmanager from enum import IntEnum, Enum -import os import rados import re import socket @@ -1272,16 +1271,16 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): db.execute('BEGIN;') self.create_skeleton_schema(db) if kv == 1: - os._exit(120) + return self._ceph_exit(120, hard=True) cur = db.execute(SQL) row = cur.fetchone() self.maybe_upgrade(db, int(row['value'])) assert cur.fetchone() is None cur.close() if kv == 2: - os._exit(120) + return self._ceph_exit(120, hard=True) if kv == 3: - os._exit(120) + return self._ceph_exit(120, hard=True) def configure_db(self, db: sqlite3.Connection) -> None: db.execute('PRAGMA FOREIGN_KEYS = 1') -- 2.47.3