]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: add the remove-x-delete feature to cancel swift object expiration 13621/head
authorJing Wenjun <jingwenjun@cmss.chinamobile.com>
Thu, 23 Feb 2017 20:45:04 +0000 (04:45 +0800)
committerJing Wenjun <jingwenjun@cmss.chinamobile.com>
Thu, 9 Mar 2017 11:01:02 +0000 (19:01 +0800)
commit230429ebc4ac9b5840bb93c7e0eeb5edbb949106
treedfb33b49494d0a3ac69dd14e242a564239e3d1d6
parenta785b00be366f3bfc9d9236fd25cfad59970a40b
rgw: add the remove-x-delete feature to cancel swift object expiration

In openstack swift, it also support the feature to cancel the object expiration,
which could be found at last point in
https://docs.openstack.org/user-guide/cli-swift-set-object-expiration.html. we
can remove the object expiration by set 'X-Remove-Delete-At:'.

This patch also could fix the bug that when we set the object expiration and
then upload the same object to the container again. The previous object expiration
also works, which is not compatible with the openstack swift.

Fixes: http://tracker.ceph.com/issues/19074
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
src/rgw/rgw_file.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rest_swift.cc