]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoMerge pull request #3562 from liewegas/wip-lttng
Loic Dachary [Mon, 2 Feb 2015 11:12:15 +0000 (12:12 +0100)]
Merge pull request #3562 from liewegas/wip-lttng

do_autogen.sh: default to --with-lttng, -L to build without

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3485 from jdurgin/wip-merge-diff-testing
Sage Weil [Mon, 2 Feb 2015 11:07:36 +0000 (03:07 -0800)]
Merge pull request #3485 from jdurgin/wip-merge-diff-testing

Improve merge-diff test

10 years agodo_autogen.sh: default to --with-lttng, -L to build without 3562/head
Sage Weil [Mon, 2 Feb 2015 10:47:46 +0000 (02:47 -0800)]
do_autogen.sh: default to --with-lttng, -L to build without

Get developers building with LTTNG by default.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3549 from Ved-vampir/master
Sage Weil [Mon, 2 Feb 2015 10:55:39 +0000 (02:55 -0800)]
Merge pull request #3549 from Ved-vampir/master

Ceph: Fix

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoosd: change pg_stat plain to display CRUSH_ITEM_NONE in pgmap output section. 3549/head
Ved-vampir [Fri, 30 Jan 2015 11:33:21 +0000 (13:33 +0200)]
osd:  change pg_stat plain to display CRUSH_ITEM_NONE in pgmap output section.

Fixes: #10519
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
10 years agoMerge pull request #3501 from yuyuyu101/wip-fix-async
Haomai Wang [Mon, 2 Feb 2015 10:26:08 +0000 (18:26 +0800)]
Merge pull request #3501 from yuyuyu101/wip-fix-async

AsyncMessenger: Fix mix auth assert failed

10 years agoMerge branch 'wip-rbd-listwatchers'
Josh Durgin [Mon, 2 Feb 2015 09:33:32 +0000 (10:33 +0100)]
Merge branch 'wip-rbd-listwatchers'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoman: add rbd status to doc/man/8/rbd.rst
Yunchuan Wen [Wed, 21 Jan 2015 00:43:07 +0000 (00:43 +0000)]
man: add rbd status to doc/man/8/rbd.rst

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
10 years agoMerge pull request #3533 from ceph/wip-disaster-doc
John Spray [Mon, 2 Feb 2015 09:04:32 +0000 (10:04 +0100)]
Merge pull request #3533 from ceph/wip-disaster-doc

doc: add cephfs disaster recovery guidance

Reviewed-by: Greg Farnum <gfarnum@redhat.com
10 years agodoc: add cephfs disaster recovery guidance 3533/head
John Spray [Mon, 5 Jan 2015 15:46:38 +0000 (15:46 +0000)]
doc: add cephfs disaster recovery guidance

This is a place to put some useful notes about
the new offline recovery tooling.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotest: add rbd status to src/test/cli/rbd/help.t
Yunchuan Wen [Wed, 21 Jan 2015 00:42:55 +0000 (00:42 +0000)]
test: add rbd status to src/test/cli/rbd/help.t

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
10 years agorbd: add status command to list the watchers of an image
Yunchuan Wen [Wed, 21 Jan 2015 00:42:41 +0000 (00:42 +0000)]
rbd: add status command to list the watchers of an image

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
10 years agoMerge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph
Josh Durgin [Sun, 1 Feb 2015 20:17:34 +0000 (21:17 +0100)]
Merge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/osdc/ObjectCacher.cc
src/osdc/ObjectCacher.h

10 years agoMerge pull request #3556 from trociny/image_watcher-fixup
Josh Durgin [Sun, 1 Feb 2015 12:54:52 +0000 (13:54 +0100)]
Merge pull request #3556 from trociny/image_watcher-fixup

librbd: RemoteAsyncRequest: fix comparison operator

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3537 from ceph/wip-10688-boost-157
Loic Dachary [Sun, 1 Feb 2015 12:16:34 +0000 (13:16 +0100)]
Merge pull request #3537 from ceph/wip-10688-boost-157

