]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years ago0.80.8.2 v0.80.8.2
Jenkins [Wed, 10 Jun 2015 22:04:07 +0000 (15:04 -0700)]
0.80.8.2

10 years agoceph.spec.in: package mkcephfs on EL6
Ken Dreyer [Wed, 10 Jun 2015 21:43:41 +0000 (15:43 -0600)]
ceph.spec.in: package mkcephfs on EL6

Commit efbca0465c2946e113771966df08cf7cf37b1196 added mkcephfs to the
RPM %files listing, but this /usr/sbin path is only correct for CentOS
7. In CentOS 6, the utility is present at /sbin/mkcephfs instead. This
causes rpmbuild to fail to build the tip of the firefly branch on EL6.

Adjust the RPM %files list so we properly package mkcephfs on both EL7
and EL6.

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

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

10 years agoceph.spec: add mkcephfs to ceph.rpm
Sage Weil [Wed, 3 Jun 2015 17:03:50 +0000 (13:03 -0400)]
ceph.spec: add mkcephfs to ceph.rpm

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

10 years agotests: verify librbd blocking aio code path
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)
(cherry picked from commit 0e668f6a278bf4d2c7a80dc7a30325e1c1645ce0)

Conflicts:
src/test/librbd/test_librbd.cc: removed refs to pending AIO

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

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
src/librbd/AioRequest.h
src/librbd/internal.cc

(cherry picked from commit 7fea9b6954c7e8b913c7ab561f8b28432ecb19fa)

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)
(cherry picked from commit 37bb3000d3eff640a34a3ac48be470ce58627f87)

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)
(cherry picked from commit 04eea0add8bc5501b125bb8d5e716d70abcf9dcc)

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

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

Conflicts:
src/librbd/AioCompletion.cc: removed refs to pending AIO
src/librbd/AioCompletion.h: removed refs to pending AIO

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

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

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

Conflicts:
src/librbd/ImageCtx.cc: removed refs to pending AIO
src/librbd/ImageCtx.h: removed refs to pending AIO
src/librbd/internal.cc: removed refs to pending AIO

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)
(cherry picked from commit 78afe97c87f3b4edda762a7a3c93ad79c437fc5d)

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

10 years agocommon/ceph_context: don't import std namespace
Sage Weil [Fri, 5 Dec 2014 22:21:08 +0000 (14:21 -0800)]
common/ceph_context: don't import std namespace

This was broken by 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99

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

10 years agoCephContext: Add AssociatedSingletonObject to allow CephContext's singleton
Haomai Wang [Mon, 1 Dec 2014 15:54:16 +0000 (23:54 +0800)]
CephContext: Add AssociatedSingletonObject to allow CephContext's singleton

If some objects associated to CephContext want to create a singleton object,
it can inherit AssociatedSingletonObject and implement destruction to get notified.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99)
(cherry picked from commit 3fea27c7f6b1b1403bce4d7736367975798a8634)

10 years agorgw: don't overwrite bucket / object owner when setting acls
Yehuda Sadeh [Fri, 27 Feb 2015 23:32:50 +0000 (15:32 -0800)]
rgw: don't overwrite bucket / object owner when setting acls

Fixes: #10978
Backport: hammer, firefly

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

Conflicts:
src/rgw/rgw_op.cc : trivial s/.empty()/== NULL/

(cherry picked from commit d57b38f85b683dfb365c3cb98362d486594f9eb3)

10 years agorgw: use correct objv_tracker for bucket instance
Yehuda Sadeh [Thu, 18 Dec 2014 01:12:43 +0000 (17:12 -0800)]
rgw: use correct objv_tracker for bucket instance

When trying to create a bucket that already existed, use the
objv_tracker of the newly created instance, and not of the original
bucket.

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

10 years agorgw: remove meta file after deleting bucket The meta file is deleted only if the...
Orit Wasserman [Fri, 3 Apr 2015 11:43:31 +0000 (13:43 +0200)]
rgw: remove meta file after deleting bucket The meta file is deleted only if the bucket meta data is not synced

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Fixes: #11149
Backport: hammer, firefly
(cherry picked from commit dfdc7afb59cc8e32cf8bff55faa09076c853de06)

10 years ago0.80.8.1 v0.80.8.1
Jenkins [Mon, 13 Apr 2015 20:24:40 +0000 (13:24 -0700)]
0.80.8.1

10 years agoosdc: Constrain max number of in-flight read requests
Jason Dillaman [Mon, 27 Oct 2014 18:47:19 +0000 (14:47 -0400)]
osdc: Constrain max number of in-flight read requests

