]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocrush/mapper: ensure take bucket value is valid
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)
(cherry picked from commit a52f7cb372339dffbeed7dae8ce2680586760754)

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)
(cherry picked from commit 81d8aa14f3f2b7bf4bdd0b4e53e3a653a600ef38)

9 years agomon: test the crush ruleset when creating a pool
Loic Dachary [Thu, 16 Jul 2015 16:02:02 +0000 (18:02 +0200)]
mon: test the crush ruleset when creating a pool

We want to fix the following scenario:

 * an erasure code plugin (or another part of the code) creates a
   ruleset
 * the ruleset crashes during mapping (for whatever reason)
 * ceph osd pool create uses the bugous ruleset
 * the monitors try to do mapping a crash

Having a bugous ruleset in the crush map is very difficult prevent. The
catastrophic event of using it with a newly created pool can however be
prevented by calling the CrushTester just before creating the pool and
after all implicit or explicit crush ruleset creation happened.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit f1e86be589803596e86acc964ac5c5c03b4038d8)

Conflicts:
src/test/mon/osd-crush.sh
          removed the run_mon because in hammer it is shared
          between all tests
        src/mon/OSDMonitor.cc
          prepare_new_pool changed stringstream to *ostream

(cherry picked from commit f47ba4b1a1029a55f8bc4ab393a7fa3712cd4e00)

9 years agoerasure-code: set max_size to chunk_count() instead of 20 for shec
Loic Dachary [Sat, 30 May 2015 10:40:26 +0000 (12:40 +0200)]
erasure-code: set max_size to chunk_count() instead of 20 for shec

See 8b64fe93b088a3a33d357869c47e6bf928c3f0e4 for a detailed explanation.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit a44499f7e6609d9a32254dc6f4303122de74db31)
(cherry picked from commit b58cbbab4f74e352c3d4a61190cea2731057b3c9)

9 years ago0.94.3.2 v0.94.3.2
Jenkins [Wed, 30 Sep 2015 19:59:03 +0000 (12:59 -0700)]
0.94.3.2

9 years agoOSDMap: fill in known encode_features where possible
Samuel Just [Fri, 25 Sep 2015 01:35:39 +0000 (18:35 -0700)]
OSDMap: fill in known encode_features where possible

Otherwise, if we get an incremental from hammer (struct_v = 6) we will
encode the full map as if it were before CEPH_FEATURE_PGID64, which
was actually pre-argonaut.  Similarly, if struct_v >= 7, we know it
was encoded with CEPH_FEATURE_OSDMAP_ENC.

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

9 years ago0.94.3.1 v0.94.3.1
Jenkins [Fri, 25 Sep 2015 18:00:31 +0000 (11:00 -0700)]
0.94.3.1

9 years agoupstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
Sage Weil [Wed, 3 Jun 2015 18:57:34 +0000 (14:57 -0400)]
upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)

It may take tens of seconds to restart each time, so 5 in 30s does not stop
the crash on startup respawn loop in many cases.  In particular, we'd like
to catch the case where the internal heartbeats fail.

This should be enough for all but the most sluggish of OSDs and capture
many cases of failure shortly after startup.

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

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 and debian/ceph-test.install: trivial files list
    conflict (ceph-monstore-update-crush.sh is in master but not hammer)
  - debian/control - use different version numbers for Breaks/Replaces
    in hammer vs master

9 years agorgw: preserve all attrs if intra-zone copy
Yehuda Sadeh [Wed, 9 Sep 2015 22:41:02 +0000 (15:41 -0700)]
rgw: preserve all attrs if intra-zone copy

Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.

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

9 years agorgw: don't preserve acls when copying object
Yehuda Sadeh [Thu, 13 Aug 2015 17:59:32 +0000 (10:59 -0700)]
rgw: don't preserve acls when copying object

Fixes: #12370
When copying an object we need to use the acls we calculated earlier,
and not the source acls.
This was broken at e41d97c8e38bb60d7e09e9801c0179efe7af1734.

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

9 years agorgw : setting max number of buckets for users via ceph.conf option
Vikhyat Umrao [Thu, 3 Sep 2015 06:32:05 +0000 (12:02 +0530)]
rgw : setting max number of buckets for users via ceph.conf option

This patch adds a new option "rgw_user_max_buckets" for setting
max number of buckets for users via ceph.conf.

This patch also fixes merge conflicts of src/rgw/rgw_admin.cc
of _usage() function from cerr to cout changes.

Fixes Upstream #12714
Fixes Downstream #1254343

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit f65267c96cbd4cd25036b6bf399692e77bbb9436)
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agorgw: url encode exposed bucket
Yehuda Sadeh [Thu, 30 Jul 2015 21:47:15 +0000 (14:47 -0700)]
rgw: url encode exposed bucket

Fixes: #12537
Don't send the bucket name back without url encoding it.

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

9 years agorgw: init some manifest fields when handling explicit objs
Yehuda Sadeh [Wed, 26 Aug 2015 21:34:30 +0000 (14:34 -0700)]
rgw: init some manifest fields when handling explicit objs

Fixes: #11455
When dealing with old manifest that has explicit objs, we also
need to set the head size and head object correctly so that
code that relies on this info doesn't break.

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