#10688: support Boost 1.57.0

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrbd: RemoteAsyncRequest: fix comparison operator 3556/head
Mykola Golub [Sun, 1 Feb 2015 11:58:25 +0000 (13:58 +0200)]
librbd: RemoteAsyncRequest: fix comparison operator

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agorbd: use IO hints for read/write operations
Jason Dillaman [Wed, 21 Jan 2015 20:23:31 +0000 (15:23 -0500)]
rbd: use IO hints for read/write operations

Import, export, and benchmark operations now use the librados
IO hints to indicate the read/write pattern and whether caching
is required.

Fixes: #10462
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge remote-tracking branch 'origin/wip-4087'
Josh Durgin [Sun, 1 Feb 2015 06:36:05 +0000 (07:36 +0100)]
Merge remote-tracking branch 'origin/wip-4087'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/LibrbdWriteback.cc

10 years agoMerge pull request #3545 from thesues/fix-cmp-xattr
Sage Weil [Sat, 31 Jan 2015 22:08:10 +0000 (14:08 -0800)]
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>
10 years agoMerge pull request #3527 from wonzhq/op-stat
Sage Weil [Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)]
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>
10 years agoMerge pull request #3503 from ceph/wip-pg-reqids
Sage Weil [Sat, 31 Jan 2015 21:15:47 +0000 (13:15 -0800)]
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>
10 years agoceph_test_rados: fix typo
Sage Weil [Sat, 31 Jan 2015 10:15:53 +0000 (02:15 -0800)]
ceph_test_rados: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3452 from majianpeng/iohint
Josh Durgin [Sat, 31 Jan 2015 09:03:48 +0000 (01:03 -0800)]
Merge pull request #3452 from majianpeng/iohint

Iohint in librbd cache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: Don't do readahead for random read.
Jianpeng Ma [Mon, 12 Jan 2015 06:35:28 +0000 (14:35 +0800)]
librbd: Don't do readahead for random read.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3516 from ceph/wip-mdsmon-args
Sage Weil [Fri, 30 Jan 2015 21:22:48 +0000 (13:22 -0800)]
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>
10 years agoMerge pull request #3551 from ceph/wip-10698
Yehuda Sadeh [Fri, 30 Jan 2015 21:14:38 +0000 (13:14 -0800)]
Merge pull request #3551 from ceph/wip-10698

rgw: fail s3 POST auth if keystone not configured

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3476 from ktdreyer/wip-rpm-radosgw-logrotate 3500/head
Yehuda Sadeh [Fri, 30 Jan 2015 17:11:36 +0000 (09:11 -0800)]
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>
10 years agoMerge pull request #3437 from diurchenko/patch-2
Yehuda Sadeh [Fri, 30 Jan 2015 17:09:17 +0000 (09:09 -0800)]
Merge pull request #3437 from diurchenko/patch-2

rgw: fix doc, wrong HTTP header name

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3546 from zhouyuan/204_post_container
Yehuda Sadeh [Fri, 30 Jan 2015 16:43:46 +0000 (08:43 -0800)]
Merge pull request #3546 from zhouyuan/204_post_container

rgw: Response 204 when post on containers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fail s3 POST auth if keystone not configured 3551/head
Yehuda Sadeh [Fri, 30 Jan 2015 15:03:30 +0000 (07:03 -0800)]
rgw: fail s3 POST auth if keystone not configured

Fixes: #10698
This fixes issue introduced in 8b3dfc9472022ea45ad24e02e0aa21dfdad798f8,
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>
10 years agodoc: Fixed hyperlink.
John Wilkins [Fri, 30 Jan 2015 14:18:25 +0000 (06:18 -0800)]
doc: Fixed hyperlink.

