]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agorgw: generate version ids that don't change when urldecoded
Yehuda Sadeh [Fri, 23 Jan 2015 01:29:45 +0000 (17:29 -0800)]
rgw: generate version ids that don't change when urldecoded

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: hash bucket shard by original object name, not transformed
Yehuda Sadeh [Fri, 23 Jan 2015 01:29:14 +0000 (17:29 -0800)]
rgw: hash bucket shard by original object name, not transformed

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: use bucket shard for olh operations
Yehuda Sadeh [Fri, 23 Jan 2015 00:06:57 +0000 (16:06 -0800)]
rgw: use bucket shard for olh operations

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: api adjustments following a merge
Yehuda Sadeh [Thu, 22 Jan 2015 23:26:01 +0000 (15:26 -0800)]
rgw: api adjustments following a merge

Merged bucket sharding and object versioning.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge remote-tracking branch 'origin/master' into wip-rgw-versioning-4
Yehuda Sadeh [Thu, 22 Jan 2015 22:19:22 +0000 (14:19 -0800)]
Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4

Conflicts:
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h
src/rgw/rgw_bucket.cc
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3460 from athanatos/wip-10524
Sage Weil [Thu, 22 Jan 2015 19:19:47 +0000 (11:19 -0800)]
Merge pull request #3460 from athanatos/wip-10524

Wip 10524

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3461 from athanatos/wip-10535
Sage Weil [Thu, 22 Jan 2015 19:15:46 +0000 (11:15 -0800)]
Merge pull request #3461 from athanatos/wip-10535

ceph_test_objectstore: enable keyvaluestore experimental option

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3462 from athanatos/wip-10536
Sage Weil [Thu, 22 Jan 2015 19:14:50 +0000 (11:14 -0800)]
Merge pull request #3462 from athanatos/wip-10536

ReplicatedPG::_scrub: don't record digests for snapdirs

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3459 from athanatos/wip-10603
Sage Weil [Thu, 22 Jan 2015 19:12:06 +0000 (11:12 -0800)]
Merge pull request #3459 from athanatos/wip-10603

ObjectStore::_update_op: treat CLONERANGE2 like CLONE

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3350 from liewegas/wip-10477
Samuel Just [Thu, 22 Jan 2015 19:11:35 +0000 (11:11 -0800)]
Merge pull request #3350 from liewegas/wip-10477

osd: populate blocked_by with peers we are trying to activate

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3457 from athanatos/wip-txn-append
Sage Weil [Thu, 22 Jan 2015 19:11:22 +0000 (11:11 -0800)]
Merge pull request #3457 from athanatos/wip-txn-append

Wip txn append

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3351 from liewegas/wip-10512
Samuel Just [Thu, 22 Jan 2015 19:10:58 +0000 (11:10 -0800)]
Merge pull request #3351 from liewegas/wip-10512

osd: fix blocked vs blocking rqeuest requeue order on interval change

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3363 from liewegas/wip-cache-fix
Samuel Just [Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)]
Merge pull request #3363 from liewegas/wip-cache-fix

osd: fix ReplicatedPG::cancel_proxy_read_ops()

Reviewed-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #3365 from liewegas/wip-peering
Samuel Just [Thu, 22 Jan 2015 19:09:36 +0000 (11:09 -0800)]
Merge pull request #3365 from liewegas/wip-peering

osd: new activating pg state between peering and active

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3425 from vuhuong/wip-xio-fork
Sage Weil [Thu, 22 Jan 2015 16:20:51 +0000 (08:20 -0800)]
Merge pull request #3425 from vuhuong/wip-xio-fork

xio: Enable xio option to call fork init

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
10 years agoMerge pull request #3453 from FrankYu/master
Sage Weil [Thu, 22 Jan 2015 16:16:28 +0000 (08:16 -0800)]
Merge pull request #3453 from FrankYu/master

Doc: Fix the extra blank space in doc/start/quick-rbd.rst

10 years agoMerge pull request #3451 from xiaoxichen/fix_memstore_statfs
Sage Weil [Thu, 22 Jan 2015 16:15:59 +0000 (08:15 -0800)]
Merge pull request #3451 from xiaoxichen/fix_memstore_statfs

