]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13790 from shinobu-x/wip-18298-kraken
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 13 Apr 2017 14:43:50 +0000 (16:43 +0200)
committerGitHub <noreply@github.com>
Thu, 13 Apr 2017 14:43:50 +0000 (16:43 +0200)
kraken: mon: force_create_pg could leave pg stuck in creating state

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
16 files changed:
1  2 
src/common/WorkQueue.cc
src/librbd/internal.cc
src/mds/MDSRank.cc
src/mds/Server.cc
src/mon/OSDMonitor.cc
src/os/filestore/FileStore.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osdc/ObjectCacher.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc
src/test/librbd/test_librbd.cc
src/test/rbd_mirror/test_ImageReplayer.cc

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