]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoconfigure.ac: no use to add "+" before ac_ext=c 6973/head
Kefu Chai [Tue, 5 May 2015 07:07:33 +0000 (15:07 +0800)]
configure.ac: no use to add "+" before ac_ext=c

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 899dd23766c5ae6fef39bf24ef0692127d17deb3)
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #6544 from liewegas/wip-smaller-object-info
Sage Weil [Thu, 17 Dec 2015 15:16:29 +0000 (10:16 -0500)]
Merge pull request #6544 from liewegas/wip-smaller-object-info

osd: make encoded object_info_t smaller to fit inside the XFS inode

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoosd/osd_types: skip encoding newer object_info_t fields if they are unused 6544/head
Sage Weil [Mon, 14 Dec 2015 18:13:33 +0000 (13:13 -0500)]
osd/osd_types: skip encoding newer object_info_t fields if they are unused

This reduces the size of the encoded object_info_t in most cases,
enough to get us under the 255 byte limit for a single inline
xattr in XFS.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: do not set local_mtime on non-tiered pool
Sage Weil [Mon, 14 Dec 2015 18:00:27 +0000 (13:00 -0500)]
osd/ReplicatedPG: do not set local_mtime on non-tiered pool

If a pool isn't tiered, don't bother with setting local_mtime.  The only
users are the tiering agent (which isn't needed if there is not tiering)
and scrub for deciding if an object should get its digest recorded (we can
use mtime instead).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/PGBackend: use mtime for digest decision if local_mtime is empty
Sage Weil [Mon, 14 Dec 2015 17:59:29 +0000 (12:59 -0500)]
osd/PGBackend: use mtime for digest decision if local_mtime is empty

If we don't have a local_mtime value, use mtime instead, for the purposes
of deciding if we should record a digest after scrub.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: do not set omap digest if there is no omap
Sage Weil [Mon, 14 Dec 2015 16:35:46 +0000 (11:35 -0500)]
osd/ReplicatedPG: do not set omap digest if there is no omap

We want to avoid encoding it if we can.  And if the FLAG_OMAP is not set
we don't need to *also* store an empty crc.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6527 from theanalyst/wip-12856-hammer
Loic Dachary [Wed, 2 Dec 2015 19:48:00 +0000 (20:48 +0100)]
Merge pull request #6527 from theanalyst/wip-12856-hammer

rgw: missing handling of encoding-type=url when listing keys in bucket

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #6491 from SUSE/wip-13716-hammer
Loic Dachary [Wed, 2 Dec 2015 19:47:43 +0000 (20:47 +0100)]
Merge pull request #6491 from SUSE/wip-13716-hammer

rgw:swift use Civetweb ssl can not get right url

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #6351 from theanalyst/wip-13538-hammer
Loic Dachary [Wed, 2 Dec 2015 19:47:27 +0000 (20:47 +0100)]
Merge pull request #6351 from theanalyst/wip-13538-hammer

rgw: orphan tool should be careful about removing head objects

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #6349 from theanalyst/wip-13540-hammer
Loic Dachary [Wed, 2 Dec 2015 19:47:09 +0000 (20:47 +0100)]
Merge pull request #6349 from theanalyst/wip-13540-hammer

rgw: get bucket location returns region name, not region api name

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5910 from kmroz/wip-hammer-backport-content-type
Loic Dachary [Wed, 2 Dec 2015 19:46:49 +0000 (20:46 +0100)]
Merge pull request #5910 from kmroz/wip-hammer-backport-content-type

rgw: backport content-type casing

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #6587 from theanalyst/wip-13758-hammer
Josh Durgin [Wed, 25 Nov 2015 16:47:10 +0000 (08:47 -0800)]
Merge pull request #6587 from theanalyst/wip-13758-hammer

common: pure virtual method called

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6352 from theanalyst/wip-13536-hammer
Daniel Gryniewicz [Wed, 25 Nov 2015 15:49:15 +0000 (10:49 -0500)]
Merge pull request #6352 from theanalyst/wip-13536-hammer

rgw: bucket listing hangs on versioned buckets

9 years agoMerge pull request #6589 from theanalyst/wip-13693-hammer
Loic Dachary [Wed, 25 Nov 2015 15:48:09 +0000 (16:48 +0100)]
Merge pull request #6589 from theanalyst/wip-13693-hammer

osd: bug with cache/tiering and snapshot reads

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6585 from theanalyst/wip-13753-hammer
Loic Dachary [Wed, 25 Nov 2015 15:22:10 +0000 (16:22 +0100)]
Merge pull request #6585 from theanalyst/wip-13753-hammer

rbd: avoid re-writing old-format image header on resize

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6586 from theanalyst/wip-13755-hammer
Loic Dachary [Mon, 23 Nov 2015 18:57:03 +0000 (19:57 +0100)]
Merge pull request #6586 from theanalyst/wip-13755-hammer

rbd: QEMU hangs after creating snapshot and stopping VM

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6588 from theanalyst/wip-13770-hammer
Loic Dachary [Mon, 23 Nov 2015 16:32:21 +0000 (17:32 +0100)]
Merge pull request #6588 from theanalyst/wip-13770-hammer

Objecter: pool op callback may hang forever.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6430 from SUSE/wip-13654-hammer
Loic Dachary [Mon, 23 Nov 2015 14:13:24 +0000 (15:13 +0100)]
Merge pull request #6430 from SUSE/wip-13654-hammer

crush: crash if we see CRUSH_ITEM_NONE in early rule step

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6420 from SUSE/wip-13637-hammer
Loic Dachary [Mon, 23 Nov 2015 08:28:09 +0000 (09:28 +0100)]
Merge pull request #6420 from SUSE/wip-13637-hammer

FileStore: potential memory leak if getattrs fails.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6528 from theanalyst/wip-13695-hammer
Loic Dachary [Sat, 21 Nov 2015 08:10:27 +0000 (09:10 +0100)]
Merge pull request #6528 from theanalyst/wip-13695-hammer

init-rbdmap uses distro-specific functions

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #6499 from SUSE/wip-13692-hammer
Loic Dachary [Sat, 21 Nov 2015 08:07:13 +0000 (09:07 +0100)]
Merge pull request #6499 from SUSE/wip-13692-hammer

osd: do not cache unused memory in attrs

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6143 from dachary/wip-13340-hammer
Loic Dachary [Sat, 21 Nov 2015 07:59:25 +0000 (08:59 +0100)]
Merge pull request #6143 from dachary/wip-13340-hammer

small probability sigabrt when setting rados_osd_op_timeout

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5773 from tchaikov/wip-12835-hammer
Loic Dachary [Sat, 21 Nov 2015 07:58:11 +0000 (08:58 +0100)]
Merge pull request #5773 from tchaikov/wip-12835-hammer

mon: map_cache can become inaccurate if osd does not receive the osdmaps

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6580 from dachary/wip-13786-hammer
Loic Dachary [Thu, 19 Nov 2015 18:45:25 +0000 (19:45 +0100)]
Merge pull request #6580 from dachary/wip-13786-hammer

rbd-replay-* moved from ceph-test-dbg to ceph-common-dbg as well

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6286 from dillaman/wip-13460-hammer
Loic Dachary [Thu, 19 Nov 2015 18:45:03 +0000 (19:45 +0100)]
Merge pull request #6286 from dillaman/wip-13460-hammer

rbd-replay-prep and rbd-replay improvements

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5790 from SUSE/wip-12932-hammer
Loic Dachary [Thu, 19 Nov 2015 18:41:20 +0000 (19:41 +0100)]
Merge pull request #5790 from SUSE/wip-12932-hammer

Miscellaneous spec file fixes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6644 from dachary/wip-13812-upgrade
Kefu Chai [Thu, 19 Nov 2015 11:13:11 +0000 (19:13 +0800)]
Merge pull request #6644 from dachary/wip-13812-upgrade

revert: osd: use GMT time for hitsets

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorevert: osd: use GMT time for hitsets 6644/head
Loic Dachary [Wed, 18 Nov 2015 17:08:58 +0000 (18:08 +0100)]
revert: osd: use GMT time for hitsets

"Merge pull request #5825 from tchaikov/wip-12848-hammer"

This reverts commit 39544718dc2f09bcfdc632ac72fd2a3cda87687e, reversing
changes made to 4ad97162026e1eb6e6e948ddf3eb39f711431e45.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6402 from SUSE/wip-13621-hammer
Loic Dachary [Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)]
Merge pull request #6402 from SUSE/wip-13621-hammer