Fix memstore free space caculation

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoDoc: Fix the extra blank space in doc/start/quick-rbd.rst 3453/head
Frank Yu [Thu, 22 Jan 2015 12:58:54 +0000 (20:58 +0800)]
Doc: Fix the extra blank space in doc/start/quick-rbd.rst

Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
10 years agoMerge pull request #3450 from zhouyuan/rgw_doc_typo
Loic Dachary [Thu, 22 Jan 2015 09:15:51 +0000 (10:15 +0100)]
Merge pull request #3450 from zhouyuan/rgw_doc_typo

doc: Fix a typo in radosgw-admin doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoFix memstore free space caculation 3451/head
Xiaoxi Chen [Thu, 22 Jan 2015 08:19:44 +0000 (16:19 +0800)]
Fix memstore free space caculation

Originally if memstore run out of space, it will report a very
large positive number as free space. For example:

root@bigmem:~# rados df
pool name                 KB      objects       clones     degraded      unfound           rd        rd KB           wr        wr KB
rbd                 12366704        92240            0            0           0            0            0        92240     12366704
  total used        12375877        92240
  total avail   36028797009199167
  total space        2611076

st->f_bavail = st->f_blocks - used_bytes / st->f_bsize

This is due to used_bytes is an unsigned value, so compiler make the whole statement unsigned.

Fix it by adding explicit type cast,

st->f_bavail = long(st->f_blocks) - long(used_bytes / st->f_bsize)

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agodoc: Fix a typo in radosgw-admin doc 3450/head
Yuan Zhou [Thu, 22 Jan 2015 05:30:01 +0000 (13:30 +0800)]
doc: Fix a typo in radosgw-admin doc

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoRevert "Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next""
Yehuda Sadeh [Thu, 22 Jan 2015 01:30:32 +0000 (17:30 -0800)]
Revert "Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next""

Following a merge of next to master, the feature got reverted (because
it was reverted on next). Undoing.

This reverts commit 6613358ddc5339c8e33c409387fd6044db0b6f26.

10 years agoMerge pull request #3246 from ceph/wip-9780-9781
Samuel Just [Thu, 22 Jan 2015 00:49:19 +0000 (16:49 -0800)]
Merge pull request #3246 from ceph/wip-9780-9781

ceph-objectstore-tool import/export and related fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agorgw: set default value for swift versioning extension
Yehuda Sadeh [Thu, 22 Jan 2015 00:43:31 +0000 (16:43 -0800)]
rgw: set default value for swift versioning extension

Otherwise we're going to crash if not found.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoPGBackend: fix and clarify be_select_auth_object 3460/head
Samuel Just [Thu, 22 Jan 2015 00:25:47 +0000 (16:25 -0800)]
PGBackend: fix and clarify be_select_auth_object

Previously, auth would end up containing every object without a
self-evident defect -- even if they did not match each other.  Instead
of filtering out the non-matching items there, be_compare_scrubmaps now
returns one valid object and be_compare_scrubmaps gathers the other
which match it.

We can be smarter by doing this in be_select_auth_object and selecting
the largest matching set, but for now this is simpler.

Fixes: 10524
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agorgw: fix bucket removal with data purge
Yehuda Sadeh [Thu, 22 Jan 2015 00:21:50 +0000 (16:21 -0800)]
rgw: fix bucket removal with data purge

Called by radosgw-admin user rm, need to set the versioning status
correctly.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge branch 'next'
Josh Durgin [Thu, 22 Jan 2015 00:11:43 +0000 (16:11 -0800)]
Merge branch 'next'

10 years agoObjectStore::_update_op: treat CLONERANGE2 like CLONE 3459/head
Samuel Just [Thu, 22 Jan 2015 00:01:55 +0000 (16:01 -0800)]
ObjectStore::_update_op: treat CLONERANGE2 like CLONE

Fixes: #10603
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3251 from theanalyst/fix/rgw/s3-10062
Yehuda Sadeh [Wed, 21 Jan 2015 23:29:38 +0000 (15:29 -0800)]
Merge pull request #3251 from theanalyst/fix/rgw/s3-10062

wip: rgw: check keystone auth also for s3 post requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3381 from liewegas/wip-pg-stat-updates
Sage Weil [Wed, 21 Jan 2015 21:53:16 +0000 (13:53 -0800)]
Merge pull request #3381 from liewegas/wip-pg-stat-updates