Signed-off-by: John Wilkins <jowilkin@redhat.com>
10 years agorgw: Response 204 when post on containers 3546/head
Yuan Zhou [Fri, 30 Jan 2015 03:43:19 +0000 (11:43 +0800)]
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>
10 years agoObjectCacher: Only r >= 0, it need the read data. 3531/head
Jianpeng Ma [Mon, 26 Jan 2015 07:53:57 +0000 (15:53 +0800)]
ObjectCacher: Only r >= 0, it need the read data.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosdc: only external_call can touch object.
Jianpeng Ma [Thu, 29 Jan 2015 08:44:35 +0000 (16:44 +0800)]
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>
10 years agoosdc: For read w/ DONTNEED, if read data contain all cached data, move this object...
Jianpeng Ma [Fri, 30 Jan 2015 05:21:44 +0000 (13:21 +0800)]
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>
10 years agoosdc: Make ObjectCahce can hanle read with DONTNEED.
Jianpeng Ma [Fri, 30 Jan 2015 03:49:21 +0000 (11:49 +0800)]
osdc: Make ObjectCahce can hanle read with DONTNEED.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosdc: touch hit bh although there are missing or rx bh.
Jianpeng Ma [Thu, 29 Jan 2015 08:41:49 +0000 (16:41 +0800)]
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>
10 years agoosdc: Make ObjectCahce can hanle write with DONTNEED.
Jianpeng Ma [Fri, 30 Jan 2015 03:36:50 +0000 (11:36 +0800)]
osdc: Make ObjectCahce can hanle write with DONTNEED.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosdc: Make ObjectCache can accept fadvise_flags.
Jianpeng Ma [Thu, 29 Jan 2015 06:45:51 +0000 (14:45 +0800)]
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>
10 years agoosdc: add new filed dontneed in BufferHead.
Jianpeng Ma [Fri, 30 Jan 2015 03:29:00 +0000 (11:29 +0800)]
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>
10 years agoFix ReplicatedPG do_xattr_cmp_u64 3545/head
Dongmao Zhang [Fri, 30 Jan 2015 03:20:50 +0000 (11:20 +0800)]
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>
10 years agoMerge pull request #3526 from ceph/wip-rgw-versioning-4
Yehuda Sadeh [Fri, 30 Jan 2015 00:42:32 +0000 (16:42 -0800)]
Merge pull request #3526 from ceph/wip-rgw-versioning-4

Wip rgw versioning 4

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agorgw: more merge related fixes 3526/head
Yehuda Sadeh [Fri, 30 Jan 2015 00:24:33 +0000 (16:24 -0800)]
rgw: more merge related fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fix merge artifact
Yehuda Sadeh [Fri, 30 Jan 2015 00:07:41 +0000 (16:07 -0800)]
rgw: fix merge artifact

s/XMLArgs/RGWHTTPArgs

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

Conflicts:
src/rgw/rgw_admin.cc

10 years agoMerge pull request #3125 from ceph/wip-10194-master
Sage Weil [Thu, 29 Jan 2015 23:06:11 +0000 (15:06 -0800)]
Merge pull request #3125 from ceph/wip-10194-master

Wip 10194 master

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph
Sage Weil [Thu, 29 Jan 2015 21:28:26 +0000 (13:28 -0800)]
Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph

Conflicts:
src/msg/Messenger.h

10 years agoMerge pull request #3543 from ceph/wip-hints
Sage Weil [Thu, 29 Jan 2015 21:06:29 +0000 (13:06 -0800)]
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>
10 years agoMerge pull request #3295 from majianpeng/fix2
Sage Weil [Thu, 29 Jan 2015 21:04:39 +0000 (13:04 -0800)]
Merge pull request #3295 from majianpeng/fix2

osd: add per-pool fadvise-dontneed flag

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3392 from ceph/wip-crush-straw2
Sage Weil [Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)]
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>
10 years agoMerge pull request #3495 from XinzeChi/wip-size-empty
Sage Weil [Thu, 29 Jan 2015 21:03:04 +0000 (13:03 -0800)]
Merge pull request #3495 from XinzeChi/wip-size-empty

