]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoMerge pull request #4877 from SUSE/wip-11902-hammer
Loic Dachary [Fri, 10 Jul 2015 07:43:57 +0000 (09:43 +0200)]
Merge pull request #4877 from SUSE/wip-11902-hammer

admin/build-doc: script fails silently under certain circumstances

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4667 from SUSE/wip-11611-hammer
Loic Dachary [Fri, 10 Jul 2015 07:39:15 +0000 (09:39 +0200)]
Merge pull request #4667 from SUSE/wip-11611-hammer

ceph.spec: update OpenSUSE BuildRequires

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5123 from theanalyst/wip-11979-hammer
Gregory Farnum [Wed, 8 Jul 2015 15:52:12 +0000 (16:52 +0100)]
Merge pull request #5123 from theanalyst/wip-11979-hammer

MDSMonitor: handle MDSBeacon messages properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4862 from SUSE/wip-11874-hammer
Loic Dachary [Wed, 8 Jul 2015 13:36:38 +0000 (15:36 +0200)]
Merge pull request #4862 from SUSE/wip-11874-hammer

Bucket header is enclosed by quotes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4885 from theanalyst/wip-11755-hammer
Loic Dachary [Wed, 8 Jul 2015 13:35:53 +0000 (15:35 +0200)]
Merge pull request #4885 from theanalyst/wip-11755-hammer

Object copy bug

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4884 from theanalyst/wip-11722-hammer
Loic Dachary [Wed, 8 Jul 2015 13:34:45 +0000 (15:34 +0200)]
Merge pull request #4884 from theanalyst/wip-11722-hammer

Keystone PKI token expiration is not enforced

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4875 from ceph/wip-11770-hammer
Loic Dachary [Wed, 8 Jul 2015 13:30:48 +0000 (15:30 +0200)]
Merge pull request #4875 from ceph/wip-11770-hammer

librbd: aio calls may block

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: always reply mdsbeacon 5123/head
Kefu Chai [Fri, 15 May 2015 14:50:36 +0000 (22:50 +0800)]
mon: always reply mdsbeacon

the MDS (Beacon) is always expecting the reply for the mdsbeacon messages from
the lead mon, and it uses the delay as a metric for the laggy-ness of the
Beacon. when it comes to the MDSMonitor on a peon, it will remove the route
session at seeing a reply (route message) from leader, so a reply to
mdsbeacon will stop the peon from resending the mdsbeacon request to the
leader.

if the MDSMonitor re-forwards the unreplied requests after they are
outdated, there are chances that the requests reflecting old and even wrong
state of the MDSs mislead the lead monitor. for example, the MDSs which sent
the outdated messages could be dead.

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

10 years agomon/MDSMonitor: rename labels to a better name
Kefu Chai [Wed, 3 Jun 2015 06:20:21 +0000 (23:20 -0700)]
mon/MDSMonitor: rename labels to a better name

* s/ignore/reply/
* s/out/ignore/

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

10 years agomon: send no_reply() to peon to drop ignored mdsbeacon
Kefu Chai [Tue, 2 Jun 2015 04:55:06 +0000 (12:55 +0800)]
mon: send no_reply() to peon to drop ignored mdsbeacon

so the peon can remove the ignored mdsbeacon request from the
routed_requets at seeing this reply, and hence no longer resend the
request.

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

10 years agomon: remove unnecessary error handling
Kefu Chai [Tue, 2 Jun 2015 04:22:26 +0000 (12:22 +0800)]
mon: remove unnecessary error handling

msg.get_session() should always return a non-zero pointer in
Monitor.dispatch()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 16e8e2cc82a90c49cd8aa3d0e3acc4694ba659a0)

10 years agoMerge pull request #4886 from theanalyst/wip-11737-hammer
Abhishek L [Wed, 1 Jul 2015 12:39:46 +0000 (18:09 +0530)]
Merge pull request #4886 from theanalyst/wip-11737-hammer

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5095 from ceph/wip-fix-doc-hammer
Kefu Chai [Sat, 27 Jun 2015 09:11:11 +0000 (17:11 +0800)]
Merge pull request #5095 from ceph/wip-fix-doc-hammer

