]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #29735 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 16 Sep 2019 20:02:03 +0000 (13:02 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 16 Sep 2019 20:02:03 +0000 (13:02 -0700)
commitfbfce1ad7a275813259a7f934b3232b249f5b6f8
tree1b0bb1745a54b99f8e8bed7b3ce396a2e9c871f6
parent1db3f88f80964503264ea8e771affc964b707fad
parent387746ca7e5a0a529afbb5864900efa3219de3a8
Merge PR #29735 into master

* refs/pull/29735/head:
mgr/volumes: cluster log when a purge thread bails out
mgr/volumes: retry purging trash entries on intermittent error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/pybind/mgr/volumes/fs/volume.py