CephFS restriction on removing cache tiers is overly strict

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6354 from theanalyst/wip-13387-hammer
Loic Dachary [Mon, 16 Nov 2015 21:06:51 +0000 (22:06 +0100)]
Merge pull request #6354 from theanalyst/wip-13387-hammer

librbd: reads larger than cache size hang

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6289 from dillaman/wip-13461-hammer
Loic Dachary [Mon, 16 Nov 2015 18:48:07 +0000 (19:48 +0100)]
Merge pull request #6289 from dillaman/wip-13461-hammer

librbd: invalidate object map on error even w/o holding lock

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6153 from dachary/wip-13205-hammer
Loic Dachary [Mon, 16 Nov 2015 17:06:25 +0000 (18:06 +0100)]
Merge pull request #6153 from dachary/wip-13205-hammer

ReplicatedBackend: populate recovery_info.size for clone (bug symptom is size mismatch on replicated backend on a clone in scrub)

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6158 from dachary/wip-13336-hammer
Loic Dachary [Mon, 16 Nov 2015 17:06:12 +0000 (18:06 +0100)]
Merge pull request #6158 from dachary/wip-13336-hammer

osd: we do not ignore notify from down osds

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6335 from Abhishekvrshny/wip-13488-hammer
Loic Dachary [Mon, 16 Nov 2015 17:06:01 +0000 (18:06 +0100)]
Merge pull request #6335 from Abhishekvrshny/wip-13488-hammer

