]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14760 from dzafman/wip-19657
authorJosh Durgin <jdurgin@redhat.com>
Thu, 29 Jun 2017 21:00:18 +0000 (14:00 -0700)
committerGitHub <noreply@github.com>
Thu, 29 Jun 2017 21:00:18 +0000 (14:00 -0700)
osd: On EIO from read recover the primary replica from another copy

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
14 files changed:
1  2 
qa/tasks/radosbench.py
src/ceph_mon.cc
src/common/config_opts.h
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/os/filestore/FileStore.cc
src/os/filestore/FileStore.h
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h
src/osd/osd_types.cc
src/osd/osd_types.h

Simple merge
diff --cc src/ceph_mon.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
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
Simple merge