doc: fix doc build

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: add the corresponding @endcond command for @cond 5095/head
Kefu Chai [Sat, 27 Jun 2015 06:44:55 +0000 (14:44 +0800)]
doc: add the corresponding @endcond command for @cond

* they are used to applease asphyxiate, as it
  is not able to handle "enum" sections

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: remove orphan: directive in ceph-create-keys.rst
Kefu Chai [Sat, 27 Jun 2015 06:43:01 +0000 (14:43 +0800)]
doc: remove orphan: directive in ceph-create-keys.rst

* it is used to silence the sphinx warning, but conf.py
  does not like it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: let doxygen ignore src/tracing
Kefu Chai [Sat, 27 Jun 2015 06:41:59 +0000 (14:41 +0800)]
doc: let doxygen ignore src/tracing

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4902 from theanalyst/wip-11908-hammer
Samuel Just [Fri, 26 Jun 2015 21:19:40 +0000 (14:19 -0700)]
Merge pull request #4902 from theanalyst/wip-11908-hammer

Fixes for rados ops with snaps

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5069 from dachary/wip-11806-hammer
Loic Dachary [Fri, 26 Jun 2015 00:03:42 +0000 (20:03 -0400)]
Merge pull request #5069 from dachary/wip-11806-hammer

ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodebian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2) 5069/head
Loic Dachary [Wed, 24 Jun 2015 18:58:47 +0000 (14:58 -0400)]
debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2)

968573b8930a7c8485bf53e3a989ce2f7d0a2fff incorrectly backported
6f11fbf41fab10924b1e0e41fcf27864779d4073. It should instead reflect that
ceph-dbg in 0.94.2 and above will break ceph-test-dbg in all versions
prior to 0.94.2.

In other words, 0.94-XXXX being lower than 0.94.1, upgrading from
0.94.1 to 0.94.2 will not notice that ceph-dbg breaks ceph-test-dbg.

$ dpkg --compare-versions 0.94-XXXX lt 0.94.1 && echo yes || echo no
yes
$ dpkg --compare-versions 0.94.2 lt 0.94.1-xxx && echo yes || echo no
no

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

Signed-off-by: Loic Dachary <loic@dachary.org>
10 years agoqa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax
Sage Weil [Wed, 17 Jun 2015 16:35:28 +0000 (09:35 -0700)]
qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax

It's -, then a list of all exclusions separated by :.  There are just 2.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoqa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test
Sage Weil [Wed, 17 Jun 2015 04:05:29 +0000 (21:05 -0700)]
qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoqa: add compatibility filtered rados api tests for upgrades
Josh Durgin [Mon, 15 Jun 2015 22:12:43 +0000 (15:12 -0700)]
qa: add compatibility filtered rados api tests for upgrades

Post-9.0.1, the evict op returns success when an object doesn't exist
in the cache tier. Skip the tests that are incompatible across
versions.

Fixes: #11548
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4961 from ceph/wip-11493-hammer
Sage Weil [Mon, 15 Jun 2015 19:38:57 +0000 (12:38 -0700)]
Merge pull request #4961 from ceph/wip-11493-hammer

backport 11493 fixes, and test, prevetning ec cache pools

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoOSDMonitor: disallow ec pools as tiers 4961/head
Samuel Just [Fri, 15 May 2015 20:05:40 +0000 (13:05 -0700)]
OSDMonitor: disallow ec pools as tiers

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

10 years agomon: prevent pool with snapshot state from being used as a tier
Sage Weil [Wed, 29 Apr 2015 19:34:25 +0000 (12:34 -0700)]
mon: prevent pool with snapshot state from being used as a tier

If we add a pool with snap state as a tier the snap state gets clobbered
by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
from starting.  Disallow this.

Include a test.

Fixes: #11493
Backport: hammer, giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbec53edf9e585af4e20bbc9ba9057d6fdfda342)

