]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoObjecter: pg_interval_t::is_new_interval needs pgid from previous pool 5691/head
Jason Dillaman [Fri, 21 Aug 2015 15:32:39 +0000 (11:32 -0400)]
Objecter: pg_interval_t::is_new_interval needs pgid from previous pool

When increasing the pg_num of a pool, an assert would fail since the
calculated pgid seed would be for the pool's new pg_num value instead
of the previous pg_num value.

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

Conflicts: (hobject_t sort order not backported, trivial resolution)
src/osdc/Objecter.cc
src/osdc/Objecter.h

9 years agoosd_types::is_new_interval: size change triggers new interval
Samuel Just [Tue, 26 May 2015 19:35:11 +0000 (12:35 -0700)]
osd_types::is_new_interval: size change triggers new interval

Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit ff79959c037a7145f7104b06d9e6a64492fdb95f)

9 years agoMerge remote-tracking branch 'gh/wip-12536-hammer' into hammer
Sage Weil [Thu, 27 Aug 2015 17:07:29 +0000 (13:07 -0400)]
Merge remote-tracking branch 'gh/wip-12536-hammer' into hammer

This includes wip-osd-compat-hammer.

9 years ago0.94.3 v0.94.3
Jenkins [Wed, 26 Aug 2015 17:39:37 +0000 (10:39 -0700)]
0.94.3

9 years agoMerge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer
Sage Weil [Wed, 19 Aug 2015 13:52:02 +0000 (09:52 -0400)]
Merge remote-tracking branch 'gh/wip-osd-compat-hammer' into wip-12536-hammer

9 years agoMerge pull request #5589 from ceph/hammer-12709 5608/head
Gregory Farnum [Tue, 18 Aug 2015 11:43:57 +0000 (12:43 +0100)]
Merge pull request #5589 from ceph/hammer-12709

Workunits : fs/misc/chmod.sh : Include ACL characters in permission check

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoWorkunits : fs/misc/chmod.sh : Include ACL characters in permission check. 5589/head
Yazen Ghannam [Mon, 4 May 2015 16:33:16 +0000 (12:33 -0400)]
Workunits : fs/misc/chmod.sh : Include ACL characters in permission check.

Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
(cherry picked from commit d3dbfffefb0ae53583350f53258dc902670da659)

9 years agohobject_t: fix get_boundary to work with new sorting regime
Sage Weil [Tue, 23 Dec 2014 19:03:17 +0000 (11:03 -0800)]
hobject_t: fix get_boundary to work with new sorting regime

The hash is no longer the most significant field; set everything that is
more significant, too.

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

9 years agomon: disallow post-hammer OSDs if there are up pre-hammer OSDs 5471/head
Sage Weil [Tue, 4 Aug 2015 17:21:50 +0000 (13:21 -0400)]
mon: disallow post-hammer OSDs if there are up pre-hammer OSDs

Force *all* OSDs to upgrade to hammer before allowing post-hammer
OSDs to join.  This prevents any pre-hammer OSDs from running at
the same time as a post-hammer OSD.

This commit, as well as the definition of the sentinal post-hammer
feature, should get backported to hammer stable series.

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

# Conflicts:
# src/mon/OSDMonitor.cc

9 years agoinclude/ceph_features: define MON_METADATA feature
Sage Weil [Tue, 4 Aug 2015 17:16:11 +0000 (13:16 -0400)]
include/ceph_features: define MON_METADATA feature

This was added in master in 40307748b9b8f84c98354a7141da645a3c556ba9.  We
define it but notably do not support it!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5160 from theanalyst/wip-11910-hammer
Loic Dachary [Tue, 4 Aug 2015 11:02:17 +0000 (13:02 +0200)]
Merge pull request #5160 from theanalyst/wip-11910-hammer

mon: pg ls is broken

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5384 from dachary/wip-12502-hammer
Loic Dachary [Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)]
Merge pull request #5384 from dachary/wip-12502-hammer

rgw: need conversion tool to handle fixes following #11974

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5405 from ceph/wip-12465-hammer
Loic Dachary [Tue, 4 Aug 2015 09:22:08 +0000 (11:22 +0200)]
Merge pull request #5405 from ceph/wip-12465-hammer