osd: avoid spamming monitor with unchanged pg stats

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3393 from ceph/wip-osd-df
Sage Weil [Wed, 21 Jan 2015 21:52:53 +0000 (13:52 -0800)]
Merge pull request #3393 from ceph/wip-osd-df

osd: ceph osd df [tree] command

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3409 from trociny/wip-osd_pool_flags
Sage Weil [Wed, 21 Jan 2015 21:52:29 +0000 (13:52 -0800)]
Merge pull request #3409 from trociny/wip-osd_pool_flags

osd: new pool safeguard flags: nodelete, nopgchange, nosizechange

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agorbd: ensure aio_write buffer isn't invalidated during image import
Jason Dillaman [Wed, 21 Jan 2015 19:55:02 +0000 (14:55 -0500)]
rbd: ensure aio_write buffer isn't invalidated during image import

The buffer provided to aio_write shouldn't be invalidated until
after aio_write has indicated that the operation has completed.

Fixes: #10590
Backport: giant
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agorgw: assign versioned_epoch on bucket listing response
Yehuda Sadeh [Wed, 21 Jan 2015 20:02:37 +0000 (12:02 -0800)]
rgw: assign versioned_epoch on bucket listing response

For some reason this was missing.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3426 from jdurgin/wip-10592
Jason Dillaman [Wed, 21 Jan 2015 19:59:57 +0000 (14:59 -0500)]
Merge pull request #3426 from jdurgin/wip-10592

qa: disable automatic locking for manual locking test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #3259 from trociny/pg_dump_plain
João Eduardo Luís [Wed, 21 Jan 2015 18:30:52 +0000 (18:30 +0000)]
Merge pull request #3259 from trociny/pg_dump_plain

mon: improvements for 'ceph pg dump' in plain format

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3431 from XinzeChi/wip-compile-warning
Loic Dachary [Wed, 21 Jan 2015 15:56:52 +0000 (16:56 +0100)]
Merge pull request #3431 from XinzeChi/wip-compile-warning

osd: fix some compile warning

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3436 from ceph/wip-10579
Gregory Farnum [Wed, 21 Jan 2015 15:08:27 +0000 (07:08 -0800)]
Merge pull request #3436 from ceph/wip-10579

qa: move fs quota to its own dir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoqa: move fs quota to its own dir 3436/head
John Spray [Wed, 21 Jan 2015 14:36:58 +0000 (14:36 +0000)]
qa: move fs quota to its own dir

This is because running fs/misc on a kclient
should not include quota (quota not supported
on kernel client).

Fixes: #10579
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3402 from ceph/wip-10388
Yan, Zheng [Wed, 21 Jan 2015 14:32:24 +0000 (22:32 +0800)]
Merge pull request #3402 from ceph/wip-10388

#10388 PerfCounters for MDCache: strays and recovery

10 years agoosd: fix some compile warning 3431/head
Xinze Chi [Wed, 21 Jan 2015 09:10:48 +0000 (09:10 +0000)]
osd: fix some compile warning

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoMerge pull request #3433 from FrankYu/master
Loic Dachary [Wed, 21 Jan 2015 08:54:42 +0000 (09:54 +0100)]
Merge pull request #3433 from FrankYu/master

Doc: Fix the typo in doc/rbd/rados-rbd-cmds.rst

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoDoc: Fix the typo in doc/rbd/rados-rbd-cmds.rst 3433/head
Frank Yu [Wed, 21 Jan 2015 08:47:41 +0000 (16:47 +0800)]
Doc: Fix the typo in doc/rbd/rados-rbd-cmds.rst

Fix the typo in doc/rbd/rados-rbd-cmds.rst, also add explanation/example
when creating an image without specifying pool.

Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
10 years agoMerge pull request #3427 from jdurgin/wip-cram
Sage Weil [Wed, 21 Jan 2015 03:28:51 +0000 (19:28 -0800)]
Merge pull request #3427 from jdurgin/wip-cram

test: fix rbd cli tests for new feature bit

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agotest: fix rbd cli tests for new feature bit 3427/head
Josh Durgin [Wed, 21 Jan 2015 01:12:15 +0000 (17:12 -0800)]
test: fix rbd cli tests for new feature bit

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoqa: disable automatic locking for manual locking test 3426/head
Josh Durgin [Tue, 20 Jan 2015 23:55:11 +0000 (15:55 -0800)]
qa: disable automatic locking for manual locking test

