]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #17839 from liewegas/wip-recovery-preemption
authorSage Weil <sage@newdream.net>
Thu, 28 Sep 2017 19:14:01 +0000 (14:14 -0500)
committerGitHub <noreply@github.com>
Thu, 28 Sep 2017 19:14:01 +0000 (14:14 -0500)
osd: allow PG recovery scheduling preemption

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mgr/DaemonServer.cc
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h
src/vstart.sh

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