Log::reopen_log_file: take m_flush_mutex

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agohobject_t: decode future hobject_t::get_min() properly
Sage Weil [Mon, 3 Aug 2015 17:05:45 +0000 (13:05 -0400)]
hobject_t: decode future hobject_t::get_min() properly

The post-hammer wip-temp branch changed hobject_t::get_min() so that pool
is INT64_MIN instead of -1 and neglected to deal with the encoding compat
with older versions.  Compensate on hammer by mapping INT64_MIN to -1
locally.  See commit ff99af38df830e215359bfb8837bf310a2023a4d.

Note that this means upgrades from hammer to post-hammer *must* include
this fix prior to the upgrade.  This will need to be well-documented in the
release notes.

Master gets a similar fix so that they map our min value to the new
INT64_MIN one on decode.

Fixes: #12536 (for hammer)
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoOSDMonitor::preprocess_get_osdmap: send the last map as well
Samuel Just [Wed, 29 Jul 2015 18:49:57 +0000 (11:49 -0700)]
OSDMonitor::preprocess_get_osdmap: send the last map as well

Fixes: #12410
Backport: hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1320e29dfaee9995409a6d99b9ccaa748dc67b90)

9 years agoMerge pull request #5121 from theanalyst/wip-11983-hammer
Sage Weil [Fri, 31 Jul 2015 19:18:52 +0000 (15:18 -0400)]
Merge pull request #5121 from theanalyst/wip-11983-hammer

FAILED assert(!old_value.deleted()) in upgrade:giant-x-hammer-distro-basic-multi run

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5269 from dachary/wip-12362-hammer
Sage Weil [Fri, 31 Jul 2015 19:17:00 +0000 (15:17 -0400)]
Merge pull request #5269 from dachary/wip-12362-hammer

stuck incomplete

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5117 from theanalyst/wip-12099-hammer
Loic Dachary [Fri, 31 Jul 2015 18:55:48 +0000 (20:55 +0200)]
Merge pull request #5117 from theanalyst/wip-12099-hammer

rgw: rados objects wronly deleted

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5118 from theanalyst/wip-12042-hammer
Loic Dachary [Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)]
Merge pull request #5118 from theanalyst/wip-12042-hammer

DragonDisk fails to create directories via S3: MissingContentLength

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5214 from SUSE/wip-12299-hammer
Loic Dachary [Fri, 31 Jul 2015 18:55:14 +0000 (20:55 +0200)]
Merge pull request #5214 from SUSE/wip-12299-hammer

RGW Swift API: support for 202 Accepted response code on container creation

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5226 from SUSE/wip-12322-hammer
Loic Dachary [Fri, 31 Jul 2015 18:54:57 +0000 (20:54 +0200)]
Merge pull request #5226 from SUSE/wip-12322-hammer

rgw: keystone does not support chunked input

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5227 from SUSE/wip-12323-hammer
Loic Dachary [Fri, 31 Jul 2015 18:54:41 +0000 (20:54 +0200)]
Merge pull request #5227 from SUSE/wip-12323-hammer

RGW Swift API: XML document generated in response for GET on account does not contain account name

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5228 from theanalyst/wip-11872-hammer
Loic Dachary [Fri, 31 Jul 2015 18:54:26 +0000 (20:54 +0200)]
Merge pull request #5228 from theanalyst/wip-11872-hammer

RGW does not send Date HTTP header when civetweb frontend is used

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5229 from theanalyst/wip-12242-hammer
Loic Dachary [Fri, 31 Jul 2015 18:54:02 +0000 (20:54 +0200)]
Merge pull request #5229 from theanalyst/wip-12242-hammer

Fix tool for #11442 does not correctly fix objects created via multipart uploads

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5237 from theanalyst/wip-12245-hammer
Loic Dachary [Fri, 31 Jul 2015 18:53:41 +0000 (20:53 +0200)]
Merge pull request #5237 from theanalyst/wip-12245-hammer

rgw: empty json response when getting user quota

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5284 from SUSE/wip-12398-hammer
Loic Dachary [Fri, 31 Jul 2015 18:53:18 +0000 (20:53 +0200)]
Merge pull request #5284 from SUSE/wip-12398-hammer

