]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #31778 into master
authorSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:30:28 +0000 (20:30 -0600)
committerSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:30:28 +0000 (20:30 -0600)
commitd6f59188504c88294028f7152fa2f71c14fddd5e
treed3f3e35b9e7a586fefd159a9762ffa172e727b3b
parent130b7e75c2482e72a75f20d6e981da47527dbeeb
parent57acecb27c4a12d67010f6681a518c25a72c00a8
Merge PR #31778 into master

* refs/pull/31778/head:
os/bluestore: pin onodes as they are added to the cache
Revert "Revert "Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned""

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h