10 years agotest/librados/tier.cc: destroy and recreate cache pool on every test
Samuel Just [Fri, 8 May 2015 17:26:48 +0000 (10:26 -0700)]
test/librados/tier.cc: destroy and recreate cache pool on every test

Namespaces are not sufficient with the checks for 11493 in the mon.

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

10 years agoMerge pull request #4846 from SUSE/wip-11862-hammer
Loic Dachary [Mon, 15 Jun 2015 15:26:07 +0000 (17:26 +0200)]
Merge pull request #4846 from SUSE/wip-11862-hammer

missing man pages for ceph-create-keys, ceph-disk-*

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4934 from dachary/wip-releases-hammer
Sage Weil [Thu, 11 Jun 2015 20:54:35 +0000 (13:54 -0700)]
Merge pull request #4934 from dachary/wip-releases-hammer

doc/release-notes: v0.94.2

10 years agodoc/release-notes: v0.94.2 4934/head
Sage Weil [Wed, 10 Jun 2015 19:48:41 +0000 (12:48 -0700)]
doc/release-notes: v0.94.2

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

Conflicts:
doc/release-notes.rst

10 years agotests: verify librbd blocking aio code path 4875/head
Jason Dillaman [Tue, 2 Jun 2015 14:33:35 +0000 (10:33 -0400)]
tests: verify librbd blocking aio code path

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

Conflicts:
src/test/librbd/test_librbd.cc: trival resolution

10 years agolibrbd: new rbd_non_blocking_aio config option
Jason Dillaman [Tue, 2 Jun 2015 02:56:11 +0000 (22:56 -0400)]
librbd: new rbd_non_blocking_aio config option

Setting this option to false reverts librbd to legacy behavior
where AIO operations could potentially block.

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

10 years agoPendingReleaseNotes: document changes to librbd's aio_read methods
Jason Dillaman [Fri, 10 Apr 2015 00:34:28 +0000 (20:34 -0400)]
PendingReleaseNotes: document changes to librbd's aio_read methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AioRequest::send no longer returns a result
Jason Dillaman [Thu, 9 Apr 2015 17:33:09 +0000 (13:33 -0400)]
librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

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

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/AsyncFlattenRequest.cc: trivial resolution

10 years agotests: update librbd AIO tests to remove result code
Jason Dillaman [Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)]
tests: update librbd AIO tests to remove result code

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

Conflicts:
src/test/librbd/test_internal.cc: trivial resolution
src/test/librbd/test_librbd.cc: trivial resolution

10 years agolibrbd: internal AIO methods no longer return result
Jason Dillaman [Thu, 9 Apr 2015 01:37:50 +0000 (21:37 -0400)]
librbd: internal AIO methods no longer return result

All failures should be returned via the AioCompletion.

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

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/internal.cc: trivial resolution

10 years agoThrottle: added pending_error method to SimpleThrottle
Jason Dillaman [Thu, 9 Apr 2015 01:48:21 +0000 (21:48 -0400)]
Throttle: added pending_error method to SimpleThrottle

Allow the client of SimpleThrottle to detect an async error
so that it can exit early.

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

10 years agolibrbd: add new fail method to AioCompletion
Jason Dillaman [Thu, 9 Apr 2015 00:18:50 +0000 (20:18 -0400)]
librbd: add new fail method to AioCompletion

Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.

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

10 years agolibrbd: avoid blocking AIO API methods
Jason Dillaman [Wed, 8 Apr 2015 23:06:52 +0000 (19:06 -0400)]
librbd: avoid blocking AIO API methods

Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.

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

10 years agolibrbd: add task pool / work queue for requests
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add task pool / work queue for requests

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

Conflicts:
src/librbd/ImageCtx.cc: trivial resolution
src/librbd/ImageCtx.h: trivial resolution

10 years ago0.94.2 v0.94.2
Jenkins [Tue, 9 Jun 2015 19:32:34 +0000 (12:32 -0700)]
0.94.2

10 years agoReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked 4902/head
Samuel Just [Wed, 20 May 2015 23:10:02 +0000 (16:10 -0700)]
ReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked

Otherwise we can reorder an op around another op which got blocked by a
scrub which started after the first blocked on an obc.

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

10 years agoReplicatedPG::finish_ctx: take excl lock if operation is rw
Samuel Just [Tue, 19 May 2015 17:56:11 +0000 (10:56 -0700)]
ReplicatedPG::finish_ctx: take excl lock if operation is rw

Fixes: #11677
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5c2b795724423ed484ab451de855ddcfc085342b)

10 years agoRadosModel: randomly prefix delete with assert_exists
Samuel Just [Thu, 21 May 2015 19:13:43 +0000 (12:13 -0700)]
RadosModel: randomly prefix delete with assert_exists

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

10 years agoRadosModel: assert exists on subsequent writes
Samuel Just [Thu, 21 May 2015 18:36:42 +0000 (11:36 -0700)]
RadosModel: assert exists on subsequent writes

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

10 years agotest/librados/snapshots.cc: add test for 11677
Samuel Just [Tue, 19 May 2015 17:23:01 +0000 (10:23 -0700)]
test/librados/snapshots.cc: add test for 11677

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

10 years agomds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag 4886/head
Yan, Zheng [Tue, 12 May 2015 06:52:30 +0000 (14:52 +0800)]
mds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag

Fixes: #11541
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit ab1e5394dc778f6799472bd79a4d9ba7197107c2)

10 years agorgw: Use attrs from source bucket on copy 4885/head
Javier M. Mellid [Fri, 15 May 2015 12:22:29 +0000 (14:22 +0200)]
rgw: Use attrs from source bucket on copy

On copy objects, when bucket source is the same as the destination, use attrs
from source bucket.

Fixes: #11639
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 1dac80df1d4a2364154ed8b404d13609936c257b)

10 years agorgw: always check if token is expired 4884/head
Anton Aksola [Fri, 10 Apr 2015 10:25:21 +0000 (13:25 +0300)]
rgw: always check if token is expired

Fixes: #11367
Currently token expiration is only checked by the token cache. With PKI
tokens no expiration check is done after decoding the token. This causes
PKI tokens to be valid indefinitely. UUID tokens are validated by
keystone after cache miss so they are not affected by this bug.

This commit adds explicit token expiration check to
RGWSwift::validate_keystone_token()

Signed-off-by: Anton Aksola <anton.aksola@nebula.fi>
Reported-by: Riku Lehto <riku.lehto@nexetic.com>
(cherry picked from commit 2df069390ea3bbcfbab5022750e89f51d197cc11)

10 years agoadmin/build-doc: fix dependency checks 4877/head
John Spray [Wed, 3 Jun 2015 09:09:09 +0000 (10:09 +0100)]
admin/build-doc: fix dependency checks

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

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

Conflicts:
admin/build-doc
            Insert lines at appropriate spot

10 years agoman/ceph-create-keys.8: add missing file 4846/head
Nathan Cutler [Wed, 3 Jun 2015 08:41:27 +0000 (10:41 +0200)]
man/ceph-create-keys.8: add missing file

This is the generated manpage, taken from a local build of master

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

10 years agodoc: add ceph-create-keys.8
Kefu Chai [Tue, 21 Apr 2015 06:59:32 +0000 (14:59 +0800)]
doc: add ceph-create-keys.8

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

Conflicts:
    doc/man/8/ceph-create-keys.rst
    Includes fixes from https://github.com/ceph/ceph/pull/4855

10 years agoWorkQueue: added virtual destructor
Jason Dillaman [Mon, 11 May 2015 21:05:49 +0000 (17:05 -0400)]
WorkQueue: added virtual destructor

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

10 years agoWorkQueue: add new ContextWQ work queue
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: add new ContextWQ work queue

The queue holds a collection of Context pointers that will
be completed by the thread pool.

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

10 years agorgw: Do not enclose the Bucket header in quotes 4862/head
Wido den Hollander [Wed, 3 Jun 2015 11:13:33 +0000 (13:13 +0200)]
rgw: Do not enclose the Bucket header in quotes