cleanup: replace some size() or length() with !empty()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrados: rename NOREUSE to NOCACHE 3543/head
Sage Weil [Thu, 29 Jan 2015 21:00:15 +0000 (13:00 -0800)]
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>
10 years agosupport Boost 1.57.0 3537/head
Petr Machata [Thu, 29 Jan 2015 17:15:02 +0000 (10:15 -0700)]
support Boost 1.57.0

Sometime after 1.55, boost introduced a forward declaration of
operator<< in optional.hpp. In 1.55 and earlier, when << was used
without the _io having been included, what got dumped was an implicit
bool conversion.

http://tracker.ceph.com/issues/10688 Refs: #10688
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoosd/PGLog: only do slow extra_reqid search of object appears at least once 3503/head
Sage Weil [Thu, 29 Jan 2015 18:14:04 +0000 (10:14 -0800)]
osd/PGLog: only do slow extra_reqid search of object appears at least once

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: preserved extra_reqids on promote, flush
Sage Weil [Thu, 29 Jan 2015 19:27:19 +0000 (11:27 -0800)]
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>
10 years agoosd: preserve extra_reqids in PGLog
Sage Weil [Thu, 29 Jan 2015 19:26:23 +0000 (11:26 -0800)]
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>
10 years agoosd: allow extra reqids to be stashed in each pg_log_entry_t
Sage Weil [Fri, 23 Jan 2015 22:11:19 +0000 (14:11 -0800)]
osd: allow extra reqids to be stashed in each pg_log_entry_t

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocls_rgw: fix rgw_bucket_olh_log_entry::epoch initialization
Yehuda Sadeh [Thu, 29 Jan 2015 19:24:57 +0000 (11:24 -0800)]
cls_rgw: fix rgw_bucket_olh_log_entry::epoch initialization

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3540 from athanatos/wip-sam-cache-object-context-across-op
Samuel Just [Thu, 29 Jan 2015 18:39:28 +0000 (10:39 -0800)]
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>
10 years agoMerge pull request #3536 from athanatos/wip-10616
Sage Weil [Thu, 29 Jan 2015 18:18:44 +0000 (10:18 -0800)]
Merge pull request #3536 from athanatos/wip-10616

Wip 10616

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agorgw: reuse fcgx connection structure 3125/head
Yehuda Sadeh [Wed, 26 Nov 2014 22:11:13 +0000 (14:11 -0800)]
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>
10 years agoQueueRing: a reduced contention queue
Yehuda Sadeh [Sun, 2 Mar 2014 03:14:12 +0000 (19:14 -0800)]
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>
10 years agotest/encoding/types.h: add new structs for testing
Yehuda Sadeh [Thu, 29 Jan 2015 18:04:56 +0000 (10:04 -0800)]
test/encoding/types.h: add new structs for testing

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: add missing struct test instance generator
Yehuda Sadeh [Thu, 29 Jan 2015 18:04:11 +0000 (10:04 -0800)]
cls_rgw: add missing struct test instance generator

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: fix encoding for cls_rgw_obj
Yehuda Sadeh [Thu, 29 Jan 2015 17:28:14 +0000 (09:28 -0800)]
cls_rgw: fix encoding for cls_rgw_obj

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: don't call send_response() explicitly
Yehuda Sadeh [Tue, 27 Jan 2015 23:24:03 +0000 (15:24 -0800)]
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>
10 years agorgw-admin: set explicit "null" instance when needed
Yehuda Sadeh [Tue, 27 Jan 2015 01:31:10 +0000 (17:31 -0800)]
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>
10 years agorgw: fix a crash when getting ECANCELED in delete_obj()
Yehuda Sadeh [Tue, 27 Jan 2015 01:15:14 +0000 (17:15 -0800)]
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>
10 years agoworkunits/rgw: adjust radosgw-admin output parsing
Yehuda Sadeh [Mon, 26 Jan 2015 21:10:37 +0000 (13:10 -0800)]
workunits/rgw: adjust radosgw-admin output parsing

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoworkunits/rgw: set radosgw-admin location through env variable
Yehuda Sadeh [Mon, 26 Jan 2015 16:50:48 +0000 (08:50 -0800)]
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>
10 years agorgw: don't clear olh log if we lost in race
Yehuda Sadeh [Sat, 24 Jan 2015 01:29:57 +0000 (17:29 -0800)]
rgw: don't clear olh log if we lost in race

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: guard olh modification
Yehuda Sadeh [Sat, 24 Jan 2015 01:29:10 +0000 (17:29 -0800)]
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>
10 years agorgw: version id should not contain underscore
Yehuda Sadeh [Sat, 24 Jan 2015 01:28:14 +0000 (17:28 -0800)]
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>
10 years agoMerge pull request #3524 from ceph/wip-8251-2
Josh Durgin [Thu, 29 Jan 2015 16:54:40 +0000 (08:54 -0800)]
Merge pull request #3524 from ceph/wip-8251-2

