]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fdc5d9) | patch
OSDMonitor: return EEXIST if users try to do a PG merge
authorGreg Farnum <greg@inktank.com>
Mon, 2 Dec 2013 23:11:54 +0000 (15:11 -0800)
committerGreg Farnum <greg@inktank.com>
Mon, 2 Dec 2013 23:13:57 +0000 (15:13 -0800)
commit26c00c5b2b0e88d0ec7afb876f6cef168107da32
treed80ac26d5c7357024a900f9ba4c3e884bedcf6e3tree | snapshot
parent4fdc5d9e9df599c6408eda448fe44aa1dcb36eb2commit | diff
OSDMonitor: return EEXIST if users try to do a PG merge

This was returning a machine-code success if users tried to merge, and
was erroneously (but harmlessly) increasing the pool's last_change
marker even though it wasn't actually changing anything.

Backport: emperor

Signed-off-by: Greg Farnum <greg@inktank.com>
src/mon/OSDMonitor.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.