]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSD: disable the PGStatsAck timeout when we are reconnecting to a monitor 1314/head
authorGreg Farnum <greg@inktank.com>
Wed, 12 Feb 2014 19:30:15 +0000 (11:30 -0800)
committerGreg Farnum <greg@inktank.com>
Tue, 25 Feb 2014 19:40:32 +0000 (11:40 -0800)
commit37fbcb958f79bbfcba57c516b4862a14c52be398
tree22c48e1d669f7900515103bff27fbb153a74ee0a
parent9be395e870c50d97604ef41f17667cc566fd84e1
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>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 64cedf6fa3ee309cc96554286bfb805e4ca89439)

Conflicts:

src/osd/OSD.cc
src/osd/OSD.cc
src/osd/OSD.h