Wip 8251 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoasync: directly call delete without check 3501/head
Haomai Wang [Thu, 29 Jan 2015 16:48:57 +0000 (00:48 +0800)]
async: directly call delete without check

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3535 from ceph/wip-librbd-tests
Josh Durgin [Thu, 29 Jan 2015 16:40:26 +0000 (08:40 -0800)]
Merge pull request #3535 from ceph/wip-librbd-tests

tests: ensure RBD integration tests exercise all features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3530 from xinxinsh/wip-cleanup
Sage Weil [Thu, 29 Jan 2015 15:19:36 +0000 (07:19 -0800)]
Merge pull request #3530 from xinxinsh/wip-cleanup

cleanup : remove unused perf counter

10 years agoMerge pull request #3528 from RobertJansen1/patch-1
Loic Dachary [Thu, 29 Jan 2015 10:15:40 +0000 (11:15 +0100)]
Merge pull request #3528 from RobertJansen1/patch-1

corrected some confusing numbers

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoedited failure conclusion 3528/head
RobertJansen1 [Thu, 29 Jan 2015 10:07:50 +0000 (11:07 +0100)]
edited failure conclusion

Signed-off-by: Robert Jansen <r.jansen@fairbanks.nl>
10 years agocorrected some confusing numbers
RobertJansen1 [Thu, 29 Jan 2015 10:03:14 +0000 (11:03 +0100)]
corrected some confusing numbers

Signed-off-by: Robert Jansen <r.jansen@fairbanks.nl>
10 years agoosd: don't log op stats for proxy read in the cache tier 3527/head
Zhiqiang Wang [Thu, 29 Jan 2015 07:23:38 +0000 (15:23 +0800)]
osd: don't log op stats for proxy read in the cache tier

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agocleanup : remove unused perf counter 3530/head
xinxin shu [Thu, 29 Jan 2015 02:16:13 +0000 (10:16 +0800)]
cleanup : remove unused perf counter

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agolibrbd: object map updates should use AIO 2700/head
Jason Dillaman [Tue, 27 Jan 2015 11:07:13 +0000 (06:07 -0500)]
librbd: object map updates should use AIO

Update the existing AbstractWrite state machine to handle
updating the object map before and after the object update.
Also convert the resize/trim maintenance operations to use
new state machines which handle the pre-/post-operation
updates to the object map.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotest: correct two issues with the librados_test_stub
Jason Dillaman [Tue, 27 Jan 2015 22:29:03 +0000 (17:29 -0500)]
test: correct two issues with the librados_test_stub

Corrected a problem where the snapshot id was being incorrectly
replaced on history object versions.  Also corrected an issue
with handling flushing the AIO worker threads.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: refactor existing object map code to its own class
Jason Dillaman [Tue, 27 Jan 2015 03:12:24 +0000 (22:12 -0500)]
librbd: refactor existing object map code to its own class

As a preparation for switching all current object map manipulations
within librados callbacks to AIO, the existing object map code
was moved to its own class for future maintainability.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: object_map_resize shrink protection
Jason Dillaman [Sun, 25 Jan 2015 18:56:02 +0000 (13:56 -0500)]
cls_rbd: object_map_resize shrink protection