Constrain the number of in-flight RADOS read requests to the
cache size.  This reduces the chance of the cache memory
ballooning during certain scenarios like copy-up which can
invoke many concurrent read requests.

Fixes: #9854
Backport: giant, firefly, dumpling
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 068d68850d09dfcaccc5a3ce85c80b2f6d808ea9)

10 years agoRevert "Enforce cache size on read requests"
Jason Dillaman [Mon, 19 Jan 2015 17:46:00 +0000 (12:46 -0500)]
Revert "Enforce cache size on read requests"

This reverts commit b7784dc1baa47560a733fe9dcd2acec51bc93165.

10 years agoRevert "rbd: ObjectCacher reads can hang when reading sparse files"
Jason Dillaman [Mon, 19 Jan 2015 17:45:25 +0000 (12:45 -0500)]
Revert "rbd: ObjectCacher reads can hang when reading sparse files"

This reverts commit 711a7e6f81983ff2091caa0f232af914a04a041c.

10 years agoinit-radosgw*: don't require rgw_socket_path to be defined
Yehuda Sadeh [Thu, 19 Mar 2015 03:55:24 +0000 (20:55 -0700)]
init-radosgw*: don't require rgw_socket_path to be defined

Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
(cherry picked from commit 3160e8d6918a04d1fec9fdccbc30bf007c7940c6)

10 years agoinit-radosgw.sysv: set ulimit -n before starting daemon
Sage Weil [Wed, 22 Oct 2014 00:59:30 +0000 (17:59 -0700)]
init-radosgw.sysv: set ulimit -n before starting daemon

If we do the ulimit inside the daemon command we will have already
dropped privs and will fail.

Fixes: #9587
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9803cedf54a7baff45ccd0e0f65d2bc220958a46)
(cherry picked from commit 534624b7e9decc880e88496355a6fbbe008ede5f)

10 years agobuild: remove LIBPERFGLUE from LIBMDS
Boris Ranto [Tue, 3 Feb 2015 13:38:33 +0000 (14:38 +0100)]
build: remove LIBPERFGLUE from LIBMDS

10 years ago0.80.8 v0.80.8
Jenkins [Tue, 13 Jan 2015 14:28:08 +0000 (06:28 -0800)]
0.80.8

10 years agomon/OSDMonitor: fix double-free on old MOSDBoot
Sage Weil [Tue, 19 Aug 2014 23:43:02 +0000 (16:43 -0700)]
mon/OSDMonitor: fix double-free on old MOSDBoot

send_latest() does an m->put().

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 97f9b6df668315fba6a5924b79024c7a986f4110)

10 years agoosd: requeue PG when we skip handling a peering event
Sage Weil [Thu, 8 Jan 2015 19:17:03 +0000 (11:17 -0800)]
osd: requeue PG when we skip handling a peering event

If we don't handle the event, we need to put the PG back into the peering
queue or else the event won't get processed until the next event is
queued, at which point we'll be processing events with a delay.

The queue_null is not necessary (and is a waste of effort) because the
event is still in pg->peering_queue and the PG is queued.

This is a firefly-specific patch; a (very) similar one will appear in master
in 492ccc900c3358f36b6b14a207beec071eb06707.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3217 from boydc2014/firefly
Sage Weil [Fri, 9 Jan 2015 02:31:26 +0000 (18:31 -0800)]
Merge pull request #3217 from boydc2014/firefly

clear data and payload after removed from ops_in_flight

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3127 from ktdreyer/firefly-no-epoch
Loic Dachary [Fri, 9 Jan 2015 00:32:17 +0000 (01:32 +0100)]
Merge pull request #3127 from ktdreyer/firefly-no-epoch

Revert "ceph.spec.: add epoch"

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3128 from dachary/wip-10281-make-check-fedora-20
Loic Dachary [Fri, 9 Jan 2015 00:31:29 +0000 (01:31 +0100)]
Merge pull request #3128 from dachary/wip-10281-make-check-fedora-20

tests: fixes to run make check on fedora 20

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3169 from ceph/wip-8797-firefly
Loic Dachary [Fri, 9 Jan 2015 00:30:59 +0000 (01:30 +0100)]
Merge pull request #3169 from ceph/wip-8797-firefly

Wip 8797 firefly

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3179 from dachary/wip-9998-crush-underfloat-firefly
Loic Dachary [Fri, 9 Jan 2015 00:28:49 +0000 (01:28 +0100)]
Merge pull request #3179 from dachary/wip-9998-crush-underfloat-firefly