Automatic locking hides the ESHUTDOWN from the caller, which is how
this test detects that blacklisting works.

Fixes: #10592
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoxio: Enable xio option to call fork init 3425/head
Vu Pham [Tue, 20 Jan 2015 21:13:29 +0000 (13:13 -0800)]
xio: Enable xio option to call fork init

Ceph fork when running as daemon. This fix call xio option to enforce
Accelio to explicitly call ibv_fork_init() to avoid cq overrun issue.

Signed-off-by: Vu Pham <vu@mellanox.com>
10 years agoosd: revert d427ca35404a30e1f428859c3274e030f2f83ef6 3457/head
Dong Yuan [Tue, 20 Jan 2015 09:23:53 +0000 (09:23 +0000)]
osd: revert d427ca35404a30e1f428859c3274e030f2f83ef6

d427ca35404a30e1f428859c3274e030f2f83ef6 reversed the order of localt
and op_t, while some logic depends on the order of localt and op_t.

This commit revert d427ca35404a30e1f428859c3274e030f2f83ef6.

Fix http://tracker.ceph.com/issues/10534.

Change-Id: I5adba561d10274e3d12f89418a755c39e5e5f086
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
10 years agoosd: Transction::append SHOULD NOT modify other.op_bl
Dong Yuan [Tue, 20 Jan 2015 10:44:21 +0000 (10:44 +0000)]
osd: Transction::append SHOULD NOT modify other.op_bl

the other.op_bl SHOULD NOT be changes during append operation,
we use additional bufferlist to avoid this problem

Change-Id: I5d4a8c9ed3d0b926ca4bbdcdadf72cb4d5fde53c
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
10 years agoMerge pull request #3408 from ceph/wip-10257
Sage Weil [Tue, 20 Jan 2015 19:30:00 +0000 (11:30 -0800)]
Merge pull request #3408 from ceph/wip-10257

mon: PGMonitor: several stats output error fixes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3423 from yuyuyu101/rename-test-msgr
Loic Dachary [Tue, 20 Jan 2015 18:21:33 +0000 (19:21 +0100)]
Merge pull request #3423 from yuyuyu101/rename-test-msgr

test_msgr: Rename unittest_msgr to ceph_test_msgr

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest_msgr: Rename unittest_msgr to ceph_test_msgr 3423/head
Haomai Wang [Tue, 20 Jan 2015 16:59:28 +0000 (00:59 +0800)]
test_msgr: Rename unittest_msgr to ceph_test_msgr

Because ceph_test_msgr will run a lot of times than unittest expected,
move it into qa suites.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomon: PGMonitor: skip zeroed osd stats on get_rule_avail() 3408/head
Joao Eduardo Luis [Mon, 19 Jan 2015 18:49:15 +0000 (18:49 +0000)]
mon: PGMonitor: skip zeroed osd stats on get_rule_avail()

Fixes: #10257
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agomon: PGMonitor: available size 0 if no osds on pool's ruleset
Joao Eduardo Luis [Fri, 16 Jan 2015 18:13:05 +0000 (18:13 +0000)]
mon: PGMonitor: available size 0 if no osds on pool's ruleset

get_rule_avail() may return < 0, which we were using blindly assuming it
would always return an unsigned value.  We would end up with weird
values if the ruleset had no osds.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3192 from gravitystorm/patch-1
Loic Dachary [Tue, 20 Jan 2015 16:02:19 +0000 (17:02 +0100)]
Merge pull request #3192 from gravitystorm/patch-1

Replace placeholder with 'gateway'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Replace placeholder with 'gateway' 3192/head
Andy Allan [Wed, 17 Dec 2014 11:54:39 +0000 (11:54 +0000)]
doc: Replace placeholder with 'gateway'

This section is where all the placeholders are replaced by example text, this one had been missed out.

Signed-off-by: Andy Allan <github@gravitystorm.co.uk>
10 years agoMerge pull request #3414 from vuhuong/wip-cmake-fix
Sage Weil [Tue, 20 Jan 2015 15:45:15 +0000 (07:45 -0800)]
Merge pull request #3414 from vuhuong/wip-cmake-fix