object_info_t::decode() has wrong version

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6401 from SUSE/wip-13620-hammer
Loic Dachary [Mon, 16 Nov 2015 17:05:39 +0000 (18:05 +0100)]
Merge pull request #6401 from SUSE/wip-13620-hammer

osd: pg stuck in replay

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agobuild/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg 6580/head
Loic Dachary [Fri, 13 Nov 2015 18:10:28 +0000 (19:10 +0100)]
build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg

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

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit a0204dc47acc0c50223e449fd23a2fc97bfd111a)

    Conflicts:
     debian/control: << 0.94.5-2 is appropriate for hammer

9 years agoosd: fix the snapshot reads of evicted tiering pool 6589/head
Kefu Chai [Tue, 29 Sep 2015 14:26:48 +0000 (22:26 +0800)]
osd: fix the snapshot reads of evicted tiering pool

reset ssc->exsits in finish_ctx() if the ctx->cache_evict is true, and
the head is removed.

Fixes: #12748
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b61f3e43f1c9d43daa0dedd7cbd0fe5787cbdfbb)

9 years agoObjecter: pool_op callback may hang forever. 6588/head
xiexingguo [Thu, 29 Oct 2015 12:04:11 +0000 (20:04 +0800)]
Objecter: pool_op callback may hang forever.

pool_op callback may hang forever due to osdmap update during reply handling.
Fixes: #13642
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 00c6fa9e31975a935ed2bb33a099e2b4f02ad7f2)

9 years agoWorkQueue: new PointerWQ base class for ContextWQ 6587/head
Jason Dillaman [Tue, 7 Jul 2015 16:11:13 +0000 (12:11 -0400)]
WorkQueue: new PointerWQ base class for ContextWQ

The existing work queues do not properly function if added to a running
thread pool.  librbd uses a singleton thread pool which requires
dynamically adding/removing work queues as images are opened and closed.

Fixes: #13636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3e78b18b09d75626ca2599bac3b9f9c9889507a5)

Conflicts:
src/common/WorkQueue.h
Trivial merge conflict at class `ContextWQ` initialization

9 years agolibrbd: fixed deadlock while attempting to flush AIO requests 6586/head
Jason Dillaman [Mon, 9 Nov 2015 16:22:24 +0000 (11:22 -0500)]
librbd: fixed deadlock while attempting to flush AIO requests

In-flight AIO requests might force a flush if a snapshot was created
out-of-band.  The flush completion was previously invoked asynchronously,
potentially via the same thread worker handling the AIO request. This
resulted in the flush operation deadlocking since it can't complete.

Fixes: #13726
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit bfeb90e5fe24347648c72345881fd3d932243c98)

9 years agotests: new test case to catch deadlock on RBD image refresh
Jason Dillaman [Mon, 9 Nov 2015 15:48:10 +0000 (10:48 -0500)]
tests: new test case to catch deadlock on RBD image refresh

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a9729d9553e7fb925509cad8d388cf52a9fede9c)

9 years agolibrbd: resize should only update image size within header 6585/head
Jason Dillaman [Mon, 2 Nov 2015 21:50:19 +0000 (16:50 -0500)]
librbd: resize should only update image size within header