When shrinking an object map, object_map_resize now ensures
that the objects being removed are initialized to default
state to protect against losing track of in-use objects.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: copy-on-read should update the object map
Jason Dillaman [Sun, 25 Jan 2015 17:06:46 +0000 (12:06 -0500)]
librbd: copy-on-read should update the object map

The new copy-on-read functionality needs to update the
object map when a copyup occurs for an object.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: only enable object map if enabled in ceph config
Jason Dillaman [Sat, 24 Jan 2015 09:44:09 +0000 (04:44 -0500)]
rbd: only enable object map if enabled in ceph config

As a way to introduce the RBD object map as an optional tech
preview, only enable it for new images/clones if the
rbd_object_map configuration parameter is enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Protect object map updates with a lock assertion
Jason Dillaman [Tue, 18 Nov 2014 11:24:33 +0000 (06:24 -0500)]
librbd: Protect object map updates with a lock assertion

Use the new assert_locked functionality to protect object
map updates to only the single client that holds the lock.
This is to protect against possible race conditions during
lock ownership transitions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Use RBD image flags for invalid object maps
Jason Dillaman [Mon, 10 Nov 2014 15:08:26 +0000 (10:08 -0500)]
librbd: Use RBD image flags for invalid object maps

If the RBD object map state is corrupted, flag the object map
as invalid so that it won't be used for IO operations.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: Add support for image flags
Jason Dillaman [Thu, 6 Nov 2014 14:59:57 +0000 (09:59 -0500)]
cls_rbd: Add support for image flags

Image flags are an optional addition to the RBD image header
which can be used to preserve state.  The flags support
snapshot history.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Use object map for IO operations
Jason Dillaman [Thu, 9 Oct 2014 08:38:29 +0000 (04:38 -0400)]
librbd: Use object map for IO operations

When the RBD object map feature is enabled, IO operations
now check whether or not an object exists before sending an
IO operation to RADOS.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Implement object map for tracking in-use objects
Jason Dillaman [Mon, 10 Nov 2014 15:25:13 +0000 (10:25 -0500)]
librbd: Implement object map for tracking in-use objects

The object map is stored in a new 'rbd_object_map.<id>'
object in the image's pool. The object map tracks blocks
that are in-use, non-existent, and are pending deletion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: Add methods for manipulating an image object map
Jason Dillaman [Thu, 9 Oct 2014 06:51:44 +0000 (02:51 -0400)]
cls_rbd: Add methods for manipulating an image object map

The object map will track the current state of each object
within an RBD image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorgw: also convert sharded replicalog entries 3524/head
Yehuda Sadeh [Thu, 29 Jan 2015 00:36:47 +0000 (16:36 -0800)]
rgw: also convert sharded replicalog entries

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: get rid of replicalog index_by_instance param
Yehuda Sadeh [Thu, 29 Jan 2015 00:10:34 +0000 (16:10 -0800)]
rgw: get rid of replicalog index_by_instance param

We convert old entries anyway, just complicates everything. Only use
that was kept is the one needed for the conversion function.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: fixing rebase casualties
Yehuda Sadeh [Wed, 28 Jan 2015 23:54:23 +0000 (15:54 -0800)]
rgw: fixing rebase casualties

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: convert old replicalog entries if needed
Yehuda Sadeh [Wed, 21 Jan 2015 00:36:34 +0000 (16:36 -0800)]
rgw: convert old replicalog entries if needed

If reading a bucket replicalog entry and one doesn't exist, fall back to
the old key, and convert it to the new one. When updating entries, if
entry does not exist do the same.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw-admin: add replicalog update command
Yehuda Sadeh [Wed, 21 Jan 2015 00:36:12 +0000 (16:36 -0800)]
rgw-admin: add replicalog update command

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3514 from rzarzynski/wip-10550
Gregory Farnum [Wed, 28 Jan 2015 22:04:35 +0000 (14:04 -0800)]
Merge pull request #3514 from rzarzynski/wip-10550

mds: Wip 10550

Reviewed-by: Greg Farnum <gfarnum@redhat.com>