rgw: Properly respond to the Connection header with Civetweb

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5285 from SUSE/wip-12399-hammer
Loic Dachary [Fri, 31 Jul 2015 18:53:04 +0000 (20:53 +0200)]
Merge pull request #5285 from SUSE/wip-12399-hammer

rgw: multipart list part response returns incorrect field

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5286 from SUSE/wip-12400-hammer
Loic Dachary [Fri, 31 Jul 2015 18:52:43 +0000 (20:52 +0200)]
Merge pull request #5286 from SUSE/wip-12400-hammer

rgw: radosgw-admin dumps user info twice

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
9 years agoMerge pull request #5427 from dachary/wip-12088-hammer-part-2
Yan, Zheng [Fri, 31 Jul 2015 01:50:22 +0000 (09:50 +0800)]
Merge pull request #5427 from dachary/wip-12088-hammer-part-2

Fh ref count will leak if readahead does not need to do read from osd

9 years agoFh ref count will leak if readahead does not need to do read from osd 5427/head
Zhi Zhang [Wed, 22 Jul 2015 02:54:53 +0000 (10:54 +0800)]
Fh ref count will leak if readahead does not need to do read from osd

The 3c8cdeacf46ae4031189d2ef6948aa3b6ab4ae43 backport introduced a leak.

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

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
9 years agoMerge pull request #5120 from theanalyst/wip-11999-hammer
Loic Dachary [Thu, 30 Jul 2015 19:43:48 +0000 (21:43 +0200)]
Merge pull request #5120 from theanalyst/wip-11999-hammer

cephfs Dumper tries to load whole journal into memory at once

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5119 from theanalyst/wip-12098-hammer
Loic Dachary [Thu, 30 Jul 2015 19:43:21 +0000 (21:43 +0200)]
Merge pull request #5119 from theanalyst/wip-12098-hammer

kernel_untar_build fails on EL7

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5417 from dachary/wip-11998-hammer
Loic Dachary [Thu, 30 Jul 2015 15:00:14 +0000 (17:00 +0200)]
Merge pull request #5417 from dachary/wip-11998-hammer

debian/control: ceph-common (>> 0.94.2) must be >= 0.94.2-2

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodebian/control: ceph-common (>> 0.94.2) must be >= 0.94.2-2 5417/head
Loic Dachary [Thu, 30 Jul 2015 07:43:20 +0000 (09:43 +0200)]
debian/control: ceph-common (>> 0.94.2) must be >= 0.94.2-2

The d8733be2ef8874b9a858a7ffddfb81b9b656e9a6 backport introduced a
regression by adding an incorrect Depends / Break combo supposed to
reflect the fact that ceph_argparse moved from ceph to ceph-common after
v0.94.2. It assumed the package is released under the 0.94.2 version
where in reality it is released under the 0.94.2-1xxx version (where xxx
is trusty, jessie etc.).

The Depends / Break combo is changed to use 0.94.2-2 instead.

See also http://tracker.ceph.com/issues/12529 for a larger discussion.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5248 from ceph/wip-11833-hammer
Loic Dachary [Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)]
Merge pull request #5248 from ceph/wip-11833-hammer

mon: add an "osd crush tree" command

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5222 from ceph/hammer-12088
Loic Dachary [Wed, 29 Jul 2015 08:49:08 +0000 (10:49 +0200)]
Merge pull request #5222 from ceph/hammer-12088

client: reference counting 'struct Fh'

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5231 from theanalyst/wip-12243-hammer
Orit Wasserman [Tue, 28 Jul 2015 21:33:18 +0000 (23:33 +0200)]
Merge pull request #5231 from theanalyst/wip-12243-hammer

Civetweb RGW appears to report full size of object as downloaded when only partially downloaded

9 years agoMerge pull request #5243 from theanalyst/wip-12239-hammer
Loic Dachary [Tue, 28 Jul 2015 20:40:23 +0000 (22:40 +0200)]
Merge pull request #5243 from theanalyst/wip-12239-hammer