Previously, the whole RBD image format 1 header struct was
re-written to disk on a resize operation.

Fixes: #13674
Backport: infernalis, hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d5be20b6d4646284571568ab28cbf45b0729390b)

9 years agoceph.spec.in: lttng in SLES12 only 5790/head
Nathan Cutler [Tue, 29 Sep 2015 08:39:16 +0000 (10:39 +0200)]
ceph.spec.in: lttng in SLES12 only

Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
build targets. The lttng/babeltrace stuff is currently available only in
SLE_12.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bf9ca1eb107c4462d8768faf3ff4db7972384ffd)

Conflicts:
ceph.spec.in
            trivial resolution

9 years agoceph.spec.in: fix lttng/babeltrace conditionals
Nathan Cutler [Wed, 15 Jul 2015 10:54:20 +0000 (12:54 +0200)]
ceph.spec.in: fix lttng/babeltrace conditionals

lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e267128ce22d8b8cd83f6d6d82f24f496600e678)

Conflicts:
ceph.spec.in
            Dropped Requires: xmlstarlet in ceph-test that had inadvertently
            been grabbed from d2cc2b1

9 years agopackaging: move rbd-replay* to ceph-common
Ken Dreyer [Tue, 8 Sep 2015 16:41:02 +0000 (10:41 -0600)]
packaging: move rbd-replay* to ceph-common

The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 96486fd6f284ca3ab67f4f94631896d41c529e85)

Conflicts:
ceph.spec.in
            50a33dea has not been backported to hammer
debian/ceph-test.install
            50a33dea has not been backported to hammer
debian/control
            different ceph-test Replaces: and Breaks: version

9 years agoMerge pull request #6213 from SUSE/wip-13425-hammer
Loic Dachary [Wed, 11 Nov 2015 10:59:36 +0000 (11:59 +0100)]
Merge pull request #6213 from SUSE/wip-13425-hammer

wrong conditional for boolean function KeyServer::get_auth()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6336 from Abhishekvrshny/wip-13535-hammer
Loic Dachary [Wed, 11 Nov 2015 05:59:55 +0000 (06:59 +0100)]
Merge pull request #6336 from Abhishekvrshny/wip-13535-hammer

LibRadosWatchNotify.WatchNotify2Timeout

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6391 from SUSE/wip-13590-hammer
Loic Dachary [Wed, 11 Nov 2015 05:59:42 +0000 (06:59 +0100)]
Merge pull request #6391 from SUSE/wip-13590-hammer

mon: should not set isvalid = true when cephx_verify_authorizer return false

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6398 from SUSE/wip-13588-hammer
Loic Dachary [Wed, 11 Nov 2015 05:58:55 +0000 (06:58 +0100)]
Merge pull request #6398 from SUSE/wip-13588-hammer

OSD::build_past_intervals_parallel() shall reset primary and up_primary when begin a new past_interval.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6199 from liewegas/wip-randomize-scrub-hammer
Loic Dachary [Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)]
Merge pull request #6199 from liewegas/wip-randomize-scrub-hammer

osd: randomize scrub times

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5825 from tchaikov/wip-12848-hammer
Loic Dachary [Tue, 10 Nov 2015 19:23:23 +0000 (20:23 +0100)]
Merge pull request #5825 from tchaikov/wip-12848-hammer

ReplicatedPG::hit_set_trim osd/ReplicatedPG.cc: 11006: FAILED assert(obc)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoinit-rbdmap: Rewrite to use logger + clean-up 6528/head
Boris Ranto [Fri, 23 Oct 2015 13:31:27 +0000 (15:31 +0200)]
init-rbdmap: Rewrite to use logger + clean-up

This patch rewrites the init-rbdmap init script so that it uses logger
instead of the log_* functions. The patch also fixes various smaller
bugs like:
* MAP_RV was undefined if mapping already existed
* UMNT_RV and UMAP_RV were almost always empty (if they succeeded) ->
  removed them
* use of continue instead RET_OP in various places (RET_OP was not being
  checked after the switch to logger messages)
* removed use of DESC (used only twice and only one occurrence actually
  made sense)

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit c567341e98fffbe39177f951511a7698f88abf5f)

9 years agoceph.spec.in: We no longer need redhat-lsb-core
Boris Ranto [Fri, 23 Oct 2015 14:39:16 +0000 (16:39 +0200)]
ceph.spec.in: We no longer need redhat-lsb-core

Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 15600572265bed397fbd80bdd2b7d83a0e9bd918)

