RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,273 Commits 211 Branches 394 Tags 2.1 GiB
d66aad4269
Commit Graph

39273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Just
e5a96fdbcd PG: move most of all_activated_and_commited into the AllReplicasActivated handler 
It's confusing to have that logic split up so much.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
5911b45011 PG::proc_master_log: assume les and history.les from log source 
Otherwise, we might later go peered (not active) and not distribute
a non-0 last_epoch_started.  This should be safe as the log recipient
will have a last_update reflecting that interval as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
c4793abbf8 osd_types: add last_peered, last_became_peered 
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
63e5f578f8 PG: break waiting_for_peered out of waiting_for_active 
waiting_for_peered now holds ops until peering completes (activation,
not necessarily state active).  waiting_for_active now holds
specifically MOSDOp blocked on:
- scrub
- replay
- state active

Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
96c3af83b1 PG: remove very obsolete comment about backfill_pos 
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
aac4c255e2 osd/: add state PG_STATE_PEERED 
We need a state to represent the pg state where we are below
min_size, but trying to recover.

Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
abd115484a doc: add documentation for undersized 
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:34 -08:00
Gregory Farnum
d3f1d6ea69 Merge pull request #3553 from ceph/wip-10701 
rgw: use strict_strtoll() for content length

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-30 11:37:42 -08:00
Samuel Just
1f165d2547 ReplicatedPG: block writes on degraded objects for ec pools 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:31 -08:00
Samuel Just
964d17756f append_log: use remove_snap_mapped_object 
Backport: giant, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:25 -08:00
Samuel Just
0a32d3b1f0 ReplicatedPG::agent_maybe_evict: take write lock, skip on failure 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:25 -08:00
Samuel Just
721c87837c ReplicatedPG: if we got ENOENT and an obc, we need to check the locks 
Otherwise, we might return ENOENT out of order.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:25 -08:00
Samuel Just
a81f3e6e61 ReplicatedPG::get_rw_locks: use excl lock for read & write_ordered 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:24 -08:00
Samuel Just
a8e041f065 osd_types: add excl obc lock 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:24 -08:00
Samuel Just
e00daf56ff ReplicatedPG::cancel_pull: drop_recovery_read lock 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:24 -08:00
Samuel Just
f5134c8b95 ReplicatedPG::wait_for_unreadable_object: use prep_object_replica_pushes instead of recover_missing if not missing 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:24 -08:00
Samuel Just
a74296fbfe PG::purge_strays: purge peer_missing as well 
Backport: giant, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:33:15 -08:00
Samuel Just
f9abffbb24 osd/: don't block writes on degraded objects 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:28:02 -08:00
Samuel Just
c632fecb87 osd/: update peer_missing and local missing if we write a degraded object 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:27:59 -08:00
Samuel Just
56b8fc8c70 ReplicatedPG: always take recovery_read_lock for recovery 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:26:27 -08:00
Yehuda Sadeh
1c25dbafb4 rgw: use strict_strtoll() for content length 
instead of strict_strtol().

Backport: giant, firefly
Fixes: #10701

Reported-by: Axel Dunkel <ad@dunkel.de>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 10:53:51 -08:00
Vu Pham
b1435e6e77 xio: Enforce at least two portals if bind 
Enforce at least two portals being set/created if one set
xio_portals_thread = 1 by mistake
Return the correct last use portal and pass in only one portal
to accept

Signed-off-by: Vu Pham <vu@mellanox.com>
 2015-01-30 09:21:37 -08:00
Yehuda Sadeh
e6c2c82306 Merge pull request #3476 from ktdreyer/wip-rpm-radosgw-logrotate 
ceph.spec.in: move rgw logrotate to rgw subpackage

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-30 09:11:36 -08:00
Yehuda Sadeh
6cffebd4dd Merge pull request #3437 from diurchenko/patch-2 
rgw: fix doc, wrong HTTP header name

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 09:09:17 -08:00
Yehuda Sadeh
f33f664003 Merge pull request #3546 from zhouyuan/204_post_container 
rgw: Response 204 when post on containers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 08:43:46 -08:00
Yehuda Sadeh
cbf0691b4a rgw: fail s3 POST auth if keystone not configured 
Fixes: #10698
This fixes issue introduced in 8b3dfc9472,
where if user does not exist, we try keystone authentication. However,
if keystone is not configured we justt fall through without failing.
This would have failed later on due to bucket permissions, unless bucket
had a public write permissions.

Reported-by: Valery Tschopp <valery.tschopp@switch.ch>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 07:39:24 -08:00
John Wilkins
10ddab8a24 doc: Fixed hyperlink. 
Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2015-01-30 06:18:25 -08:00
Yuan Zhou
a0a5185b6b rgw: Response 204 when post on containers 
Currently POST request on container returns 202 if success. But in Swift
the code is 204. Let's use 204 to keep align with the Swift API.

Fixes #10667
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-01-30 20:00:54 +08:00
Vu Pham
b7ab624553 xio: Remove whitespace changes 
Remove whitespace changes from xio's "spread and accept connections
using different portals" patch

Signed-off-by: Vu Pham <vu@mellanox.com>
 2015-01-30 02:37:27 -08:00
Jianpeng Ma
7c80248760 ObjectCacher: Only r >= 0, it need the read data. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:23:27 +08:00
Jianpeng Ma
ef48a70d55 osdc: only external_call can touch object. 
In fact if there is retry reading, the touch_bh also touch object.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:23:16 +08:00
Jianpeng Ma
ed209a5ea2 osdc: For read w/ DONTNEED, if read data contain all cached data, move this object into the tail of LRU. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:21:44 +08:00
Jianpeng Ma
3dca5ef508 osdc: Make ObjectCahce can hanle read with DONTNEED. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:49:21 +08:00
Jianpeng Ma
3d38e1f56c osdc: touch hit bh although there are missing or rx bh. 
Avoid losing the hit bh when later read, it should touch hit bh like rx bh.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:44:11 +08:00
Jianpeng Ma
3687dcbcd1 osdc: Make ObjectCahce can hanle write with DONTNEED. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:36:50 +08:00
Jianpeng Ma
28e73a7b8d osdc: Make ObjectCache can accept fadvise_flags. 
The field flags of OSDRead/OSDWrite don't use anymore. Replace it with
fadvise_flags.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:29:46 +08:00
Jianpeng Ma
fc76c89d1b osdc: add new filed dontneed in BufferHead. 
For read/write op with LIBRADOS_OP_FLAG_FADVISE_DONTNEED,
the hit bh set this as true and later move into the tail of LRU in
order to remove in case in short future no ony access.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:29:00 +08:00
Dongmao Zhang
3373249974 Fix ReplicatedPG do_xattr_cmp_u64 
1. bufferlist.c_str() will return a string which is longer than its real length.
This could cause an error result from do_xattr_cmp_u64. So use
std::string to receive the xattr
2. s/atoll/strtoull

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
 2015-01-30 11:20:50 +08:00
Yehuda Sadeh
7e5e1ea1a5 Merge pull request #3526 from ceph/wip-rgw-versioning-4 
Wip rgw versioning 4

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-29 16:42:32 -08:00
Yehuda Sadeh
4c50f6a7fc rgw: more merge related fixes 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 16:24:33 -08:00
Yehuda Sadeh
01cc9d54d0 rgw: fix merge artifact 
s/XMLArgs/RGWHTTPArgs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 16:07:41 -08:00
Yehuda Sadeh
f147143115 Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4 
Conflicts:
	src/rgw/rgw_admin.cc
 2015-01-29 16:05:14 -08:00
Sage Weil
243860b5e4 Merge pull request #3125 from ceph/wip-10194-master 
Wip 10194 master

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-29 15:06:11 -08:00
Samuel Just
e26023eeb1 PG: set scrubber.start = scrubber.end after scrub_compare_maps 
This is how the scrubber behaved prior to
218de829b1

Fixes: 10693
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-29 14:22:07 -08:00
Samuel Just
4f9e6ed836 PG: remove block_writes from scrubber 
block_writes is actually redundant, it is true iff scrubber.start !=
scrubber.end.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-29 14:21:55 -08:00
Sage Weil
2980f3ac52 Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph 
Conflicts:
	src/msg/Messenger.h
 2015-01-29 13:28:26 -08:00
Samuel Just
bed22b49b7 doc: improve incomplete state documentation 
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-29 13:17:07 -08:00
Sage Weil
7237933f6c Merge pull request #3543 from ceph/wip-hints 
librados: rename NOREUSE to NOCACHE

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-29 13:06:29 -08:00
Sage Weil
0e0e3e49c4 Merge pull request #3295 from majianpeng/fix2 
osd: add per-pool fadvise-dontneed flag

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-29 13:04:39 -08:00
Sage Weil
b29167c6c0 Merge pull request #3392 from ceph/wip-crush-straw2 
crush: new straw2 bucket

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-29 13:03:39 -08:00