Fixes: #11860
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 8af25faed93fe02d3dad585b8579ce8b041cc4e6)

10 years agoMerge pull request #4795 from dachary/wip-11806-hammer
Loic Dachary [Fri, 29 May 2015 07:49:43 +0000 (09:49 +0200)]
Merge pull request #4795 from dachary/wip-11806-hammer

ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodebian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg 4795/head
Loic Dachary [Thu, 28 May 2015 08:35:51 +0000 (10:35 +0200)]
debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg

When ceph-objectstore-tool was moved from ceph-test to
ceph by 61cf5da0b51e2d9578c7b4bca85184317e30f4ca, the ceph package in
debian/control was updated accordingly, as recommended by
https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

The same must be done for the ceph-dbg package because
/usr/lib/debug/usr/bin/ceph-objectstore-too is no longer in
ceph-test-dbg.

Although the change was merged may 6th, 2015
8f23382064c189b657564d58c3f9d17720e891ed, teuthology jobs were not
always failing because packages were not systematically upgraded during
the installation. The missing dependencies that were responsible for
this upgrade problem were fixed by
f898ec1e4e3472b0202280f09653a769fc62c8d3 on may 18th, 2015 and all
upgrade tests relying on ceph-*-dbg packages started to fail
systematically after this date.

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

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

10 years agoMerge pull request #4773 from dachary/wip-11733-hammer
Ken Dreyer [Wed, 27 May 2015 01:52:59 +0000 (19:52 -0600)]
Merge pull request #4773 from dachary/wip-11733-hammer

Debian: ceph-test and rest-bench debug packages should require their respective binary packages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodebian: set rest-bench-dbg ceph-test-dbg dependencies 4773/head
Ken Dreyer [Mon, 18 May 2015 16:50:58 +0000 (10:50 -0600)]
debian: set rest-bench-dbg ceph-test-dbg dependencies

Debian's debug packages ought to depend on their respective binary
packages. This was the case for many of our ceph packages, but it was
not the case for ceph-test-dbg or rest-bench-dbg.

Add the dependencies on the relevant binary packages, pinned to
"= ${binary:Version}" per convention.

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

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

10 years agoMerge pull request #4696 from ceph/wip-11622-hammer
Loic Dachary [Mon, 18 May 2015 12:26:16 +0000 (14:26 +0200)]
Merge pull request #4696 from ceph/wip-11622-hammer

Wip 11622 hammer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4649 from ceph/wip-hammer-package-perf-objectstore
Sage Weil [Fri, 15 May 2015 20:47:04 +0000 (13:47 -0700)]
Merge pull request #4649 from ceph/wip-hammer-package-perf-objectstore

packaging: include ceph_perf_objectstore

10 years agorgw: merge manifests correctly when there's prefix override 4696/head
Yehuda Sadeh [Thu, 14 May 2015 00:05:22 +0000 (17:05 -0700)]
rgw: merge manifests correctly when there's prefix override

Fixes: #11622
Backport: hammer, firefly

Prefix override happens in a manifest when a rados object does not
conform to the generic prefix set on the manifest. When merging
manifests (specifically being used in multipart objects upload), we need
to check if the rule that we try to merge has a prefix that is the same
as the previous rule. Beforehand we checked if both had the same
override_prefix setting, but that might not apply as both manifests
might have different prefixes.

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

10 years agorgw: restore buffer of multipart upload after EEXIST
Yehuda Sadeh [Tue, 12 May 2015 23:40:10 +0000 (16:40 -0700)]
rgw: restore buffer of multipart upload after EEXIST

Fixes #11604
Backport: hammer, firefly

When we need to restart a write of part data, we need to revert to
buffer to before the write, otherwise we're going to skip some data.

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

10 years agoceph.spec: update OpenSUSE BuildRequires 4667/head
Loic Dachary [Mon, 23 Mar 2015 20:26:23 +0000 (21:26 +0100)]
ceph.spec: update OpenSUSE BuildRequires

OpenSUSE 13.2 needs libsnappy-devel but not bzip2-devel.

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