Conflicts:
ceph.spec.in
Merge conflict because there were other commits that introduced systemd
& SUSE specific bits in the master which havent yet reached
hammer. Since this commit only removed redhat-lsb-core from *el distros
removing the specific lines

9 years agorgw: implement s3 encoding-type for get bucket 6527/head
Jeff Weber [Wed, 5 Aug 2015 23:06:46 +0000 (19:06 -0400)]
rgw: implement s3 encoding-type for get bucket

This change introduces handling for the encoding-type request
parameter on the get bucket operation. An object key may contain
characters which are not supported in XML. Passing the value "url" for
the encoding-type parameter will cause the key to be urlencoded in the
response.

Fixes: #12735
Signed-off-by: Jeff Weber <jweber@cofront.net>
(cherry picked from commit 180ca7b56ba91a3995c76dac698aa4ee31d9a2ce)

9 years agoObjecter: maybe access wild pointer(op) in _op_submit_with_budget. 6143/head
Ruifeng Yang [Fri, 25 Sep 2015 02:18:11 +0000 (10:18 +0800)]
Objecter: maybe access wild pointer(op) in _op_submit_with_budget.

look at "after giving up session lock it can be freed at any time by response handler" in _op_submit,
so the _op_submit_with_budget::op maybe is wild after call _op_submit.

Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit 0635b1358354b19ae44105576f730381f3b5b963)

9 years agoObjecter: repeated free op->ontimeout.
Ruifeng Yang [Fri, 25 Sep 2015 04:42:28 +0000 (12:42 +0800)]
Objecter: repeated free op->ontimeout.

repeated free op->ontimeout in SafeTimer::timer_thread::callback->complete

Fixes: #13208
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit f1d8a8f577cee6d66f4dcffac667675f18145ebb)

9 years agoReplicatedBackend::prepare_pull: set recover_info.size for clones 6153/head
Samuel Just [Fri, 28 Aug 2015 19:46:57 +0000 (12:46 -0700)]
ReplicatedBackend::prepare_pull: set recover_info.size for clones

Fixes: #12828
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1d3e46bedb9a8c0d2200e39f62f4e2c3337619f3)

9 years agoMerge pull request #6157 from dachary/wip-13040-hammer
Loic Dachary [Tue, 10 Nov 2015 09:34:01 +0000 (10:34 +0100)]
Merge pull request #6157 from dachary/wip-13040-hammer

common/Thread:pthread_attr_destroy(thread_attr) when done with it

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6155 from dachary/wip-13171-hammer
Loic Dachary [Tue, 10 Nov 2015 09:33:41 +0000 (10:33 +0100)]
Merge pull request #6155 from dachary/wip-13171-hammer

objecter: cancellation bugs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6152 from dachary/wip-13233-hammer
Loic Dachary [Tue, 10 Nov 2015 09:33:19 +0000 (10:33 +0100)]
Merge pull request #6152 from dachary/wip-13233-hammer

mon: include min_last_epoch_clean as part of PGMap::print_summary and PGMap::dump

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6146 from dachary/wip-13337-hammer
Loic Dachary [Tue, 10 Nov 2015 09:33:01 +0000 (10:33 +0100)]
Merge pull request #6146 from dachary/wip-13337-hammer

segfault in agent_work

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6145 from dachary/wip-13338-hammer
Loic Dachary [Tue, 10 Nov 2015 09:32:53 +0000 (10:32 +0100)]
Merge pull request #6145 from dachary/wip-13338-hammer

filestore: fix peek_queue for OpSequencer

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6144 from dachary/wip-13339-hammer
Loic Dachary [Tue, 10 Nov 2015 09:32:42 +0000 (10:32 +0100)]
Merge pull request #6144 from dachary/wip-13339-hammer

mon: check for store writeablility before participating in election

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5891 from Abhishekvrshny/wip-13035-hammer
Loic Dachary [Tue, 10 Nov 2015 09:30:54 +0000 (10:30 +0100)]
Merge pull request #5891 from Abhishekvrshny/wip-13035-hammer

requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5890 from Abhishekvrshny/wip-13037-hammer
Loic Dachary [Tue, 10 Nov 2015 09:30:38 +0000 (10:30 +0100)]
Merge pull request #5890 from Abhishekvrshny/wip-13037-hammer

