]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #7629 from ceph/wip-14750-op-timeouts
authorGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:39:55 +0000 (20:39 -0800)
committerGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:39:55 +0000 (20:39 -0800)
commitfd4d97c027c7019bae5a5e72715ad10cd7edbcfa
tree7bb0f70426638fe53271eb682ba353e9362c478a
parent0284090464a144ee9cdbe74733b5579a5402fa05
parent892c1448c2afbca05dd7f3899afd2c3187e536b9
Merge pull request #7629 from ceph/wip-14750-op-timeouts

Objecter: detect laggy ops with objecter_timeout, not osd_timeout

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>