RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34705 from bk201/wip-45149

Browse Source 
mgr/dashboard: fixing RBD purge error in backend

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
This commit is contained in:
Laura Paduano 2020-04-27 10:09:55 +02:00 committed by GitHub
commit 63d690fcc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pybind/mgr/dashboard/controllers/rbd.py
View File

@ -3,6 +3,7 @@
# pylint: disable=too-many-statements,too-many-branches
from __future__ import absolute_import
import logging
import math
from functools import partial
from datetime import datetime
@ -21,6 +22,8 @@ from ..tools import ViewCache, str_to_bool
from ..services.exception import handle_rados_error, handle_rbd_error, \
serialize_dashboard_exception
logger = logging.getLogger(__name__)
# pylint: disable=not-callable
def RbdTask(name, metadata, wait_for): # noqa: N802
@ -363,12 +366,14 @@ class RbdTrash(RESTController):
@DeletePermission
def purge(self, pool_name=None):
"""Remove all expired images from trash."""
now = "{}Z".format(datetime.now().isoformat())
now = "{}Z".format(datetime.utcnow().isoformat())
pools = self._trash_list(pool_name)
for pool in pools:
for image in pool['value']:
if image['deferment_end_time'] < now:
logger.info('Removing trash image %s (pool=%s, namespace=%s, name=%s)',
image['id'], pool['pool_name'], image['namespace'], image['name'])
rbd_call(pool['pool_name'], image['namespace'],
self.rbd_inst.trash_remove, image['id'], 0)