hit set clear repops fired in same epoch as map change -- segfault since they fall into the new interval even though the repops are cleared

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6322 from sponce/WIP-13210-hammer
Loic Dachary [Tue, 10 Nov 2015 09:21:07 +0000 (10:21 +0100)]
Merge pull request #6322 from sponce/WIP-13210-hammer

tests : BACKPORT #13210 Fixed broken Makefiles after integration of ttng into rados

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agobug fix: osd: do not cache unused buffer in attrs 6499/head
Xinze Chi [Sun, 2 Aug 2015 10:36:40 +0000 (18:36 +0800)]
bug fix: osd: do not cache unused buffer in attrs

attrs only reference the origin bufferlist (decode from MOSDPGPush or
ECSubReadReply message) whose size is much greater than attrs in recovery.
If obc cache it (get_obc maybe cache the attr), this causes the whole origin
bufferlist would not be free until obc is evicted from obc cache. So rebuild
the bufferlist before cache it.

Fixes: #12565
Signed-off-by: Ning Yao <zay11022@gmail.com>
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit c5895d3fad9da0ab7f05f134c49e22795d5c61f3)

9 years agoMerge pull request #5810 from Abhishekvrshny/wip-12948-hammer
Loic Dachary [Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)]
Merge pull request #5810 from Abhishekvrshny/wip-12948-hammer

Heavy memory shuffling in rados bench

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw:swift use Civetweb ssl can not get right url 6491/head
Weijun Duan [Fri, 30 Oct 2015 01:46:02 +0000 (21:46 -0400)]
rgw:swift use Civetweb ssl can not get right url

Fixes: #13628
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
(cherry picked from commit e0fd540bf441e2f8276cbd96c601a0539892efe2)

9 years agoMerge pull request #5530 from SUSE/wip-12587-hammer
Loic Dachary [Thu, 5 Nov 2015 12:12:11 +0000 (13:12 +0100)]
Merge pull request #5530 from SUSE/wip-12587-hammer

FileStore calls syncfs(2) even it is not supported

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5889 from Abhishekvrshny/wip-13042-hammer
Loic Dachary [Wed, 4 Nov 2015 18:38:53 +0000 (19:38 +0100)]
Merge pull request #5889 from Abhishekvrshny/wip-13042-hammer

ThreadPool add/remove work queue methods not thread safe

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6151 from dachary/wip-13245-hammer
Loic Dachary [Wed, 4 Nov 2015 18:14:28 +0000 (19:14 +0100)]
Merge pull request #6151 from dachary/wip-13245-hammer

client nonce collision due to unshared pid namespaces

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6159 from dachary/wip-13341-hammer
Loic Dachary [Wed, 4 Nov 2015 10:36:39 +0000 (11:36 +0100)]
Merge pull request #6159 from dachary/wip-13341-hammer

ceph upstart script rbdmap.conf incorrectly processes parameters

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6154 from dachary/wip-13195-hammer
Loic Dachary [Wed, 4 Nov 2015 10:34:07 +0000 (11:34 +0100)]
Merge pull request #6154 from dachary/wip-13195-hammer

should recalc the min_last_epoch_clean when decode PGMap

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6132 from SUSE/wip-13307-hammer
Loic Dachary [Wed, 4 Nov 2015 10:28:03 +0000 (11:28 +0100)]
Merge pull request #6132 from SUSE/wip-13307-hammer

dumpling incrementals do not work properly on hammer and newer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6097 from dillaman/wip-13045-hammer
Loic Dachary [Wed, 4 Nov 2015 10:23:14 +0000 (11:23 +0100)]
Merge pull request #6097 from dillaman/wip-13045-hammer

librbd: diff_iterate needs to handle holes in parent images

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6060 from XinzeChi/wip-hammer-outdata-set
Loic Dachary [Wed, 4 Nov 2015 10:22:25 +0000 (11:22 +0100)]
Merge pull request #6060 from XinzeChi/wip-hammer-outdata-set

bug fix: osd: avoid multi set osd_op.outdata in tier pool

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5897 from tchaikov/wip-12940-hammer
Loic Dachary [Wed, 4 Nov 2015 10:20:50 +0000 (11:20 +0100)]
Merge pull request #5897 from tchaikov/wip-12940-hammer

IO error on kvm/rbd with an erasure coded pool tier

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5787 from SUSE/wip-12923-hammer
Loic Dachary [Wed, 4 Nov 2015 10:11:00 +0000 (11:11 +0100)]
Merge pull request #5787 from SUSE/wip-12923-hammer