cmake: Fix CMakelist.txt to remove depleted files

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3419 from Nairolf21/wip-documentation
Loic Dachary [Tue, 20 Jan 2015 13:22:53 +0000 (14:22 +0100)]
Merge pull request #3419 from Nairolf21/wip-documentation

doc: Introduce the term MON at http://ceph.com/docs/master/rados/

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoIntroduce the term MON at http://ceph.com/docs/master/rados/ 3419/head
nairolf21 [Tue, 20 Jan 2015 08:38:12 +0000 (09:38 +0100)]
Introduce the term MON at http://ceph.com/docs/master/rados/

http://tracker.ceph.com/issues/10203 Fixes:#10203

Signed-off-by: Florian Coste <fcoste21@gmail.com>
10 years agoMerge pull request #3421 from hazem92/wip-documentation
Loic Dachary [Tue, 20 Jan 2015 13:13:21 +0000 (14:13 +0100)]
Merge pull request #3421 from hazem92/wip-documentation

doc: mon should be listed before osd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: mon should be listed before osd 3421/head
Hazem [Tue, 20 Jan 2015 08:54:52 +0000 (09:54 +0100)]
doc: mon should be listed before osd

When deploying a Ceph cluster, the mon must be run first.
In the list shown at http://ceph.com/docs/master/rados/configuration/
it would therefore be better to have mon listed before osd.

http://tracker.ceph.com/issues/10204 Fixes: #10204

Signed-off-by: Hazem <hazem.amara@telecom-bretagne.eu>
10 years agoMerge pull request #3420 from Anols/wip-documentation
Loic Dachary [Tue, 20 Jan 2015 12:36:09 +0000 (13:36 +0100)]
Merge pull request #3420 from Anols/wip-documentation

doc: missing the reference to "ceph-deploy-new"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3418 from ThomasCantin/wip-documentation
Loic Dachary [Tue, 20 Jan 2015 11:15:32 +0000 (12:15 +0100)]
Merge pull request #3418 from ThomasCantin/wip-documentation

doc: Network Configuration Reference duplicate string #3418

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoDoc : Documentation#10205 3420/head
Anols [Tue, 20 Jan 2015 10:51:35 +0000 (11:51 +0100)]
Doc : Documentation#10205

Missing the reference of "ceph-deploy-new".

https://tracker.ceph.com/issues/10205

Signed-off-by: AYARI <ayari_anis@live.fr>
10 years agodoc bug 10206 3418/head
ThomasCantin [Tue, 20 Jan 2015 10:32:24 +0000 (11:32 +0100)]
doc bug 10206

10 years agoMerge pull request #3164 from ceph/wip-librbd-rados-stub
Josh Durgin [Tue, 20 Jan 2015 08:11:22 +0000 (00:11 -0800)]
Merge pull request #3164 from ceph/wip-librbd-rados-stub

librados test driver and librbd unit test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3411 from ceph/wip-10576
Josh Durgin [Tue, 20 Jan 2015 06:26:02 +0000 (22:26 -0800)]
Merge pull request #3411 from ceph/wip-10576

ceph_test_rados_api_misc: do not assert rbd feature match

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoceph_test_rados_api_misc: do not assert rbd feature match 3411/head
Sage Weil [Tue, 20 Jan 2015 02:28:20 +0000 (18:28 -0800)]
ceph_test_rados_api_misc: do not assert rbd feature match

This test fails on upgrades when we (or the server) have new
features.  Make it less fragile.

Fixes: #10576
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorgw: cors set attrs on bucket using appropriate call
Yehuda Sadeh [Tue, 20 Jan 2015 00:26:25 +0000 (16:26 -0800)]
rgw: cors set attrs on bucket using appropriate call

Following rebase, we should call the appropriate function when setting
attrs on a bucket.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: switch index ops to new apis
Yehuda Sadeh [Mon, 19 Jan 2015 22:44:50 +0000 (14:44 -0800)]
rgw: switch index ops to new apis

following a rebase

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: break if done when timing out pending olh ops
Yehuda Sadeh [Fri, 16 Jan 2015 22:09:13 +0000 (14:09 -0800)]
rgw: break if done when timing out pending olh ops