crush: fix weight underfloat issue (firefly)

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3220 from ceph/wip-mon-backports.firefly
Loic Dachary [Fri, 9 Jan 2015 00:28:11 +0000 (01:28 +0100)]
Merge pull request #3220 from ceph/wip-mon-backports.firefly

mon: backports for #9987 against firefly

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3258 from ceph/wip-10372-firefly
Loic Dachary [Fri, 9 Jan 2015 00:26:30 +0000 (01:26 +0100)]
Merge pull request #3258 from ceph/wip-10372-firefly

osd: fix librados pool deletion race on firefly

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoIf trusty, use older version of qemu
Warren Usui [Fri, 19 Dec 2014 04:00:28 +0000 (20:00 -0800)]
If trusty, use older version of qemu

Fixes #10319
Signed-off-by: Warren Usui <warren.usui@inktank.com>
(cherry-picked from 46a1a4cb670d30397979cd89808a2e420cef2c11)

10 years agoclear data and payload inside ops_in_flight_lock 3217/head
Lei Dong [Tue, 30 Dec 2014 13:02:45 +0000 (21:02 +0800)]
clear data and payload inside ops_in_flight_lock

http://tracker.ceph.com/issues/9916 Fixes: #9916
Signed-off-by: Dong Lei <leidong@yahoo-inc.com>
10 years agoMerge pull request #3264 from dachary/wip-jerasure-firefly
Sage Weil [Mon, 29 Dec 2014 22:31:23 +0000 (14:31 -0800)]
Merge pull request #3264 from dachary/wip-jerasure-firefly

erasure-code: update links to jerasure upstream

10 years agoMerge pull request #3268 from ceph/firefly-10415
Sage Weil [Mon, 29 Dec 2014 18:55:39 +0000 (10:55 -0800)]
Merge pull request #3268 from ceph/firefly-10415

libcephfs/test.cc: close fd before umount

10 years agoerasure-code: update links to jerasure upstream 3264/head
Loic Dachary [Sun, 28 Dec 2014 09:29:54 +0000 (10:29 +0100)]
erasure-code: update links to jerasure upstream

It moved from bitbucket to jerasure.org

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

10 years agolibcephfs/test.cc: close fd before umount 3268/head
Yan, Zheng [Tue, 23 Dec 2014 02:22:00 +0000 (10:22 +0800)]
libcephfs/test.cc: close fd before umount

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

10 years agoosdc/Objecter: handle reply race with pool deletion 3258/head
Sage Weil [Tue, 23 Dec 2014 23:49:26 +0000 (15:49 -0800)]
osdc/Objecter: handle reply race with pool deletion

We need to handle this scenario:

 - send request in epoch X
 - osd replies
 - pool is deleted in epoch X+1
 - client gets map X+1, sends a map check
 - client handles reply
   -> asserts that no map checks are in flight

This isn't the best solution.  We could infer that a map check isn't needed
since the pool existed earlier and doesn't now.  But this is firefly and
the fix is no more expensive than the old assert.

Fixes: #10372
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agotest/ceph-disk.sh: mkdir -p 3128/head
Sage Weil [Tue, 5 Aug 2014 22:11:18 +0000 (15:11 -0700)]
test/ceph-disk.sh: mkdir -p

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

10 years agotest/ceph-disk.sh: resolve symlinks before check
Danny Al-Gaaf [Thu, 4 Sep 2014 10:23:27 +0000 (12:23 +0200)]
test/ceph-disk.sh: resolve symlinks before check

Make sure symlinks are resolved in command_fixture()
before compare result of which command and the current
path.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 8ea86dfa7c4a3d7e089cf9d4e49586657875f851)

10 years agotest/ceph-disk.sh: fix for SUSE
Danny Al-Gaaf [Tue, 24 Jun 2014 17:54:17 +0000 (19:54 +0200)]
test/ceph-disk.sh: fix for SUSE

On SUSE 'which' returns always the full path of (shell) commands and
not e.g. './ceph-conf' as on Debian. Add check also for full
path returned by which.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 39530536ff923b91899f6303507c283b78040a20)

10 years agotests: prevent kill race condition
Loic Dachary [Fri, 13 Jun 2014 12:41:39 +0000 (14:41 +0200)]
tests: prevent kill race condition

When trying to kill a daemon, keep its pid in a variable instead of
retrieving it from the pidfile multiple times. It prevents the following
race condition:

  * try to kill ceph-mon
  * ceph-mon is in the process of dying and removed its pidfile
  * try to kill ceph-mon fails because the pidfile is not found
  * another ceph-mon is spawned and fails to bind the port
    because the previous ceph-mon is still holding it

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