logrotate reload error on Ubuntu 14.04

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5766 from dachary/wip-12590-hammer
Loic Dachary [Wed, 4 Nov 2015 10:10:26 +0000 (11:10 +0100)]
Merge pull request #5766 from dachary/wip-12590-hammer

ceph mds add_data_pool check for EC pool is wrong

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5361 from ceph/wip-11786.hammer
Loic Dachary [Wed, 4 Nov 2015 10:06:18 +0000 (11:06 +0100)]
Merge pull request #5361 from ceph/wip-11786.hammer

mon: MonitorDBStore: get_next_key() only if prefix matches

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agocrush/mapper: ensure take bucket value is valid 6430/head
Sage Weil [Tue, 13 Oct 2015 13:55:01 +0000 (09:55 -0400)]
crush/mapper: ensure take bucket value is valid

Ensure that the take argument is a valid bucket ID before indexing the
buckets array.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 93ec538e8a667699876b72459b8ad78966d89c61)

9 years agocrush/mapper: ensure bucket id is valid before indexing buckets array
Sage Weil [Wed, 28 Oct 2015 00:55:26 +0000 (20:55 -0400)]
crush/mapper: ensure bucket id is valid before indexing buckets array

We were indexing the buckets array without verifying the index was within
the [0,max_buckets) range.  This could happen because a multistep rule
does not have enough buckets and has CRUSH_ITEM_NONE
for an intermediate result, which would feed in CRUSH_ITEM_NONE and
make us crash.

Fixes: #13477
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 976a24a326da8931e689ee22fce35feab5b67b76)

9 years agoFileStore: potential memory leak if _fgetattrs fails 6420/head
xiexingguo [Mon, 26 Oct 2015 10:38:01 +0000 (18:38 +0800)]
FileStore: potential memory leak if _fgetattrs fails

Memory leak happens if _fgetattrs encounters some error and simply returns.
Fixes: #13597
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ace7dd096b58a88e25ce16f011aed09269f2a2b4)

9 years agoFix casing of Content-Type header 5910/head
Robin H. Johnson [Fri, 4 Sep 2015 01:07:48 +0000 (01:07 +0000)]
Fix casing of Content-Type header

It turns out, despite the HTTP spec declaring that header field names
should be case-insensitive, some clients treat them wrongly, and
consider "Content-type" to not match "Content-Type".

CyberDuck was one of those clients, now fixed upstream in
https://trac.cyberduck.io/ticket/8999

To reduce future occurances of this bug, fix the casing of the
Content-Type header, to strictly comply with the HTTP specification (be
strict about what you send, and generous about what you receive).

Fixes: #12939
Backport: infernalis, hammer, firefly
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 1b9fbffdc24160251b96cec820d62fb2a12b6eab)

9 years agoqa: update cephtool test for CephFS tier cases 6402/head
John Spray [Mon, 1 Jun 2015 12:55:22 +0000 (13:55 +0100)]
qa: update cephtool test for CephFS tier cases

1. Creating a filesystem using a
   readonly tier on an EC pool (should be forbidden)
2. Removing a tier from a replicated base pool (should
   be permitted)

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit f9b11b0abe7c2b0dcdfc5802336be8a0426ccb3a)

9 years agomon: forbid readonly cache tiers for CephFS
John Spray [Mon, 1 Jun 2015 12:54:25 +0000 (13:54 +0100)]
mon: forbid readonly cache tiers for CephFS

For EC pools, we need a tier that is not just forwarding
writes, in order to provide the ops required
by CephFS.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 11e5faf3c1d4fa28a8b41e3a92f0f684a844e5f5)

9 years agomon: refine check_remove_tier checks
John Spray [Thu, 7 May 2015 13:23:37 +0000 (14:23 +0100)]
mon: refine check_remove_tier checks

Fixes: #11504
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit a50c8f1f2ad8845c7f77110868f9376f2d1ff883)

9 years agoosd: fix requeue of replay requests during activating 6401/head
Sage Weil [Tue, 22 Sep 2015 17:57:37 +0000 (13:57 -0400)]
osd: fix requeue of replay requests during activating

If the replay period expires while we are still in the activating
state, we can simply insert our list of requests at the front of
the waiting_for_active list.

Fixes: #13116
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d18cf51d9419819cdda3782b188b010969288911)