Entries are now sorted by timestamp (older to newer). Break if found
that entry has not timed out.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: start pending entries attr name by timestamp
Yehuda Sadeh [Fri, 16 Jan 2015 21:49:33 +0000 (13:49 -0800)]
rgw: start pending entries attr name by timestamp

This will make it (roughly) possible to get these sorted by time.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: user swap() instead of assignment operator
Yehuda Sadeh [Fri, 16 Jan 2015 19:21:49 +0000 (11:21 -0800)]
cls_rgw: user swap() instead of assignment operator

More efficient this way. A fix following code review.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix unitest compilation
Yehuda Sadeh [Thu, 15 Jan 2015 16:34:12 +0000 (08:34 -0800)]
rgw: fix unitest compilation

Add the needed extra param for bilog_flags.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: handle 'null' instance when setting delete marker
Yehuda Sadeh [Thu, 8 Jan 2015 01:21:14 +0000 (17:21 -0800)]
rgw: handle 'null' instance when setting delete marker

Don't set 'null' instance for a delete marker. We use empty string for
this specific case.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix setting of versioned epoch when removing object instance
Yehuda Sadeh [Thu, 8 Jan 2015 01:04:36 +0000 (17:04 -0800)]
rgw: fix setting of versioned epoch when removing object instance

Beforehand if rgwx-versioned-epoch was passed, we ended up always
creating a delete marker. We don't do that now if rgwx-version-id is not
specified, which allows the system user to remove an object instance and
set the epoch appropriately.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: add bucket index log flags, use these for marking versioned ops
Yehuda Sadeh [Wed, 7 Jan 2015 00:23:47 +0000 (16:23 -0800)]
rgw: add bucket index log flags, use these for marking versioned ops

We want to mark operations as versioned. This is needed by the sync
agent, so that we know how to handle bucket index log entries. We only
want to apply link-olh and unlink-instance operations when it's
versioned.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix use of rgw_remove_object() versioning_status param
Yehuda Sadeh [Tue, 6 Jan 2015 23:41:10 +0000 (15:41 -0800)]
rgw: fix use of rgw_remove_object() versioning_status param

Param passed is the versioning status, and not a boolean.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw, cls_rgw: log versioned operations in bucket index log
Yehuda Sadeh [Tue, 6 Jan 2015 22:12:06 +0000 (14:12 -0800)]
rgw, cls_rgw: log versioned operations in bucket index log

Add the following log ops:
 - link_olh
 - link_olh_del
 - unlink_instance

Log operations if needed. Use current version field in the log entries
to specify versioned epoch.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: cleanup, add read_bucket_header()
Yehuda Sadeh [Tue, 6 Jan 2015 19:22:52 +0000 (11:22 -0800)]
cls_rgw: cleanup, add read_bucket_header()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: fix rgw_bi_log_entry::dump()
Yehuda Sadeh [Tue, 6 Jan 2015 00:33:36 +0000 (16:33 -0800)]
cls_rgw: fix rgw_bi_log_entry::dump()

Add missing instance field.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: bound bi log listing appropriately
Yehuda Sadeh [Tue, 6 Jan 2015 00:32:48 +0000 (16:32 -0800)]
cls_rgw: bound bi log listing appropriately

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: only retry on ECANCELED before doing the operation
Yehuda Sadeh [Tue, 23 Dec 2014 22:02:16 +0000 (14:02 -0800)]
rgw: only retry on ECANCELED before doing the operation

After we did the operation (e.g., link olh, remove) we don't need to
retry. We got ECANCELED, therefore the operation has already been
applied by another user.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix olh guarding scheme
Yehuda Sadeh [Tue, 23 Dec 2014 20:11:33 +0000 (12:11 -0800)]
rgw: fix olh guarding scheme

is_olh() will return false if object is not yet an olh, although we
started the process into turning it into one. We should use the
existence of the olh tag instead.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw_admin: don't reuse -o command line option
Yehuda Sadeh [Tue, 23 Dec 2014 17:38:38 +0000 (09:38 -0800)]
rgw_admin: don't reuse -o command line option

Follow up on code review

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: multi object delete sends delete marker info
Yehuda Sadeh [Tue, 23 Dec 2014 00:39:15 +0000 (16:39 -0800)]
rgw: multi object delete sends delete marker info