10 years agoosd/OSD.cc: parse lsb release data via lsb_release
Danny Al-Gaaf [Tue, 24 Jun 2014 22:31:48 +0000 (00:31 +0200)]
osd/OSD.cc: parse lsb release data via lsb_release

Use lsb_release tool to be portable since parsing /etc/lsb-release
is not the same between different distributions. The old code failed
e.g. for SUSE products to parse LSB information.

Fixes: #8654
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 0b3a3987d382ff33fdf892f189b30df22be80e59)

10 years agotests: histogram prevent re-use of local variables
Loic Dachary [Tue, 26 Aug 2014 19:59:39 +0000 (21:59 +0200)]
tests: histogram prevent re-use of local variables

By moving the tests to separate functions.

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

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

10 years agotests: histogram prevent re-use of local variables
Loic Dachary [Tue, 26 Aug 2014 19:59:39 +0000 (21:59 +0200)]
tests: histogram prevent re-use of local variables

By moving the test to a separate function.

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

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

10 years agotests: avoid tab interpretation problem on fedora 20
Loic Dachary [Tue, 9 Dec 2014 23:08:57 +0000 (00:08 +0100)]
tests: avoid tab interpretation problem on fedora 20

Use . instead of tab in echo to avoid variations in how escape sequences
are interpreted by the shell.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomon/PGMap and PGMonitor: update last_epoch_clean cache from new osd keys 3220/head
Sage Weil [Sun, 2 Nov 2014 16:50:59 +0000 (08:50 -0800)]
mon/PGMap and PGMonitor: update last_epoch_clean cache from new osd keys

We were only invalidating the cached value from apply_incremental, which
is no longer called on modern clusters.

Fix this by storing the update epoch in the key as well (it is not part
of osd_stat_t).

Backport: giant, firefly, dumpling(?)
Fixes: #9987
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 093c5f0cabeb552b90d944da2c50de48fcf6f564)

10 years agomon/PGMap: invalidate cached min_last_epoch_clean from new-style pg keys
Sage Weil [Sun, 2 Nov 2014 16:49:48 +0000 (08:49 -0800)]
mon/PGMap: invalidate cached min_last_epoch_clean from new-style pg keys

We were only invalidating the cache from the legacy apply_incremental(),
which is no longer called on modern clusters.

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

10 years agocrush/CrushWrapper: fix create_or_move_item when name exists but item does not 3179/head
Sage Weil [Mon, 24 Nov 2014 02:50:51 +0000 (18:50 -0800)]
crush/CrushWrapper: fix create_or_move_item when name exists but item does not

We were using item_exists(), which simply checks if we have a name defined
for the item.  Instead, use _search_item_exists(), which looks for an
instance of the item somewhere in the hierarchy.  This matches what
get_item_weightf() is doing, which ensures we get a non-negative weight
that converts properly to floating point.

Backport: giant, firefly
Fixes: #9998
Reported-by: Pawel Sadowski <ceph@sadziu.pl>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9902383c690dca9ed5ba667800413daa8332157e)

10 years agocrush/builder: prevent bucket weight underflow on item removal
Sage Weil [Sat, 22 Nov 2014 01:47:56 +0000 (17:47 -0800)]
crush/builder: prevent bucket weight underflow on item removal

It is possible to set a bucket weight that is not the sum of the item
weights if you manually modify/build the CRUSH map.  Protect against any
underflow on the bucket weight when removing items.

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

10 years agocrush/CrushWrapper: fix _search_item_exists
Sage Weil [Sat, 22 Nov 2014 01:37:03 +0000 (17:37 -0800)]
crush/CrushWrapper: fix _search_item_exists

Reported-by: Pawel Sadowski <ceph@sadziu.pl>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit eeadd60714d908a3a033aeb7fd542c511e63122b)

10 years agoMerge pull request #3124 from ceph/wip-10194-firefly
Sage Weil [Fri, 12 Dec 2014 14:19:50 +0000 (06:19 -0800)]
Merge pull request #3124 from ceph/wip-10194-firefly

rgw: optionally call FCGX_Free() on the fcgi connection

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoCall Rados.shutdown() explicitly before exit 3169/head
Dan Mick [Wed, 10 Dec 2014 21:19:53 +0000 (13:19 -0800)]
Call Rados.shutdown() explicitly before exit

This is mostly a demonstration of good behavior, as the resources will
be reclaimed on exit anyway.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit b038e8fbf9103cc42a4cde734b3ee601af6019ea)