10 years agopackaging: include ceph_perf_objectstore 4649/head
Ken Dreyer [Fri, 13 Mar 2015 22:08:35 +0000 (16:08 -0600)]
packaging: include ceph_perf_objectstore

The /usr/bin/ceph_perf_objectstore file is installed by default. Prior
to this commit it was missing from the packaging. This caused the RPM to
fail to build in mock.

Add ceph_perf_objectstore to the "ceph-test" RPM and Debian package.

If we end up developing further ceph_perf_* utilities, it would make
sense to glob them all with a wildcard, similar to what we are doing
with all the ceph_test_* utilities in ceph-test.

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

10 years agoMerge pull request #4568 from dachary/wip-10662-10663-hammer
Yehuda Sadeh [Mon, 11 May 2015 17:27:02 +0000 (10:27 -0700)]
Merge pull request #4568 from dachary/wip-10662-10663-hammer

RGW swift API: Response header of COPY request for object does not

contain x-copied-from, custom metadata, x-copied-from-last-modified, X-Copied-From-Account headers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4629 from ceph/hammer-uclient-checking
Loic Dachary [Mon, 11 May 2015 12:08:53 +0000 (14:08 +0200)]
Merge pull request #4629 from ceph/hammer-uclient-checking

Hammer uclient checking

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoclient: fix error handling in check_pool_perm 4629/head
John Spray [Thu, 7 May 2015 17:42:01 +0000 (18:42 +0100)]
client: fix error handling in check_pool_perm

Previously, on an error such as a pool not existing,
the caller doing the check would error out, but
anyone waiting on waiting_for_pool_perm would
block indefinitely (symptom was that reads on a
file with a bogus layout would block forever).

Fix by triggering the wait list on errors and
clear the CHECKING state so that the other callers
also perform the check and find the error.

Additionally, don't return the RADOS error code
up to filesystem users, because it can be
misleading.  For example, nonexistent pool is
ENOENT, but we shouldn't give ENOENT on IO
to a file which does exist, we should give EIO.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit e08cf25cafef5752877439c18cc584b0a75eca08)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoclient: use SaferCond in check_pool_perm
John Spray [Thu, 7 May 2015 17:17:37 +0000 (18:17 +0100)]
client: use SaferCond in check_pool_perm

Just because it's easier to read.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 289ee3b80ccce6bab2966f513a37332280d04a06)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoclient: check OSD caps before read/write
Yan, Zheng [Fri, 24 Apr 2015 07:23:21 +0000 (15:23 +0800)]
client: check OSD caps before read/write

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 3c4028ec21e3ef9e8801c4570420c88722651cc7)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4567 from dachary/wip-10938-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:07:07 +0000 (11:07 -0700)]
Merge pull request #4567 from dachary/wip-10938-hammer

RGW Swift API: response for GET/HEAD on container does not contain the X-Timestamp header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4570 from dachary/wip-10243-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:05:59 +0000 (11:05 -0700)]
Merge pull request #4570 from dachary/wip-10243-hammer

civetweb is hitting a limit (number of threads 1024)

10 years agoMerge pull request #4573 from dachary/wip-11125-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:05:41 +0000 (11:05 -0700)]
Merge pull request #4573 from dachary/wip-11125-hammer

rgw: keystone token cache does not work correctly

10 years agoMerge pull request #4574 from dachary/wip-11160-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:05:22 +0000 (11:05 -0700)]
Merge pull request #4574 from dachary/wip-11160-hammer

rgw: shouldn't need to disable rgw_socket_path if frontend is configured

10 years agoMerge pull request #4575 from dachary/wip-10650-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:04:36 +0000 (11:04 -0700)]
Merge pull request #4575 from dachary/wip-10650-hammer

Response header of swift API PUT /container/object returned by RGW

does not contain last-modified, content-length, x-trans-id headers. But Swift returns these headers.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4576 from dachary/wip-10661-hammer
Yehuda Sadeh [Fri, 8 May 2015 18:03:37 +0000 (11:03 -0700)]
Merge pull request #4576 from dachary/wip-10661-hammer