librbd/internal.cc: 1967: FAILED assert(watchers.size() == 1)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5241 from theanalyst/wip-12238-hammer
Loic Dachary [Tue, 28 Jul 2015 20:40:03 +0000 (22:40 +0200)]
Merge pull request #5241 from theanalyst/wip-12238-hammer

[  FAILED  ] TestLibRBD.ExclusiveLockTransition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5265 from SUSE/wip-12368-hammer
Loic Dachary [Tue, 28 Jul 2015 20:30:23 +0000 (22:30 +0200)]
Merge pull request #5265 from SUSE/wip-12368-hammer

linking ceph to tcmalloc causes segfault on SUSE SLE11-SP3

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5280 from ceph/wip-12384-hammer
Loic Dachary [Tue, 28 Jul 2015 20:27:40 +0000 (22:27 +0200)]
Merge pull request #5280 from ceph/wip-12384-hammer

librbd: add valgrind memory checks for unit tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5279 from ceph/wip-12237-hammer
Loic Dachary [Tue, 28 Jul 2015 20:26:25 +0000 (22:26 +0200)]
Merge pull request #5279 from ceph/wip-12237-hammer

A client opening an image mid-resize can result in the object map being invalidated

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5283 from SUSE/wip-12397-hammer
Loic Dachary [Tue, 28 Jul 2015 20:10:03 +0000 (22:10 +0200)]
Merge pull request #5283 from SUSE/wip-12397-hammer

ceph.spec.in: 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph not installed properly on SUSE

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5206 from SUSE/wip-11998-hammer
Loic Dachary [Tue, 28 Jul 2015 19:54:33 +0000 (21:54 +0200)]
Merge pull request #5206 from SUSE/wip-11998-hammer

/usr/bin/ceph from ceph-common is broken without installing ceph

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5055 from SUSE/wip-12044-hammer
Loic Dachary [Tue, 28 Jul 2015 19:47:29 +0000 (21:47 +0200)]
Merge pull request #5055 from SUSE/wip-12044-hammer

rgw/logrotate.conf calls service with wrong init script name

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5040 from SUSE/wip-11964-hammer
Loic Dachary [Tue, 28 Jul 2015 19:46:11 +0000 (21:46 +0200)]
Merge pull request #5040 from SUSE/wip-11964-hammer

systemd: Increase max files open limit for OSD daemon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5038 from SUSE/wip-11876-hammer
Loic Dachary [Tue, 28 Jul 2015 19:45:44 +0000 (21:45 +0200)]
Merge pull request #5038 from SUSE/wip-11876-hammer

ceph-post-file fails on rhel7

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5030 from SUSE/wip-12092-hammer
Loic Dachary [Tue, 28 Jul 2015 19:45:25 +0000 (21:45 +0200)]
Merge pull request #5030 from SUSE/wip-12092-hammer

packaging: add SuSEfirewall2 service files

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5028 from SUSE/wip-12090-hammer
Loic Dachary [Tue, 28 Jul 2015 19:38:14 +0000 (21:38 +0200)]
Merge pull request #5028 from SUSE/wip-12090-hammer

rcceph script is buggy

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5026 from SUSE/wip-12087-hammer
Loic Dachary [Tue, 28 Jul 2015 19:37:44 +0000 (21:37 +0200)]
Merge pull request #5026 from SUSE/wip-12087-hammer

max files open limit for OSD daemon is too low

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorgw: conversion tool to fix broken multipart objects 5384/head
Yehuda Sadeh [Fri, 26 Jun 2015 23:56:28 +0000 (16:56 -0700)]
rgw: conversion tool to fix broken multipart objects

Fixes: #12079
Broken multipart objects: multipart objects that created on 0.94.2
and that start with underscore have a bad locator on their tail objects.
This extends the tool that was needed for older issue we've had with
hammer multipart objects (that start with underscore). The same usage
applies:

$ radosgw-admin bucket check --check-head-obj-locator \
                             --bucket=<bucket> [--fix]

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit f02ca6107172cecd80a490df9f0d66204e62326c)

9 years agorgw: only scan for objects not in namespace
Yehuda Sadeh [Fri, 26 Jun 2015 20:49:55 +0000 (13:49 -0700)]
rgw: only scan for objects not in namespace

Fixes: #11984
The tool should only work on the head objects, and these are not inside
any namespace.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 8103908548bf7d6c9fa47fb181cd450670bae8d6)

9 years agorgw_admin: add --remove-bad flag to bucket check
Yehuda Sadeh [Wed, 22 Apr 2015 23:04:35 +0000 (16:04 -0700)]
rgw_admin: add --remove-bad flag to bucket check

Add this flag so that the bad object will be removed (should be called
only after user has verified that objects content is correct).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 06d67d9139a95b704b80de527381fd1bbf7981ce)

9 years agoLog::reopen_log_file: take m_flush_mutex 5405/head
Samuel Just [Fri, 24 Jul 2015 22:38:18 +0000 (15:38 -0700)]
Log::reopen_log_file: take m_flush_mutex

Otherwise, _flush() might continue to write to m_fd after it's closed.
This might cause log data to go to a data object if the filestore then
reuses the fd during that time.

Fixes: #12465
Backport: firefly, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8778ab3a1ced7fab07662248af0c773df759653d)

10 years agolibrados_test_stub: read op should return number of bytes read 5279/head
Jason Dillaman [Sun, 5 Jul 2015 14:47:38 +0000 (10:47 -0400)]
librados_test_stub: read op should return number of bytes read

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

10 years agotests: fixed TestObjectMap.InvalidateFlagInMemoryOnly
Jason Dillaman [Sun, 5 Jul 2015 14:35:28 +0000 (10:35 -0400)]
tests: fixed TestObjectMap.InvalidateFlagInMemoryOnly

librados and librados_test_stub return different result codes
for a read full object operation.

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

10 years agolibrbd: don't attempt to invalidate an object map in R/O mode
Jason Dillaman [Sun, 5 Jul 2015 15:09:09 +0000 (11:09 -0400)]
librbd: don't attempt to invalidate an object map in R/O mode

The ImageWatcher is not initialized when in R/O mode, which
resulted in a NULL pointer dereference.

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

10 years agotests: add new unit tests for object map invalidation
Jason Dillaman [Tue, 23 Jun 2015 15:17:12 +0000 (11:17 -0400)]
tests: add new unit tests for object map invalidation

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

10 years agolibrbd: move object map codes to common location
Jason Dillaman [Wed, 25 Mar 2015 13:41:13 +0000 (09:41 -0400)]
librbd: move object map codes to common location

These codes will need to be accessible from cls_rbd and librbd.

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

10 years agolibrbd: only update image flags when holding exclusive lock
Jason Dillaman [Tue, 23 Jun 2015 15:14:51 +0000 (11:14 -0400)]
librbd: only update image flags when holding exclusive lock

It was possible for a client to open an image while another client
was shrinking an image.  This would result in the former invalidating
the object map on-disk if it openned the image between updating the
image header and resizing the object map.

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

10 years agolibrbd: new ImageWatcher::is_lock_supported method
Jason Dillaman [Fri, 17 Jul 2015 16:43:46 +0000 (12:43 -0400)]
librbd: new ImageWatcher::is_lock_supported method

The new version does not attempt to acquire the snap_lock, to avoid
cases where a recursive lock would result.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoFixes: #12286 radosgw-admin: after subuser modify print only once user info. 5286/head
guce [Sat, 11 Jul 2015 06:08:33 +0000 (14:08 +0800)]
Fixes: #12286 radosgw-admin: after subuser modify print only once user info.
remove rgw_admin.cc OPT_SUBUSER_MODIFY, show_user_info code block.

switch (opt_cmd) {
...
case OPT_SUBUSER_MODIFY:
show_user_info(info, formatter);       //show first time (remove this)
break;
...
}

// output the result of a user operation
if (output_user_info) {
...
show_user_info(info, formatter);       //show second time
}

test fix:
before: after subuser modify print twice user info.
after changes, do the same procedure, print only once user info.

Signed-off-by: guce guce@h3c.com
(cherry picked from commit c604dd97fc179e5c2f640818c0f6e7cf99701947)

10 years agorgw: fix ListParts response 5285/head
Henry Chang [Wed, 22 Apr 2015 10:26:45 +0000 (18:26 +0800)]
rgw: fix ListParts response

The response XML element name should be 'ListPartsResult'.

Fixes: #11494
Signed-off-by: Henry Chang <henry@bigtera.com>
(cherry picked from commit caa9f0e461f1eed526fc43ee74699a7243aef9b8)

10 years agorgw: If the client sends a Connection: close header respond accordingly. 5284/head
Wido den Hollander [Fri, 10 Jul 2015 22:01:52 +0000 (00:01 +0200)]
rgw: If the client sends a Connection: close header respond accordingly.

HTTP/1.1 assumes Keep-Alive by default, but if a Connection: close header is send
the server should respond with it as well.

This makes the client close the connection after the request.

Fixes: #12298
(cherry picked from commit 79197d3711edc4b04a7ea4335b6e1b65754996d5)

10 years agoceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly... 5283/head
Nathan Cutler [Thu, 9 Jul 2015 19:38:46 +0000 (21:38 +0200)]
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE

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

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

10 years agodebian: move ceph_argparse into ceph-common 5206/head
Ken Dreyer [Tue, 14 Apr 2015 13:58:17 +0000 (07:58 -0600)]
debian: move ceph_argparse into ceph-common

Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac54957e596d99985bb9e187a668251a9ec)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 110608e5bdd9e2f03020ad41f0c2d756684d4417)

Conflicts:
debian/ceph.install
            There is no ceph_daemon.py in hammer
        debian/control
            Depends/Replaces/Breaks version adapted (from 9.0.0 to 0.94.2)
            also adapted ceph-dbg Replaces/Breaks

10 years agotest: potential memory leak in FlushAioPP 5280/head
Zhiqiang Wang [Fri, 20 Mar 2015 08:15:42 +0000 (16:15 +0800)]
test: potential memory leak in FlushAioPP

Should call the release function instead of deleting it to free
librbd::RBD::AioCompletion and librbd::AioCompletion. Otherwise there is
a potential memory leak.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
(cherry picked from commit ada7ec860cb7901c560c12a5af36dc7c23051b76)

10 years agopybind: fix valgrind warning on rbd_get_parent_info call
Jason Dillaman [Tue, 28 Apr 2015 19:25:49 +0000 (15:25 -0400)]
pybind: fix valgrind warning on rbd_get_parent_info call

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

10 years agoosdc: invalid read of freed memory
Jason Dillaman [Tue, 28 Apr 2015 15:12:00 +0000 (11:12 -0400)]
osdc: invalid read of freed memory

The bytes not in cache stat was potentially reading the bh length
from a deleted bufferhead.

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

10 years agokrbd: fix incorrect types in the krbd API
Jason Dillaman [Tue, 28 Apr 2015 14:56:15 +0000 (10:56 -0400)]
krbd: fix incorrect types in the krbd API

The C API functions were referencing the C++ CephContext
instead of the C rados_config_t.  Additionally, the ceph
namespace was missing on the Formatter class.

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

10 years agofsx: cleanup crypto library at exit
Jason Dillaman [Tue, 28 Apr 2015 14:54:47 +0000 (10:54 -0400)]
fsx: cleanup crypto library at exit

Also made small tweaks so that it can be compiled under
a C++ compiler.

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

10 years agotests: add run-rbd-valgrind-unit-tests.sh
Jason Dillaman [Fri, 24 Apr 2015 18:29:59 +0000 (14:29 -0400)]
tests: add run-rbd-valgrind-unit-tests.sh

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

10 years agovalgrind: update valgrind suppressions for lttng-ust
Jason Dillaman [Fri, 24 Apr 2015 04:23:03 +0000 (00:23 -0400)]
valgrind: update valgrind suppressions for lttng-ust

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

10 years agolibrbd: TaskFinisher should finish all queued tasks
Jason Dillaman [Fri, 24 Apr 2015 04:21:15 +0000 (00:21 -0400)]
librbd: TaskFinisher should finish all queued tasks

The destructor wasn't waiting for all Finisher tasks
to complete before stopping the thread.

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

10 years agotests: fix valgrind errors with librbd unit test
Jason Dillaman [Fri, 24 Apr 2015 03:10:23 +0000 (23:10 -0400)]
tests: fix valgrind errors with librbd unit test

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

10 years agotests: librbd should release global data before exit
Jason Dillaman [Fri, 24 Apr 2015 03:09:45 +0000 (23:09 -0400)]
tests: librbd should release global data before exit

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

10 years agolibrados_test_stub: cleanup singleton memory allocation
Jason Dillaman [Fri, 24 Apr 2015 03:08:51 +0000 (23:08 -0400)]
librados_test_stub: cleanup singleton memory allocation

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

10 years agoMerge pull request #5046 from ceph/wip-12109-hammer
Loic Dachary [Fri, 17 Jul 2015 17:48:05 +0000 (19:48 +0200)]
Merge pull request #5046 from ceph/wip-12109-hammer

librbd: new QA client upgrade tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoPG::find_best_info: ignore info.les for incomplete peer 5269/head
Samuel Just [Wed, 20 May 2015 19:08:15 +0000 (12:08 -0700)]
PG::find_best_info: ignore info.les for incomplete peer

See included update to doc/dev/osd_internals/last_epoch_started.rst

Fixes: 11687
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 371d9baa120dc0302e9e61d3bc0e309dfaa773a0)

10 years agoMerge pull request #5159 from theanalyst/wip-11701-hammer
Samuel Just [Thu, 16 Jul 2015 21:58:49 +0000 (14:58 -0700)]
Merge pull request #5159 from theanalyst/wip-11701-hammer

make the all osd/filestore thread pool suicide timeouts separately configurable

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoConditional-compile against minimal tcmalloc. 5265/head
Thorsten Behrens [Sun, 15 Mar 2015 23:13:38 +0000 (00:13 +0100)]
Conditional-compile against minimal tcmalloc.

Certain older systems (SLE11 in this case) do not provide the full
tcmalloc functionality, due to e.g. incomplete libunwind
pieces. Use --with-tcmalloc-minimal to enable the cut-down
version.

Here's how the various mem allocator switches interact now:

--with-jemalloc: overrides --with-tcmalloc & --with-tcmalloc-minimal
--with-tcmalloc-minimal: overrides --with-tcmalloc
--with-tcmalloc: the default. use --without-tcmalloc to disable

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit c6f1c07113ca19547fdac10cd9b817a60142aee2)

10 years agoMerge pull request #5252 from ceph/wip-12021-hammer
Sage Weil [Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)]
Merge pull request #5252 from ceph/wip-12021-hammer

OSDMonitor: allow addition of cache pool with non-empty snaps with co…

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4891 from theanalyst/wip-11740-hammer
Loic Dachary [Wed, 15 Jul 2015 23:15:51 +0000 (01:15 +0200)]
Merge pull request #4891 from theanalyst/wip-11740-hammer

crush: take crashes due to invalid arg

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoOSD: add command_wq suicide timeout 5159/head
Samuel Just [Wed, 6 May 2015 17:49:00 +0000 (10:49 -0700)]
OSD: add command_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit df4e5de819c30003cfbe50a071c49039cf534419)

Conflicts:
src/common/config_opts.h
Trivial merge conflict

10 years agoOSD: add remove_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:54:31 +0000 (10:54 -0700)]
OSD: add remove_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f2fbfa32a16666be46359f0eab7b04ca80a753f5)

10 years agoOSD: add scrub_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:52:40 +0000 (10:52 -0700)]
OSD: add scrub_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 547a7041edc833f3cc8e04d388574809e30a8af6)

10 years agoOSD: add snap_trim_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:51:28 +0000 (10:51 -0700)]
OSD: add snap_trim_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit e1073a4a577211672148a4112bd633831552d66f)

10 years agoOSD: add recovery_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:50:19 +0000 (10:50 -0700)]
OSD: add recovery_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316)

Conflicts: src/common/config_opts.h

There was a merge conflict due to introduction of `osd_recovery_sleep`
which was introduced in #3829

10 years agoOSD: add op_wq suicide timeout
Samuel Just [Wed, 6 May 2015 18:02:19 +0000 (11:02 -0700)]
OSD: add op_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agomon: add an "osd crush tree" command 5248/head
Kefu Chai [Tue, 2 Jun 2015 15:52:22 +0000 (23:52 +0800)]
mon: add an "osd crush tree" command