10 years agorados.py: remove Rados.__del__(); it just causes problems
Dan Mick [Wed, 10 Dec 2014 21:19:16 +0000 (13:19 -0800)]
rados.py: remove Rados.__del__(); it just causes problems

Recent versions of Python contain a change to thread shutdown that
causes ceph to hang on exit; see http://bugs.python.org/issue21963.
As it turns out, this is relatively easy to avoid by not spawning
threads on exit, as Rados.__del__() will certainly do by calling
shutdown(); I suspect, but haven't proven, that the problem is
that shutdown() tries to start() a threading.Thread() that never
makes it all the way back to signal start().

Also add a PendingReleaseNote and extra doc comments to clarify.

Fixes: #8797
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 5ba9b8f21f8010c59dd84a0ef2acfec99e4b048f)

Conflicts:
PendingReleaseNotes

10 years agoRevert "ceph.spec.: add epoch" 3127/head
Ken Dreyer [Tue, 9 Dec 2014 21:52:19 +0000 (14:52 -0700)]
Revert "ceph.spec.: add epoch"

If ICE ships 0.80.8, then it will be newer than what RHCEPH ships
(0.80.7), and users won't be able to seamlessly upgrade via Yum.

We have three options:
A) Revert the "Epoch: 1" change on the Firefly branch.
B) Revert the "Epoch: 1" change in the ICE packages.
C) Bump the Epoch to "2" in Red Hat's packages.

This commit does Option A.

Option B may or may not be feasible - it would require a "downstream"
change in ICE, and we haven't done that sort of thing before.

Due to the RHEL release schedule, Option C is not available to us at
this point.

This reverts commit b890c1e4706d7cfef7ed24c9df65b439b4f7ff1d.

10 years agorgw: optionally call FCGX_Free() on the fcgi connection 3124/head
Yehuda Sadeh [Wed, 26 Nov 2014 23:18:07 +0000 (15:18 -0800)]
rgw: optionally call FCGX_Free() on the fcgi connection

Fixes: #10194
A new configurable controls this behavior. This forces disconnection of
the fcgi connection when done with the request.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3109 from ceph/firefly-10263
Gregory Farnum [Mon, 8 Dec 2014 23:02:52 +0000 (15:02 -0800)]
Merge pull request #3109 from ceph/firefly-10263

mds: store backtrace for straydir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3009 from dachary/wip-10018-primary-erasure-code-hinfo-firefly
Samuel Just [Mon, 8 Dec 2014 21:19:44 +0000 (13:19 -0800)]
Merge pull request #3009 from dachary/wip-10018-primary-erasure-code-hinfo-firefly

osd: deep scrub must not abort if hinfo is missing (firefly)

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agomds: store backtrace for straydir 3109/head
Yan, Zheng [Fri, 7 Nov 2014 03:38:37 +0000 (11:38 +0800)]
mds: store backtrace for straydir

Backport: giant, firefly, emperor, dumpling
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 0d89db5d3e5ae5d552d4058a88a4e186748ab1d2)

10 years agoMerge pull request #3089 from dachary/wip-10063-hobject-shard-firefly
Sage Weil [Sat, 6 Dec 2014 19:06:02 +0000 (11:06 -0800)]
Merge pull request #3089 from dachary/wip-10063-hobject-shard-firefly

common: do not omit shard when ghobject NO_GEN is set (firefly)

10 years agoMerge pull request #2480 from dachary/wip-9420-erasure-code-non-regression-firefly
Sage Weil [Sat, 6 Dec 2014 18:59:44 +0000 (10:59 -0800)]
Merge pull request #2480 from dachary/wip-9420-erasure-code-non-regression-firefly

erasure-code: store and compare encoded contents (firefly)

10 years agoMerge pull request #3096 from dachary/wip-9785-dmcrypt-keys-permissions-firefly
Sage Weil [Sat, 6 Dec 2014 01:33:05 +0000 (17:33 -0800)]
Merge pull request #3096 from dachary/wip-9785-dmcrypt-keys-permissions-firefly

ceph-disk: dmcrypt file permissions (firefly)

10 years agoceph-disk: dmcrypt file permissions 3096/head
Loic Dachary [Thu, 4 Dec 2014 21:21:32 +0000 (22:21 +0100)]
ceph-disk: dmcrypt file permissions

The directory in which key files are stored for dmcrypt must be 700 and
the file 600.

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

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

10 years agoMerge pull request #3086 from dachary/wip-10125-radosgw-init-firefly
Sage Weil [Fri, 5 Dec 2014 17:04:00 +0000 (09:04 -0800)]
Merge pull request #3086 from dachary/wip-10125-radosgw-init-firefly

