Merge pull request #6708 from xiaoxichen/shutdown_when_flipping

osd: shut down if we flap too many times in a short period

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

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

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

diff --cc src/test/CMakeLists.txt
Simple merge

diff --cc src/test/Makefile.am
Simple merge