]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13723 from ovh/bp-forced-recovery
authorSage Weil <sage@newdream.net>
Mon, 24 Jul 2017 14:01:03 +0000 (09:01 -0500)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 14:01:03 +0000 (09:01 -0500)
osd/PG: make prioritized recovery possible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
12 files changed:
1  2 
qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
qa/suites/upgrade/jewel-x/stress-split-erasure-code/3-thrash/default.yaml
qa/suites/upgrade/jewel-x/stress-split/3-thrash/default.yaml
qa/suites/upgrade/kraken-x/stress-split-erasure-code/3-thrash/default.yaml
qa/suites/upgrade/kraken-x/stress-split/3-thrash/default.yaml
qa/tasks/ceph_manager.py
src/mgr/DaemonServer.cc
src/mgr/MgrCommands.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PrimaryLogPG.cc

Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge