Commit Graph

39026 Commits

Author SHA1 Message Date
Josh Durgin
26ba4315af Merge remote-tracking branch 'origin/wip-4087'
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/LibrbdWriteback.cc
2015-02-01 07:36:05 +01:00
Sage Weil
4cd7448f0c Merge pull request #3545 from thesues/fix-cmp-xattr
Fix ReplicatedPG do_xattr_cmp_u64

Backport: giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-31 14:08:10 -08:00
Sage Weil
3e7e21b07f Merge pull request #3527 from wonzhq/op-stat
osd: don't log op stats for proxy read in the cache tier

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-31 13:16:15 -08:00
Sage Weil
b79c349067 Merge pull request #3503 from ceph/wip-pg-reqids
osd: index PGLog with optional extra_reqids in each log entry

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Wang, Zhiqiang <zhiqiang.wang@intel.com>
2015-01-31 13:15:47 -08:00
Sage Weil
bd8671f604 ceph_test_rados: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-31 02:17:38 -08:00
Josh Durgin
99c48de370 Merge pull request #3452 from majianpeng/iohint
Iohint in librbd cache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-31 01:03:48 -08:00
Jianpeng Ma
cab246d001 librbd: Don't do readahead for random read.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-30 13:29:26 -08:00
Sage Weil
743436749e Merge pull request #3516 from ceph/wip-mdsmon-args
mon/MDSMonitor: fix gid/rank/state parsing

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2015-01-30 13:22:48 -08:00
Yehuda Sadeh
f0e82edec9 Merge pull request #3551 from ceph/wip-10698
rgw: fail s3 POST auth if keystone not configured

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-30 13:14:38 -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
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
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
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
Sage Weil
e41c052103 Merge pull request #3495 from XinzeChi/wip-size-empty
cleanup: replace some size() or length() with !empty() 

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-29 13:03:04 -08:00
Sage Weil
89bd6b1324 librados: rename NOREUSE to NOCACHE
As far as I can tell, the posix_fadvise() distinction between WONTNEED and
NOREUSE is subtle: one says I won't access the data, and the other says
I will access it one more time and then not access it.  That is, the
distinction is about time.  This thread seems to confirm this
interpretation:

 https://lkml.org/lkml/2011/6/27/44

Since we are attaching hints to the IO operations themselves, this
distinction doesn't make much sense for us.  (Backends should be careful
about which hint they use; or rather, they should use WONTNEED *after*
doing the IO since NOREUSE is presenting a no-op in Linux.)

However, we want to make a totally different distinction:

 WONTNEED - nobody will access this -> drop it from the cache
 NOCACHE  - *i* won't access this again -> don't let me affect your caching
            decisions or the working set you're maintaining for other
            clients.

The NOCACHE name is made-up and distinct from NOREUSE only so that it is
different from POSIX and doesn't introduce confusion for people familiar
with the POSIX meaning.  Perhaps a more accurate name would be IWONTNEED
but that is only one character apart and too error-prone IMO.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 13:00:15 -08:00
Sage Weil
f6239065e0 osd/PGLog: only do slow extra_reqid search of object appears at least once
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 11:29:51 -08:00
Sage Weil
eefdb32cf5 osd: preserved extra_reqids on promote, flush
This fixes idempotency for operations across caching changes (promote,
flush and cache mode changes).

Fixes: #8935
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 11:29:51 -08:00
Sage Weil
4d310a8249 osd: preserve extra_reqids in PGLog
The log scraping is unfortunately O(n) in the size of the log.  We can
also follow objects and then the prior_version pointers, but we don't have
a version->entry index at the moment.

Only index by reqid if reqid_is_index.  Always index extra_reqids.
Notably, the PROMOTE op does not return true for reqid_is_indexed, but this
is where the promotion extra_reqids will appear.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 11:29:51 -08:00
Sage Weil
2ad229c5a2 osd: allow extra reqids to be stashed in each pg_log_entry_t
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-29 11:29:51 -08:00
Yehuda Sadeh
ca71376c83 cls_rgw: fix rgw_bucket_olh_log_entry::epoch initialization
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 11:24:57 -08:00
Samuel Just
cd2491a10a Merge pull request #3540 from athanatos/wip-sam-cache-object-context-across-op
Wip sam cache object context across op

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 10:39:28 -08:00
Sage Weil
880f94895f Merge pull request #3536 from athanatos/wip-10616
Wip 10616

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-29 10:18:44 -08:00
Yehuda Sadeh
4feb8644d3 rgw: reuse fcgx connection structure
Fixes: #10194

Reuse the fcgx connection structure. It forces FCGX_Accept_r() freeing
up or reusing the connection if possible. This is needed for certain
fastcgi module (mod-proxy-fcgi) that sets the FCGI_KEEP_CONN, which
prevents the connection from being closed when calling FCGX_Finish_r().

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 10:09:12 -08:00
Yehuda Sadeh
32b9bb7a2b QueueRing: a reduced contention queue
A queue that provides multi-readers, multi-writers concurrency with a
reduced lock contention.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-29 10:09:12 -08:00
Yehuda Sadeh
ecd5e5a294 test/encoding/types.h: add new structs for testing
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 10:04:56 -08:00
Yehuda Sadeh
5849380c07 cls_rgw: add missing struct test instance generator
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 10:04:28 -08:00
Yehuda Sadeh
4184387d0c cls_rgw: fix encoding for cls_rgw_obj
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 09:31:35 -08:00
Yehuda Sadeh
5808c77a0d rgw: don't call send_response() explicitly
This will make us send the response twice and clobber the http
state.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 09:31:35 -08:00
Yehuda Sadeh
1859239347 rgw-admin: set explicit "null" instance when needed
When clearing a bucket, if instance is not found, set it to "null",
otherwise we'll just create a delete marker.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 09:31:34 -08:00
Yehuda Sadeh
0ace0f5e34 rgw: fix a crash when getting ECANCELED in delete_obj()
bufferlist::c_str() returns NULL if bufferlist is empty. We were
clearing the state, later on assigning s->obj_tag to a string.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-29 09:31:33 -08:00
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
Josh Durgin
d5c8a57d55 Merge pull request #3524 from ceph/wip-8251-2
Wip 8251 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-29 08:54:40 -08:00
Josh Durgin
dd3ad6b9fe Merge pull request #3535 from ceph/wip-librbd-tests
tests: ensure RBD integration tests exercise all features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-29 08:40:26 -08:00
Sage Weil
b6fa40fe12 Merge pull request #3530 from xinxinsh/wip-cleanup
cleanup : remove unused perf counter
2015-01-29 07:19:36 -08:00