From 5b6849e08e80506d558200dcf877cf430b0e1ac1 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Mon, 18 May 2020 20:59:31 +0300 Subject: [PATCH] mgr/rbd_support: rename "rbd_trash_trash_purge_schedule" oid to "rbd_trash_purge_schedule" Fixes: https://tracker.ceph.com/issues/45589 Signed-off-by: Mykola Golub --- PendingReleaseNotes | 16 ++++++++++++++++ .../mgr/rbd_support/trash_purge_schedule.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index dec53694ca777..a9862214da27c 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -369,3 +369,19 @@ the cluster, which could fill a nearly-full cluster. They have been replaced by a tool, currently considered experimental, ``rgw-orphan-list``. + +* RBD: The name of the rbd pool object that is used to store + rbd trash purge schedule is changed from "rbd_trash_trash_purge_schedule" + to "rbd_trash_purge_schedule". Users that have already started using + ``rbd trash purge schedule`` functionality and have per pool or namespace + schedules configured should copy "rbd_trash_trash_purge_schedule" + object to "rbd_trash_purge_schedule" before the upgrade and remove + "rbd_trash_purge_schedule" using the following commands in every RBD + pool and namespace where a trash purge schedule was previously + configured:: + + rados -p [-N namespace] cp rbd_trash_trash_purge_schedule rbd_trash_purge_schedule + rados -p [-N namespace] rm rbd_trash_trash_purge_schedule + + or use any other convenient way to restore the schedule after the + upgrade. diff --git a/src/pybind/mgr/rbd_support/trash_purge_schedule.py b/src/pybind/mgr/rbd_support/trash_purge_schedule.py index b7875c9866a4b..930607d484307 100644 --- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py +++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py @@ -14,7 +14,7 @@ from .schedule import LevelSpec, Interval, StartTime, Schedule, Schedules class TrashPurgeScheduleHandler: MODULE_OPTION_NAME = "trash_purge_schedule" - SCHEDULE_OID = "rbd_trash_trash_purge_schedule" + SCHEDULE_OID = "rbd_trash_purge_schedule" lock = Lock() condition = Condition(lock) -- 2.39.5