]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Objecter: implement mon and osd operation timeouts
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 4 Feb 2014 01:59:21 +0000 (17:59 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 10 Feb 2014 23:45:24 +0000 (15:45 -0800)
commit30dafacd0b54bb98b01284851e0d5abf76324e95
tree91661023fb36d159a27ca87b4bf11a62aaffb836
parent2aa0d7589283fe5879a966601fbfe690816cc4a1
Objecter: implement mon and osd operation timeouts

This captures almost all operations from librados other than mon_commands().

Get the values for the timeouts from the Objecter constructor, so only
librados uses them.

Add C_Cancel_*_Op, finish_*_op(), and *_op_cancel() for each type of
operation, to mirror those for Op. Create a callback and schedule it
in the existing timer thread if the timeouts are specified.

Fixes: #6507
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit 3e1f7bbb4217d322f4e0ece16e676cd30ee42a20)

Conflicts:
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osdc/Objecter.cc
src/osdc/Objecter.h
src/client/Client.cc
src/librados/RadosClient.cc
src/mds/Dumper.cc
src/mds/MDS.cc
src/mds/Resetter.cc
src/osd/ReplicatedPG.cc
src/osdc/Objecter.cc
src/osdc/Objecter.h
src/test/mon/test_mon_workloadgen.cc