RGW swift API: Response header of POST request for object does not contain content-length and x-trans-id headers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4579 from dachary/wip-11036-hammer
Yehuda Sadeh [Fri, 8 May 2015 17:59:15 +0000 (10:59 -0700)]
Merge pull request #4579 from dachary/wip-11036-hammer

RGW Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4580 from dachary/wip-11088-hammer
Yehuda Sadeh [Fri, 8 May 2015 17:57:47 +0000 (10:57 -0700)]
Merge pull request #4580 from dachary/wip-11088-hammer

RGW Swift API: wrong handling of empty metadata on Swift container

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4581 from dachary/wip-11323-hammer
Yehuda Sadeh [Fri, 8 May 2015 17:57:12 +0000 (10:57 -0700)]
Merge pull request #4581 from dachary/wip-11323-hammer

rgw: quota not respected in POST object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4566 from dachary/wip-11478-hammer
Josh Durgin [Fri, 8 May 2015 16:15:41 +0000 (09:15 -0700)]
Merge pull request #4566 from dachary/wip-11478-hammer

Queued AIO reference counters not properly updated

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4564 from dachary/wip-11369-hammer
Josh Durgin [Fri, 8 May 2015 16:15:19 +0000 (09:15 -0700)]
Merge pull request #4564 from dachary/wip-11369-hammer

Periodic failure of TestLibRBD.DiffIterateStress

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4585 from ceph/wip-11370-hammer
Loic Dachary [Fri, 8 May 2015 15:32:35 +0000 (17:32 +0200)]
Merge pull request #4585 from ceph/wip-11370-hammer

A retransmit of proxied flatten request can result in -EINVAL

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4618 from dachary/wip-11398-kill-daemons-hammer
Kefu Chai [Fri, 8 May 2015 12:39:29 +0000 (20:39 +0800)]
Merge pull request #4618 from dachary/wip-11398-kill-daemons-hammer

tests: ceph-helpers kill_daemons fails when kill fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: ceph-helpers kill_daemons fails when kill fails 4618/head
Loic Dachary [Wed, 6 May 2015 18:14:37 +0000 (20:14 +0200)]
tests: ceph-helpers kill_daemons fails when kill fails

Instead of silently leaving the daemons running, it returns failure so
the caller can decide what to do with this situation. The timeout is
also extended to minutes instead of seconds to gracefully handle the
rare situations when a machine is extra slow for some reason.

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

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

10 years agoAdded a "ceph hello world" for a simple check for ceph-deploy qa suite
Yuri Weinstein [Fri, 8 May 2015 00:12:35 +0000 (17:12 -0700)]
Added a "ceph hello world" for a simple check for ceph-deploy qa suite

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 13abae186357f4e9bb40990a7a212f93ec2e1e79)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
10 years agoMerge pull request #4502 from dachary/wip-11026-hammer
Sage Weil [Thu, 7 May 2015 20:29:57 +0000 (13:29 -0700)]
Merge pull request #4502 from dachary/wip-11026-hammer

objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4562 from dachary/wip-11376-hammer
Loic Dachary [Thu, 7 May 2015 19:45:53 +0000 (21:45 +0200)]
Merge pull request #4562 from dachary/wip-11376-hammer

ceph-objectstore-tool should be in the ceph server package

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agopackaging: mv ceph-objectstore-tool to main ceph pkg 4562/head
Ken Dreyer [Thu, 30 Apr 2015 21:53:22 +0000 (15:53 -0600)]
packaging: mv ceph-objectstore-tool to main ceph pkg

This change ensures that the ceph-objectstore-tool utility is present on
all OSDs.  This makes it easier for users to run this tool to do manual
debugging/recovery in some scenarios.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 61cf5da0b51e2d9578c7b4bca85184317e30f4ca)
    Conflicts:
            debian/control
            because file layout changes from ceph-test and ceph << 0.94.1-46

10 years agoMerge pull request #4561 from dachary/wip-11143-hammer
Loic Dachary [Thu, 7 May 2015 17:05:48 +0000 (19:05 +0200)]
Merge pull request #4561 from dachary/wip-11143-hammer

src/ceph-disk : disk zap sgdisk invocation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4560 from dachary/wip-11507-hammer
Loic Dachary [Thu, 7 May 2015 17:03:53 +0000 (19:03 +0200)]
Merge pull request #4560 from dachary/wip-11507-hammer

object creation by write cannot use an offset on an erasure coded pool

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4559 from dachary/wip-11429-hammer
Loic Dachary [Thu, 7 May 2015 17:03:16 +0000 (19:03 +0200)]
Merge pull request #4559 from dachary/wip-11429-hammer

OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4563 from tchaikov/wip-hammer-11534
Loic Dachary [Thu, 7 May 2015 16:48:56 +0000 (18:48 +0200)]
Merge pull request #4563 from tchaikov/wip-hammer-11534

mon: Total size of OSDs is a maginitude less than it is supposed to be.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4577 from dachary/wip-10666-hammer
Loic Dachary [Thu, 7 May 2015 16:18:17 +0000 (18:18 +0200)]
Merge pull request #4577 from dachary/wip-10666-hammer

RGW swift API: Response header of GET request for container does not contain X-Container-Object-Count, X-Container-Bytes-Used and x-trans-id headers

Reviewed-by: Dmytro Iurchenko <diurchenko@mirantis.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: send Content-Length in response for HEAD on Swift account. 4579/head
Radoslaw Zarzynski [Sun, 8 Mar 2015 21:45:34 +0000 (22:45 +0100)]
rgw: send Content-Length in response for HEAD on Swift account.

Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 29073d84640b61d0221b2d2ab73c271d60fd13ba)

10 years agorgw: send Content-Length in response for DELETE on Swift container.
Radoslaw Zarzynski [Fri, 6 Mar 2015 12:18:19 +0000 (13:18 +0100)]
rgw: send Content-Length in response for DELETE on Swift container.

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

10 years agorgw: send Content-Length in response for PUT on Swift container.
Radoslaw Zarzynski [Fri, 6 Mar 2015 12:14:26 +0000 (13:14 +0100)]
rgw: send Content-Length in response for PUT on Swift container.

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

10 years agolibrbd: flatten should return -EROFS if image is read-only 4585/head
Jason Dillaman [Mon, 27 Apr 2015 05:03:52 +0000 (01:03 -0400)]
librbd: flatten should return -EROFS if image is read-only

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

10 years agolibrbd: allow snapshots to be created when snapshot is active
Jason Dillaman [Mon, 27 Apr 2015 05:00:38 +0000 (01:00 -0400)]
librbd: allow snapshots to be created when snapshot is active

The librbd API previously permitted the creation of snapshots while
the image context was associated to another snapshot.  A recent code
cleanup broke that ability, so this re-introduces it.  The code change
also allows minor cleanup with rebuild_object_map.

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 594a6610802f2cadb62200815bd8b9860809e759)

Conflicts:
src/librbd/internal.cc

10 years agolibrbd: better handling for duplicate flatten requests
Jason Dillaman [Tue, 21 Apr 2015 16:59:33 +0000 (12:59 -0400)]
librbd: better handling for duplicate flatten requests

A proxied flatten request could be replayed, resulting in a
-EINVAL error code being generated on the second attempt. Filter
out that error if it is known the parent did exist before the
op started.

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

10 years agolibrbd: use generic helper for issuing async requests
Jason Dillaman [Wed, 18 Mar 2015 15:51:47 +0000 (11:51 -0400)]
librbd: use generic helper for issuing async requests

resize, flatten, and rebuild object map now use the same
bootstrap code for sending the request to the remote lock owner
or executing the request locally.

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

Conflicts:
src/librbd/internal.cc

10 years agoOSD: handle the case where we resurrected an old, deleted pg 4559/head
Samuel Just [Tue, 21 Apr 2015 06:45:57 +0000 (23:45 -0700)]
OSD: handle the case where we resurrected an old, deleted pg

Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap.  Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs.  Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.

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