The api requires that we send information about whether the operation
was on a delete marker (either created or removed), and what was the
corresponding version id.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: delete obj, handle null instance in all paths
Yehuda Sadeh [Mon, 22 Dec 2014 23:50:42 +0000 (15:50 -0800)]
rgw: delete obj, handle null instance in all paths

When passing rgw_obj structures to the bucket index, we should remove
the "null" instance, pass an empty instance instead.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: when deleting object version return -ENOENT if needed
Yehuda Sadeh [Mon, 22 Dec 2014 23:05:18 +0000 (15:05 -0800)]
rgw: when deleting object version return -ENOENT if needed

If can't do bi_get() on the object, we should treat it as non existent
and just return.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls/rgw: when removing delete marker, clean up instance entry
Yehuda Sadeh [Mon, 22 Dec 2014 23:03:04 +0000 (15:03 -0800)]
cls/rgw: when removing delete marker, clean up instance entry

Since we create the instance entry at the bucket index, we should also
remove it. Otherwise we end up with objects that have bucket index
entries, but don't have olh. In these cases we'll be failin operations
on these objects, as their bucket index olh tag will always mismatch the
actual object olh tag.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: multi object delete supports versioning
Yehuda Sadeh [Mon, 22 Dec 2014 21:08:50 +0000 (13:08 -0800)]
rgw: multi object delete supports versioning

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: break out of inifinite ECANCELED state
Yehuda Sadeh [Mon, 22 Dec 2014 18:40:40 +0000 (10:40 -0800)]
rgw: break out of inifinite ECANCELED state

Don't wait forever, we might be in this state due to a bug, so it's
better to abort with EIO at this point.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw, cls_rgw: conditionally remove olh object
Yehuda Sadeh [Sat, 20 Dec 2014 01:04:30 +0000 (17:04 -0800)]
rgw, cls_rgw: conditionally remove olh object

still not completely working, need to debug

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw, cls_rgw: clean up olh artifacts when dropping last version
Yehuda Sadeh [Fri, 19 Dec 2014 23:29:27 +0000 (15:29 -0800)]
rgw, cls_rgw: clean up olh artifacts when dropping last version

This is still missing one piece, however, it works like this:
1. bucket index log reflects last version was removed (already did that)
2. olh entry is marked as 'pending removal'
 - any new versions coming in now to the olh entry will clear pending
   state
3. rgw conditionally removes olh object (still missing condition check)
 - condition checks should verify olh tag & version, and no pending
   modifications
4. if (2) is successful, rgw sends 'clear olh' request to bucket index
5. bucket index, if still 'pending removal' clears olh and plain entry

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: dump versioned epoch on system user bucket listing
Yehuda Sadeh [Fri, 19 Dec 2014 00:43:17 +0000 (16:43 -0800)]
rgw: dump versioned epoch on system user bucket listing

The sync agent will need this info.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: only set olh attr on actual olh object
Yehuda Sadeh [Thu, 18 Dec 2014 23:16:23 +0000 (15:16 -0800)]
rgw: only set olh attr on actual olh object

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: no need to set tag on object we're removing
Yehuda Sadeh [Thu, 18 Dec 2014 23:15:29 +0000 (15:15 -0800)]
rgw: no need to set tag on object we're removing

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: only maintain object if there are preserved xattrs
Yehuda Sadeh [Thu, 18 Dec 2014 21:19:22 +0000 (13:19 -0800)]
cls_rgw: only maintain object if there are preserved xattrs

rgw.obj_remove op doesn't need to keep the object around if there aren't
preserved xattrs found.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: limit print length of bufferlist buffer
Yehuda Sadeh [Thu, 18 Dec 2014 19:42:59 +0000 (11:42 -0800)]
rgw: limit print length of bufferlist buffer

These specific buffers are not null terminated.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: multipart meta object shouldn't be versioned
Yehuda Sadeh [Thu, 18 Dec 2014 19:41:27 +0000 (11:41 -0800)]
rgw: multipart meta object shouldn't be versioned

This object is already unique due to the upload id associated with it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: remove clutter
Yehuda Sadeh [Thu, 18 Dec 2014 19:39:57 +0000 (11:39 -0800)]
rgw: remove clutter

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>