rgw: run radosgw as apache with systemd (firefly)

10 years agocommon: do not omit shard when ghobject NO_GEN is set 3089/head
Loic Dachary [Fri, 14 Nov 2014 00:16:10 +0000 (01:16 +0100)]
common: do not omit shard when ghobject NO_GEN is set

Do not silence the display of shard_id when generation is NO_GEN.
Erasure coded objects JSON representation used by ceph_objectstore_tool
need the shard_id to find the file containing the chunk.

Minimal testing is added to ceph_objectstore_tool.py

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

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

Conflicts:
src/test/ceph_objectstore_tool.py

10 years agorgw: run radosgw as apache with systemd 3086/head
Loic Dachary [Tue, 2 Dec 2014 17:10:48 +0000 (18:10 +0100)]
rgw: run radosgw as apache with systemd

Same as sysv.

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

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

Conflicts:
src/init-radosgw.sysv

10 years agoMerge pull request #3078 from ceph/wip-10030-firefly
Josh Durgin [Thu, 4 Dec 2014 19:32:18 +0000 (11:32 -0800)]
Merge pull request #3078 from ceph/wip-10030-firefly

librbd: don't close an already closed parent image upon failure

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3063 from ceph/wip-10123-firefly
Sage Weil [Thu, 4 Dec 2014 07:01:44 +0000 (23:01 -0800)]
Merge pull request #3063 from ceph/wip-10123-firefly

librbd: protect list_children from invalid child pool IoCtxs

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoReplicatedPG: don't move on to the next snap immediately
Samuel Just [Tue, 23 Sep 2014 22:52:08 +0000 (15:52 -0700)]
ReplicatedPG: don't move on to the next snap immediately

If we have a bunch of trimmed snaps for which we have no
objects, we'll spin for a long time.  Instead, requeue.

Fixes: #9487
Backport: dumpling, firefly, giant
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit c17ac03a50da523f250eb6394c89cc7e93cb4659)

10 years agoosd: initialize purged_snap on backfill start; restart backfill if change
Sage Weil [Tue, 23 Sep 2014 23:21:33 +0000 (16:21 -0700)]
osd: initialize purged_snap on backfill start; restart backfill if change

If we backfill a PG to a new OSD, we currently neglect to initialize
purged_snaps.  As a result, the first time the snaptrimmer runs it has to
churn through every deleted snap for all time, and to make matters worse
does so in one go with the PG lock held.  This leads to badness on any
cluster with a significant number of removed snaps that experiences
backfill.

Resolve this by initializing purged_snaps when we finish backfill.  The
backfill itself will clear out any stray snaps and ensure the object set
is in sync with purged_snaps.  Note that purged_snaps on the primary
that is driving backfill will not change during this period as the
snaptrimmer is not scheduled unless the PG is clean (which it won't be
during backfill).

If we by chance to interrupt backfill, go clean with other OSDs,
purge snaps, and then let this OSD rejoin, we will either restart
backfill (non-contiguous log) or the log will include the result of
the snap trim (the events that remove the trimmed snap).

Fixes: #9487
Backfill: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 255b430a87201c7d0cf8f10a3c1e62cbe8dd2d93)

10 years agolibrbd: don't close an already closed parent image upon failure 3078/head
Jason Dillaman [Thu, 6 Nov 2014 10:01:38 +0000 (05:01 -0500)]
librbd: don't close an already closed parent image upon failure

If librbd is not able to open a child's parent image, it will
incorrectly close the parent image twice, resulting in a crash.

Fixes: #10030
Backport: firefly, giant
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 61ebfebd59b61ffdc203dfeca01ee1a02315133e)

10 years agolibrbd: protect list_children from invalid child pool IoCtxs 3063/head
Jason Dillaman [Tue, 18 Nov 2014 02:49:26 +0000 (21:49 -0500)]
librbd: protect list_children from invalid child pool IoCtxs

While listing child images, don't ignore error codes returned
from librados when creating an IoCtx. This will prevent seg
faults from occurring when an invalid IoCtx is used.

Fixes: #10123
Backport: giant, firefly, dumpling
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0d350b6817d7905908a4e432cd359ca1d36bab50)

10 years agoMerge pull request #3014 from dachary/wip-9665-ceph-disk-partprobe-firefly
Sage Weil [Sun, 30 Nov 2014 18:12:04 +0000 (10:12 -0800)]
Merge pull request #3014 from dachary/wip-9665-ceph-disk-partprobe-firefly

ceph disk zap must call partprobe

10 years agoceph-disk: use update_partition in prepare_dev and main_prepare 3014/head
Loic Dachary [Fri, 10 Oct 2014 08:26:31 +0000 (10:26 +0200)]
ceph-disk: use update_partition in prepare_dev and main_prepare

In the case of prepare_dev the partx alternative was missing and is not
added because update_partition does it.

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

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

Conflicts:
src/ceph-disk

10 years agoceph-disk: run partprobe after zap
Loic Dachary [Thu, 9 Oct 2014 16:52:17 +0000 (18:52 +0200)]
ceph-disk: run partprobe after zap

Not running partprobe after zapping a device can lead to the following:

* ceph-disk prepare /dev/loop2
* links are created in /dev/disk/by-partuuid
* ceph-disk zap /dev/loop2
* links are not removed from /dev/disk/by-partuuid
* ceph-disk prepare /dev/loop2
* some links are not created in /dev/disk/by-partuuid

This is assuming there is a bug in the way udev events are handled by
the operating system.

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

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

10 years agoceph-disk: encapsulate partprobe / partx calls
Loic Dachary [Fri, 10 Oct 2014 08:23:34 +0000 (10:23 +0200)]
ceph-disk: encapsulate partprobe / partx calls

Add the update_partition function to reduce code duplication.
The action is made an argument although it always is -a because it will
be -d when deleting a partition.

Use the update_partition function in prepare_journal_dev

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

Conflicts:
src/ceph-disk

10 years agoosd: deep scrub must not abort if hinfo is missing 3009/head
Loic Dachary [Thu, 6 Nov 2014 16:11:20 +0000 (17:11 +0100)]
osd: deep scrub must not abort if hinfo is missing

Instead it should set read_error.

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

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

10 years agoerasure-code: add corpus verification to make check 2480/head
Loic Dachary [Tue, 23 Sep 2014 09:38:09 +0000 (11:38 +0200)]
erasure-code: add corpus verification to make check

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoerasure-code: workunit to check for encoding regression
Loic Dachary [Sat, 13 Sep 2014 11:36:09 +0000 (13:36 +0200)]
erasure-code: workunit to check for encoding regression

Clone the archive of encoded objects and decode all archived objects, up
to and including the current ceph version.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoerasure-code: store and compare encoded contents
Loic Dachary [Sat, 13 Sep 2014 08:16:31 +0000 (10:16 +0200)]
erasure-code: store and compare encoded contents

Introduce ceph_erasure_code_non_regression to check and compare how an
erasure code plugin encodes and decodes content with a given set of
parameters. For instance:

./ceph_erasure_code_non_regression \
      --plugin jerasure \
      --parameter technique=reed_sol_van \
      --parameter k=2 \
      --parameter m=2 \
      --stripe-width 3181 \
      --create \
      --check

Will create an encoded object (--create) and store it into a directory
along with the chunks, one chunk per file. The directory name is derived
from the parameters. The content of the object is a random pattern of 31
bytes repeated to fill the object size specified with --stripe-width.

The check function (--check) reads the object back from the file,
encodes it and compares the result with the content of the chunks read
from the files. It also attempts recover from one or two erasures.

Chunks encoded by a given version of Ceph are expected to be encoded
exactly in the same way by all Ceph versions going forward.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoMerge pull request #2961 from ceph/wip-10114-firefly
Loic Dachary [Wed, 19 Nov 2014 01:45:26 +0000 (02:45 +0100)]
Merge pull request #2961 from ceph/wip-10114-firefly

Add annotation to all assembly files to turn off stack-execute bit

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAdd annotation to all assembly files to turn off stack-execute bit 2961/head
Dan Mick [Sat, 15 Nov 2014 01:59:57 +0000 (17:59 -0800)]
Add annotation to all assembly files to turn off stack-execute bit

See discussion in http://tracker.ceph.com/issues/10114

Building with these changes allows output from readelf like this:

 $ readelf -lW src/.libs/librados.so.2 | grep GNU_STACK
  GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000
0x000000 RW  0x8

(note the absence of 'X' in 'RW')

Fixes: #10114
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 06a245a9845c0c126fb3106b41b2fd2bc4bc4df3)
(not-yet-present-in-firefly files in isa-l manually removed)

10 years agoMerge pull request #2760 from ceph/wip-9835-firefly
Samuel Just [Thu, 13 Nov 2014 18:36:12 +0000 (10:36 -0800)]
Merge pull request #2760 from ceph/wip-9835-firefly