* to print crush buckets/items in a tree

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

Conflicts:
src/test/mon/osd-crush.sh:
do not start mon as run() takes care of it already

10 years agoMerge pull request #4899 from theanalyst/wip-11911-hammer
Loic Dachary [Tue, 14 Jul 2015 18:43:02 +0000 (20:43 +0200)]
Merge pull request #4899 from theanalyst/wip-11911-hammer

start_flush: filter out removed snaps before determining snapc's

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4868 from SUSE/wip-11879-hammer
Loic Dachary [Tue, 14 Jul 2015 18:42:45 +0000 (20:42 +0200)]
Merge pull request #4868 from SUSE/wip-11879-hammer

Clock skew causes missing summary and confuses Calamari

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4883 from SUSE/wip-11638-hammer
Loic Dachary [Tue, 14 Jul 2015 14:42:12 +0000 (16:42 +0200)]
Merge pull request #4883 from SUSE/wip-11638-hammer

ceph.spec.in: ceph-common subpackage def needs tweaking for SUSE/openSUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agolibrbd: assertion failure race condition if watch disconnected 5243/head
Jason Dillaman [Fri, 26 Jun 2015 13:59:36 +0000 (09:59 -0400)]
librbd: assertion failure race condition if watch disconnected

It's possible for librbd's watch of the header object to be reset by
connection issues just prior to the image being removed.  This will
causes an assertion failure which assumes at least one watcher on the
image.

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

10 years agolibrbd: prevent object map updates from being interrupted 5241/head
Jason Dillaman [Thu, 25 Jun 2015 20:51:31 +0000 (16:51 -0400)]
librbd: prevent object map updates from being interrupted

Object map updates were being canceled in-flight when the exclusive lock
is released.  This resulted in an ERESTART error code bubbling up to
AioRequest.

Fixes: 12165
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 590cdc90edaf4f4ff06c97eb2f43b92ab9b60084)

Conflicts:
src/librbd/ObjectMap.h
conflict due to a variable `m_snap_id' which was introduced in PR #4140
which is dropped as we are not backporting that feature

10 years agorgw: fix empty json response when getting user quota 5237/head
wuxingyi [Tue, 23 Jun 2015 01:46:48 +0000 (01:46 +0000)]
rgw: fix empty json response when getting user quota

Fixes: #12117
Signed-off-by: wuxingyi <wuxingyi@letv.com>
(cherry picked from commit 64fceed2202c94edf28b8315fe14c9affa8c0116)

10 years agorgw: error out if frontend did not send all data 5231/head
Yehuda Sadeh [Thu, 25 Jun 2015 21:31:03 +0000 (14:31 -0700)]
rgw: error out if frontend did not send all data

Fixes: #11851
The civetweb mg_write() doesn't return error when it can't flush all data
to the user, it just sends the total number of bytes written. Modified the
client io to return total number of bytes and return an error if didn't
send anything.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit daa679c3dd3770a6d5421e2cc9a36924f4550439)

10 years agorgw: fix reset_loc() 5229/head
Yehuda Sadeh [Wed, 17 Jun 2015 22:11:28 +0000 (15:11 -0700)]
rgw: fix reset_loc()

Fixes: #11974
Only need to set locator for underscore if namespace is empty

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d3bd27f4855df6bb207b656527138026af1a36a2)

10 years agorgw: fix lack of account name in XML listing of Swift account. 5227/head
Radoslaw Zarzynski [Mon, 20 Apr 2015 12:55:00 +0000 (14:55 +0200)]
rgw: fix lack of account name in XML listing of Swift account.

Fixes: #11431
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 837388bbc39a1bf9019302c3a4d3a3fe22caeeb4)

10 years agorgw: generate the "Date" HTTP header for civetweb. 5228/head
Radoslaw Zarzynski [Wed, 18 Feb 2015 14:48:43 +0000 (15:48 +0100)]
rgw: generate the "Date" HTTP header for civetweb.

Fixes: #10873
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit ea384f83b601f60e135c3d3f960fdb75a919dd84)