9 years agoOSD:shall reset primary and up_primary fields when beginning a new past_interval. 6398/head
xiexingguo [Tue, 13 Oct 2015 06:04:20 +0000 (14:04 +0800)]
OSD:shall reset primary and up_primary fields when beginning a new past_interval.

Shall reset primary and up_primary fields when we start over a new past_interval in OSD::build_past_intervals_parallel().
Fixes: #13471
Signed-off-by: xie.xingguo@zte.com.cn
(cherry picked from commit 65064ca05bc7f8b6ef424806d1fd14b87add62a4)

9 years agomon: should not set isvalid = true when cephx_verify_authorizer return false 6391/head
yangruifeng [Mon, 19 Oct 2015 12:08:12 +0000 (08:08 -0400)]
mon: should not set isvalid = true when cephx_verify_authorizer return false

Fixes: #13525
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit c7f75b8f7c0a773148ec16141941efd00ee76626)

9 years ago0.94.5 v0.94.5
Jenkins [Mon, 26 Oct 2015 14:05:32 +0000 (07:05 -0700)]
0.94.5

9 years agoceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead
Ken Dreyer [Mon, 16 Mar 2015 16:02:35 +0000 (10:02 -0600)]
ceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead

Fedora 12 has been EOL for a long time. Remove the reference in the
RPM .spec file.

Since RHEL 5 support for Ceph is a work in progress, we won't remove
this entire python_sitelib / python_sitearch conditional for now, since
those are still needed on RHEL 5.

Add the rhel_version macro to make the conditional compatible with
SUSE's OBS.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 353a3258968f76deaea4542d2165e9ab32b88de8)

9 years agopackaging: Add rgw placeholder dirs in proper packages
Travis Rhoden [Fri, 8 May 2015 00:13:53 +0000 (20:13 -0400)]
packaging: Add rgw placeholder dirs in proper packages

Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
(cherry picked from commit bf93128f664ac74383806530a1f974edde8df5b6)

Conflicts:
    ceph.spec.in
        hammer uses %ghost

9 years agoceph.spec.in: consolidate centos/rhel macros
Nathan Cutler [Fri, 15 May 2015 19:39:39 +0000 (21:39 +0200)]
ceph.spec.in: consolidate centos/rhel macros

0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 46404dd381e240634d224e77adc69f0ba4807045)

Conflicts:
ceph.spec.in
            https://github.com/ceph/ceph/pull/4068 has not been backported

9 years agopackaging: make logrotate a hard dependency across all distros
Nathan Cutler [Thu, 25 Jun 2015 14:55:10 +0000 (16:55 +0200)]
packaging: make logrotate a hard dependency across all distros

Given ceph's reputation for voluminous logs, it makes sense for
logrotate to be a hard dependency for all distros.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0734cd1ec3ca3bd012686dc1bdda675909224a49)

9 years agoceph.spec.in: add missing -%{release}
Nathan Cutler [Thu, 9 Jul 2015 10:05:24 +0000 (12:05 +0200)]
ceph.spec.in: add missing -%{release}

We have it everywhere else and I can't think of any reason why
it should be omitted here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d952d59ae95d5f66aa4b98fd7aa4f4ecb36a4848)

9 years agoceph.spec.in: remove duplicate BuildRequires: sharutils
Nathan Cutler [Fri, 26 Jun 2015 18:21:59 +0000 (20:21 +0200)]
ceph.spec.in: remove duplicate BuildRequires: sharutils

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c418bd9615e6f23f3c14ae9e71003c66d31d4b78)

9 years agoceph.spec.in: fix python-flask dependency for SUSE
Nathan Cutler [Mon, 15 Jun 2015 10:58:00 +0000 (12:58 +0200)]
ceph.spec.in: fix python-flask dependency for SUSE

In SLE and openSUSE, the package is called python-Flask with an upper-case F.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490)

Conflicts:
ceph.spec.in
            add missing SUSE-specific build deps

9 years agoceph.spec.in: clarify two important comments
Nathan Cutler [Thu, 25 Jun 2015 16:55:39 +0000 (18:55 +0200)]
ceph.spec.in: clarify two important comments

First, the terms "common" and "specific" are vague. Second,
"common" can easily be confused with the ceph-common subpackage.

Fix this by rephrasing to "distro-unconditional dependencies" and
"distro-conditional dependencies", respectively.

Third, move the "distro-unconditional dependencies" header so it
is above the part where these dependencies are actually defined.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit dd212fd1d367f70c61f65a97599959668b44aa53)