]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a336291) | patch
osdc/Objecter: upper bound watch_check result 9400/head
authorSage Weil <sage@redhat.com>
Fri, 6 May 2016 13:09:43 +0000 (09:09 -0400)
committerVicente Cheng <freeze.bilsted@gmail.com>
Tue, 31 May 2016 02:46:19 +0000 (10:46 +0800)
commit410ff1528caafaec0cfd9ea6ee4b86ed6788b09d
tree1edc858188c014e2a86d3c318872aa635e098338tree | snapshot
parenta33629106ec64acdaba45bf9db18d2402a926b8ecommit | diff
osdc/Objecter: upper bound watch_check result

This way we always return a safe upper bound on the amount of time
since we did a check.  Among other things, this prevents us from
returning a value of 0, which is confusing.

Fixes: http://tracker.ceph.com/issues/15760
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2e2ce365866a7569b55aff338a82c132aa927089)

Conflicts:
src/osdc/Objecter.cc
    By https://github.com/ceph/ceph/pull/8967, simply add 1 to return vaule.
src/osdc/Objecter.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.