]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
OSD: disable the PGStatsAck timeout when we are reconnecting to a monitor 1227/head
authorGreg Farnum <greg@inktank.com>
Wed, 12 Feb 2014 19:30:15 +0000 (11:30 -0800)
committerGreg Farnum <greg@inktank.com>
Thu, 13 Feb 2014 21:20:52 +0000 (13:20 -0800)
commit64cedf6fa3ee309cc96554286bfb805e4ca89439
tree777011044a6a94198c2934586f41c8f03160b0ef
parent794c86fd289bd62a35ed14368fa096c46736e9a2
OSD: disable the PGStatsAck timeout when we are reconnecting to a monitor

Previously, the timeout counter started as soon as we issued the reopen,
but if the reconnect process itself took a while, we might time out and
issue another reopen just as we get to the point where it's possible to
get work done. Since the mon client has its own reconnect timeouts (that is,
the OSD doesn't need to trigger those), we instead disable our timeouts
while the reconnect is happening, and then turn them back on again starting
from when we get the reconnect callback.

Signed-off-by: Greg Farnum <greg@inktank.com>
src/osd/OSD.cc
src/osd/OSD.h