9 years agoObjecter: pg_interval_t::is_new_interval needs pgid from previous pool
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

(cherry picked from commit bee86660377cfaa74f7ed668dd02492f25553ff9)

Conflicts:
src/osdc/Objecter.h (osd size change not backported yet,
                             trivial resolution)

9 years agotests: increase test coverage for partial encodes/decodes
Jason Dillaman [Mon, 10 Aug 2015 13:39:50 +0000 (09:39 -0400)]
tests: increase test coverage for partial encodes/decodes

Multiple combinations of offsets/lengths are now tested when
performing partial encodes/decodes of the bit vector.

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

9 years agocommon: bit_vector extent calculation incorrect for last page
Jason Dillaman [Mon, 10 Aug 2015 13:34:42 +0000 (09:34 -0400)]
common: bit_vector extent calculation incorrect for last page

It's highly probable that the last page in the bit vector will not
be a full page size.  As a result, the computed extents will extend
beyond the data portion of the bit vector, resulting in a end_of_buffer
exception.

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

9 years agorgw: set http status in civetweb
Yehuda Sadeh [Wed, 22 Jul 2015 17:01:00 +0000 (10:01 -0700)]
rgw: set http status in civetweb

Need to set the http status in civetweb so that we report it correctly.
Fixes: #12432
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit b8e28ab9f914bf48c9ba4f0def9a0deb9dbb93bc)
(cherry picked from commit 3ab5d82a1c09142267c27156b69a3117d30c5b7d)

9 years agocivetweb: update submodule to support setting of http status
Yehuda Sadeh [Fri, 31 Jul 2015 18:03:29 +0000 (11:03 -0700)]
civetweb: update submodule to support setting of http status

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

9 years agoceph-disk: always check zap is applied on a full device
Loic Dachary [Sun, 31 May 2015 17:42:45 +0000 (19:42 +0200)]
ceph-disk: always check zap is applied on a full device

zap only makes sense on a full device and this is verified for

    ceph-disk prepare --zap-disk

but not for

    ceph-disk zap

Unify the two and add a test to check that it fails as expected when
trying to zap a directory.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 8e1bcf21f090fc98ac9b495d76614e3012f5872a)

 Conflicts:
src/test/ceph-disk.sh

There was a merge conflict due to the lack of `test_mark_init` in
Hammer.

9 years agoceph.in: print more detailed warning for 'ceph <type> tell'
Kefu Chai [Wed, 15 Jul 2015 11:03:33 +0000 (19:03 +0800)]
ceph.in: print more detailed warning for 'ceph <type> tell'

put the full signature of "tell <target> <command> [options...]"
instead of "tell {0}.<id>", which could be misleading somehow.

Fixes: 11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit aa1a5222eebd0256d4ecffb0eefeb0f78ecf0a1f)
(cherry picked from commit e00494118ee42322784988fe56623cbc7aac4cc9)

9 years agoceph.in: print more detailed error message for 'tell' command
Kefu Chai [Wed, 15 Jul 2015 10:01:52 +0000 (18:01 +0800)]
ceph.in: print more detailed error message for 'tell' command

* we do not allow user specify a certain daemon when starting an
  interactive session. the existing error message could lead to
  some confusion. so put more details in it.

Fixes: #11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 972dc9145235ff0f60663369ebcab8c16628b89f)
(cherry picked from commit f18900f2eb724acd898e8b32fe75c0850d7cf94c)

9 years agorgw: fix radosgw start-up script.
Vikhyat Umrao [Thu, 23 Jul 2015 12:40:06 +0000 (18:10 +0530)]
rgw: fix radosgw start-up script.

radosgw init script is unable to start radosgw daemon.
as it is relies on requiretty being disabled.
once init script start this daemon with sudo it fails
to start the daemon.

changing 'sudo' to 'su', it will fix this issue and
will also help running radosgw daemon with our new
"ceph" UID project.

Fixes upstream: #10927
Fixes downstream: #1238521

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit c83542296aeb8f5dd96f5d9e09327e7a89370742)

9 years agorgw: fix assignment of copy obj attributes
Yehuda Sadeh [Wed, 17 Jun 2015 18:35:18 +0000 (11:35 -0700)]
rgw: fix assignment of copy obj attributes

Fixes: #11563
Clarify the confusing usage of set_copy_attrs() by switching the source and
destinatiion params (attrs, src_attrs). Switch to use attrs instead of
src_attrs afterwards. In one of the cases we originally used the wrong
variable.

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

9 years agoinit-radosgw.sysv: remove
Sage Weil [Thu, 7 May 2015 22:40:05 +0000 (15:40 -0700)]
init-radosgw.sysv: remove

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

9 years agoinit-radosgw: unify init-radosgw[.sysv]
Sage Weil [Thu, 7 May 2015 22:39:22 +0000 (15:39 -0700)]
init-radosgw: unify init-radosgw[.sysv]

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

9 years agoinit-radosgw: look in /var/lib/ceph/radosgw
Sage Weil [Thu, 7 May 2015 22:29:11 +0000 (15:29 -0700)]
init-radosgw: look in /var/lib/ceph/radosgw

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

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 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 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 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>