RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 18:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,817 Commits 211 Branches 394 Tags 2.2 GiB
00f21d8bb6
Commit Graph

38817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yehuda Sadeh
00f21d8bb6 workunits/rgw: adjust radosgw-admin output parsing 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 09:31:33 -08:00
Yehuda Sadeh
b685baad30 workunits/rgw: set radosgw-admin location through env variable 
add new RGW_ADMIN to be able to set call.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 09:31:33 -08:00
Yehuda Sadeh
2e3f75fb07 rgw: don't clear olh log if we lost in race 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 09:31:33 -08:00
Yehuda Sadeh
9c8424fe37 rgw: guard olh modification 
Add a check that validates that object still exists. This shouldn't really be
an issue, as we later compare the tag.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 09:31:32 -08:00
Yehuda Sadeh
caefe69356 rgw: version id should not contain underscore 
The problem is that we use underscore for the raw object name encoding.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 09:31:32 -08:00
Yehuda Sadeh
51e3ffaece rgw: reorder bucket cleanup on bucket overwrite 
First read the new instance info, then remove it, not the other way
around. Artifact of bucket sharding merge with object versioning.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-23 11:29:26 -08:00
Yehuda Sadeh
313d6a5a68 rgw: access appropriate shard on bi_get(), bi_put() 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-23 11:29:26 -08:00
Yehuda Sadeh
5652a1df4e cls_rgw; fix json decoding and encoding of certain type 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-22 18:26:00 -08:00
Yehuda Sadeh
376b585469 rgw: generate version ids that don't change when urldecoded 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-22 17:29:45 -08:00
Yehuda Sadeh
65f287167c rgw: hash bucket shard by original object name, not transformed 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-22 17:29:14 -08:00
Yehuda Sadeh
5548bbe15f rgw: use bucket shard for olh operations 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-22 16:06:57 -08:00
Yehuda Sadeh
e4b5bedc2e rgw: api adjustments following a merge 
Merged bucket sharding and object versioning.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-22 15:26:01 -08:00
Yehuda Sadeh
b01ef218b6 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>
 2015-01-22 14:19:22 -08:00
Sage Weil
235d97a66a Merge pull request #3460 from athanatos/wip-10524 
Wip 10524

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 11:19:47 -08:00
Sage Weil
edd345a7bd Merge pull request #3461 from athanatos/wip-10535 
ceph_test_objectstore: enable keyvaluestore experimental option

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 11:15:46 -08:00
Sage Weil
ded972ed20 Merge pull request #3462 from athanatos/wip-10536 
ReplicatedPG::_scrub: don't record digests for snapdirs

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 11:14:50 -08:00
Sage Weil
b5a8f8026d Merge pull request #3459 from athanatos/wip-10603 
ObjectStore::_update_op: treat CLONERANGE2 like CLONE

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 11:12:06 -08:00
Samuel Just
387a37980f 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>
 2015-01-22 11:11:35 -08:00
Sage Weil
2a38fb80c7 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>
 2015-01-22 11:11:22 -08:00
Samuel Just
1afd1c6527 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>
 2015-01-22 11:10:58 -08:00
Samuel Just
a4a9ec9d4d Merge pull request #3363 from liewegas/wip-cache-fix 
osd: fix ReplicatedPG::cancel_proxy_read_ops()

Reviewed-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-22 11:10:37 -08:00
Samuel Just
266cf2e5fa Merge pull request #3365 from liewegas/wip-peering 
osd: new activating pg state between peering and active

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-22 11:09:36 -08:00
Sage Weil
a76641b52f Merge pull request #3425 from vuhuong/wip-xio-fork 
xio: Enable xio option to call fork init

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
 2015-01-22 08:20:51 -08:00
Sage Weil
f28ce7f481 Merge pull request #3453 from FrankYu/master 
Doc: Fix the extra blank space in doc/start/quick-rbd.rst
 2015-01-22 08:16:28 -08:00
Sage Weil
8cc3e17b24 Merge pull request #3451 from xiaoxichen/fix_memstore_statfs 
Fix memstore free space caculation

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 08:15:59 -08:00
Frank Yu
b04f698f56 Doc: Fix the extra blank space in doc/start/quick-rbd.rst 
Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
 2015-01-22 20:58:54 +08:00
Loic Dachary
db24cee59f Merge pull request #3450 from zhouyuan/rgw_doc_typo 
doc: Fix a typo in radosgw-admin doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-22 10:15:51 +01:00
Xiaoxi Chen
804deec15b 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>
 2015-01-22 16:19:44 +08:00
Yuan Zhou
9ad9ba8d10 doc: Fix a typo in radosgw-admin doc 
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-01-22 13:31:47 +08:00
Yehuda Sadeh
6f44f7a0a9 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 6613358ddc.
 2015-01-21 17:30:32 -08:00
Samuel Just
09c11071f8 Merge pull request #3246 from ceph/wip-9780-9781 
ceph-objectstore-tool import/export and related fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-21 16:49:19 -08:00
Yehuda Sadeh
90a90bb269 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>
 2015-01-21 16:43:31 -08:00
Samuel Just
dc11ef13ce 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>
 2015-01-21 16:32:10 -08:00
Yehuda Sadeh
26656e3216 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>
 2015-01-21 16:21:50 -08:00
Josh Durgin
07038a79f3 Merge branch 'next' 2015-01-21 16:11:43 -08:00
Samuel Just
b18b14b18c ObjectStore::_update_op: treat CLONERANGE2 like CLONE 
Fixes: #10603
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-21 16:01:57 -08:00
Yehuda Sadeh
4d7a6a755e 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>
 2015-01-21 15:29:38 -08:00
Sage Weil
9d382e5a7c 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>
 2015-01-21 13:53:16 -08:00
Sage Weil
e203673c03 Merge pull request #3393 from ceph/wip-osd-df 
osd: ceph osd df [tree] command

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-21 13:52:53 -08:00
Sage Weil
6633f8a3ed 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>
 2015-01-21 13:52:29 -08:00
Jason Dillaman
4d3b49e9d6 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>
 2015-01-21 12:23:16 -08:00
Yehuda Sadeh
500f4b4388 rgw: assign versioned_epoch on bucket listing response 
For some reason this was missing.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-21 12:02:37 -08:00
Jason Dillaman
3487683321 Merge pull request #3426 from jdurgin/wip-10592 
qa: disable automatic locking for manual locking test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-01-21 14:59:57 -05:00
João Eduardo Luís
9dc89b2353 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>
 2015-01-21 18:30:52 +00:00
Loic Dachary
2c3dc37236 Merge pull request #3431 from XinzeChi/wip-compile-warning 
osd: fix some compile warning

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-21 16:56:52 +01:00
Gregory Farnum
373473d35e Merge pull request #3436 from ceph/wip-10579 
qa: move fs quota to its own dir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-21 07:08:27 -08:00
John Spray
a0af5de972 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>
 2015-01-21 14:36:58 +00:00
Yan, Zheng
21b11a0e51 Merge pull request #3402 from ceph/wip-10388 
#10388 PerfCounters for MDCache: strays and recovery
 2015-01-21 22:32:24 +08:00
Xinze Chi
2ce38db164 osd: fix some compile warning 
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
 2015-01-21 09:10:48 +00:00
Loic Dachary
84c2c25dbe 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>
 2015-01-21 09:54:42 +01:00