]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osdc/Objecter: fix command op cancellation race 2498/head
authorSage Weil <sage@redhat.com>
Mon, 15 Sep 2014 23:45:19 +0000 (16:45 -0700)
committerSage Weil <sage@redhat.com>
Mon, 15 Sep 2014 23:45:19 +0000 (16:45 -0700)
commit56ba3411745ac4f70f3b4f7843c04a5c33c0b842
tree25db8ef88e0307a43c5de296af12883e662b66ef
parentbaf7be9d30ecf270eaa9ed3f16f48f9b6f65d6e5
osdc/Objecter: fix command op cancellation race

Cancel the command op timeout event before we clear out the op from the
session struct.  This isn't strictly necessary because command_op_cancel
will "gracefully" handle the case where the tid is no longer present, but
this avoids that noise and is cleaner.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osdc/Objecter.cc