osd: fix erasure hung op bug (9835)

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoosd: use OSDMap helper to tell if ops are misdirected 2760/head
Samuel Just [Wed, 5 Nov 2014 20:12:14 +0000 (12:12 -0800)]
osd: use OSDMap helper to tell if ops are misdirected

calc_pg_role doesn't actually take into account primary affinity.

Fixes: #9835
Signed-off-by: Samuel Just <sam.just@inktank.com>
10 years agoosd: discard rank > 0 ops on erasure pools
Sage Weil [Mon, 20 Oct 2014 20:55:33 +0000 (13:55 -0700)]
osd: discard rank > 0 ops on erasure pools

Erasure pools do not support read from replica, so we should drop
any rank > 0 requests.

This fixes a bug where an erasure pool maps to [1,2,3], temporarily maps
to [-1,2,3], sends a request to osd.2, and then remaps back to [1,2,3].
Because the 0 shard never appears on osd.2, the request sits in the
waiting_for_pg map indefinitely and cases slow request warnings.
This problem does not come up on replicated pools because all instances of
the PG are created equal.

Fix by only considering role == 0 for erasure pools as a correct mapping.

Fixes: #9835
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/OSDMap: add osd_is_valid_op_target()
Sage Weil [Thu, 13 Nov 2014 01:04:35 +0000 (17:04 -0800)]
osd/OSDMap: add osd_is_valid_op_target()

Helper to check whether an osd is a given op target for a pg.  This
assumes that for EC we always send ops to the primary, while for
replicated we may target any replica.

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

10 years agoqa: allow small allocation diffs for exported rbds
Josh Durgin [Wed, 12 Nov 2014 02:16:02 +0000 (18:16 -0800)]
qa: allow small allocation diffs for exported rbds

The local filesytem may behave slightly differently. This isn't
foolproof, but seems to be reliable enough on rhel7 rootfs, where
exact comparison was failing.

Fixes: #10002
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e94d3c11edb9c9cbcf108463fdff8404df79be33)

10 years agoosd: fix map advance limit to handle map gaps
Sage Weil [Sun, 25 May 2014 15:38:38 +0000 (08:38 -0700)]
osd: fix map advance limit to handle map gaps

The recent change in cf25bdf6b0090379903981fe8cee5ea75efd7ba0 would stop
advancing after some number of epochs, but did not take into consideration
the possibilty that there are missing maps.  In that case, it is impossible
to advance past the gap.

Fix this by increasing the max epoch as we go so that we can always get
beyond the gap.

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

10 years agoMerge pull request #2880 from ceph/wip-10025-firefly
Gregory Farnum [Fri, 7 Nov 2014 22:10:18 +0000 (14:10 -0800)]
Merge pull request #2880 from ceph/wip-10025-firefly

#10025/firefly -- tools: fix MDS journal import

Reviewed-by: Greg Farnum <greg@inktank.com>
10 years agotools: fix MDS journal import 2880/head
John Spray [Fri, 7 Nov 2014 11:34:43 +0000 (11:34 +0000)]
tools: fix MDS journal import

Previously it only worked on fresh filesystems which
hadn't been trimmed yet, and resulted in an invalid
trimmed_pos when expire_pos wasn't on an object
boundary.

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

10 years agoMerge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly
Samuel Just [Thu, 6 Nov 2014 18:37:42 +0000 (10:37 -0800)]
Merge remote-tracking branch 'origin/wip-sam-firefly-backports' into firefly

10 years agoMerge pull request #2737 from ceph/wip-9629-firefly
Samuel Just [Thu, 6 Nov 2014 18:30:20 +0000 (10:30 -0800)]
Merge pull request #2737 from ceph/wip-9629-firefly

osd: do not clone/preserve snapdir on cache-evict (firefly backport)

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2657 from ceph/wip-9053-9301-firefly
Samuel Just [Thu, 6 Nov 2014 18:26:21 +0000 (10:26 -0800)]
Merge pull request #2657 from ceph/wip-9053-9301-firefly

mon: backport two paxos fixes to firefly

Reviewed-by: Joao Luis <joao@redhat.com>
10 years agoMerge pull request #2656 from ceph/wip-9502-firefly
Samuel Just [Thu, 6 Nov 2014 18:21:12 +0000 (10:21 -0800)]
Merge pull request #2656 from ceph/wip-9502-firefly

mon: backport mon disk full check to firefly

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2764 from ceph/wip-9851
Samuel Just [Thu, 6 Nov 2014 18:18:27 +0000 (10:18 -0800)]
Merge pull request #2764 from ceph/wip-9851

osd: bring FileJournal in sync with giant

Reviewed-by: Samuel Just <sjust@redhat.com>