]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoMerge pull request #17864 from smithfarm/wip-21438-luminous
Sage Weil [Thu, 19 Oct 2017 21:40:45 +0000 (16:40 -0500)]
Merge pull request #17864 from smithfarm/wip-21438-luminous

luminous: core: Daemons(OSD, Mon...) exit abnormally at injectargs command

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17866 from smithfarm/wip-21320-luminous
Sage Weil [Thu, 19 Oct 2017 21:40:18 +0000 (16:40 -0500)]
Merge pull request #17866 from smithfarm/wip-21320-luminous

luminous: mgr: Quieten scary RuntimeError from restful module on startup

7 years agoMerge pull request #17951 from smithfarm/wip-21548-luminous
Sage Weil [Thu, 19 Oct 2017 21:39:53 +0000 (16:39 -0500)]
Merge pull request #17951 from smithfarm/wip-21548-luminous

luminous: tests: ceph_manager: bad AssertionError: failed to recover before timeout expired

7 years agoMerge pull request #18342 from xiexingguo/wip-pr-18318
Sage Weil [Thu, 19 Oct 2017 21:39:32 +0000 (16:39 -0500)]
Merge pull request #18342 from xiexingguo/wip-pr-18318

luminous: bluestore: using bluestore_compression_min_blob_size instead of bluestore_compression_max_blob_size to config comp_min_blob_size

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18363 from ceph/wip-yuriw-21822-luminous
vasukulkarni [Tue, 17 Oct 2017 22:47:31 +0000 (15:47 -0700)]
Merge pull request #18363 from ceph/wip-yuriw-21822-luminous

tests - ceph-ansible vars additions

7 years agotests - ceph-ansible vars additions 18363/head
Yuri Weinstein [Tue, 17 Oct 2017 20:14:36 +0000 (13:14 -0700)]
tests - ceph-ansible vars additions
added symlinks for distros

Fixes http://tracker.ceph.com/issues/21822
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #17975 from dillaman/wip-systemd-rbd-mirror-luminous
Sage Weil [Tue, 17 Oct 2017 21:31:25 +0000 (16:31 -0500)]
Merge pull request #17975 from dillaman/wip-systemd-rbd-mirror-luminous

luminous: systemd: rbd-mirror does not start on reboot

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge pull request #18234 from jdurgin/wip-filestore-rocksdb-luminous
Sage Weil [Tue, 17 Oct 2017 21:30:46 +0000 (16:30 -0500)]
Merge pull request #18234 from jdurgin/wip-filestore-rocksdb-luminous

filestore: set default readahead and compaction threads for rocksdb

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18236 from tchaikov/wip-21609-luminous
Sage Weil [Tue, 17 Oct 2017 21:29:38 +0000 (16:29 -0500)]
Merge pull request #18236 from tchaikov/wip-21609-luminous

luminous: mon,osd: fix "pg ls {forced_backfill, backfilling}"

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18257 from smithfarm/wip-21699-luminous
Sage Weil [Tue, 17 Oct 2017 21:29:08 +0000 (16:29 -0500)]
Merge pull request #18257 from smithfarm/wip-21699-luminous

luminous: mgr status module uses base 10 units

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agobluestore: using bluestore_compression_min_blob_size instead of bluestore_compression... 18342/head
linbing [Mon, 16 Oct 2017 01:57:23 +0000 (09:57 +0800)]
bluestore: using bluestore_compression_min_blob_size instead of bluestore_compression_max_blob_size to config comp_min_blob_size

Signed-off-by: linbing <linbing@t2cloud.net>
(cherry picked from commit da8dc4d4c60f5fd66f6eb2ba7257c52948f24681)

7 years agoMerge pull request #18339 from tchaikov/wip-gen-state-diagram-luminous
Kefu Chai [Tue, 17 Oct 2017 07:19:01 +0000 (15:19 +0800)]
Merge pull request #18339 from tchaikov/wip-gen-state-diagram-luminous

doc: build with multiple-line state transition function signature

Reviewed-By: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #17835 from rzarzynski/wip-rgw-per-storage-policy-stats-luminous
Kefu Chai [Tue, 17 Oct 2017 04:44:04 +0000 (12:44 +0800)]
Merge pull request #17835 from rzarzynski/wip-rgw-per-storage-policy-stats-luminous

luminous: rgw: add support for Swift's per storage policy statistics

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agodoc parse two lines for getting the context 18339/head
Alfredo Deza [Fri, 6 Oct 2017 12:57:01 +0000 (08:57 -0400)]
doc parse two lines for getting the context

So that signatures can get parsed when they are split like:

PG::RecoveryState::RepWaitBackfillReserved::react(
  const RemoteReservationCanceled &evt)

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9e2a52ccec4a5c833dd861ae528d52efbc0f9e5f)

7 years agodoc raise exceptions with a base class
Alfredo Deza [Fri, 6 Oct 2017 12:03:36 +0000 (08:03 -0400)]
doc raise exceptions with a base class

Although valid in very old Python, it is no longer possible to raise
"bare" exceptions without a class.

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 347b7b1f193f97a3577a971e074a23366b0c8617)

7 years agoMerge pull request #17834 from rzarzynski/wip-rgw-21148-luminous
Matt Benjamin [Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)]
Merge pull request #17834 from rzarzynski/wip-rgw-21148-luminous

luminous: rgw: add support for Swift's reversed account listings

7 years agoMerge pull request #17811 from smithfarm/wip-21456-luminous
Matt Benjamin [Sun, 15 Oct 2017 16:48:02 +0000 (12:48 -0400)]
Merge pull request #17811 from smithfarm/wip-21456-luminous

luminous: rgw: wrong error message is returned when putting container with a name that is too long

7 years agoMerge pull request #17832 from rzarzynski/wip-rgw-18977-luminous
Marcus Watts [Sat, 14 Oct 2017 00:42:16 +0000 (20:42 -0400)]
Merge pull request #17832 from rzarzynski/wip-rgw-18977-luminous

luminous: rgw: list_objects() honors end_marker regardless of namespace.

7 years agoMerge pull request #18275 from ceph/wip-yuriw-21776-luminous
Josh Durgin [Fri, 13 Oct 2017 22:29:45 +0000 (15:29 -0700)]
Merge pull request #18275 from ceph/wip-yuriw-21776-luminous

tests - Removed `distors` and added `supported` to run on all support…

Reviewed-by: Vasu Kulkarni <vakulkar@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agotests - Removed `distors` and added `supported` to run on all supported OSs 18275/head
Yuri Weinstein [Thu, 12 Oct 2017 20:36:20 +0000 (13:36 -0700)]
tests - Removed `distors` and added `supported` to run on all supported OSs
Added `openstack` fragment to run on vps
Forced/hard-coded `machine_type=vps`
Added `print`s
Added only centos and ubuntu latest to support systemd (in distros dir)
Added `ceph osd set-require-min-compat-client luminous`

Fixes http://tracker.ceph.com/issues/21776

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #18050 from xiexingguo/wip-pr-17610
Sage Weil [Fri, 13 Oct 2017 19:34:56 +0000 (14:34 -0500)]
Merge pull request #18050 from xiexingguo/wip-pr-17610

luminous: os/bluestore: set bitmap freelist resolution to min_alloc_size

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18247 from liewegas/wip-seesaw-warning-luminous
Sage Weil [Fri, 13 Oct 2017 19:34:30 +0000 (14:34 -0500)]
Merge pull request #18247 from liewegas/wip-seesaw-warning-luminous

qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN

7 years agoMerge pull request #18253 from ceph/wip-yuriw-21660_2-luminous_1
Sage Weil [Thu, 12 Oct 2017 19:57:38 +0000 (14:57 -0500)]
Merge pull request #18253 from ceph/wip-yuriw-21660_2-luminous_1

tests - Added yaml fragmet to cover testing...

7 years agoMerge pull request #18254 from ceph/wip-yuriw-21660_3-luminous_1
Sage Weil [Thu, 12 Oct 2017 19:57:23 +0000 (14:57 -0500)]
Merge pull request #18254 from ceph/wip-yuriw-21660_3-luminous_1

tests - Added yaml fragmet to cover testing...

7 years agoqa: s/backfill/backfilling/ 18236/head
Kefu Chai [Wed, 11 Oct 2017 03:45:33 +0000 (11:45 +0800)]
qa: s/backfill/backfilling/

it's renamed "backfilling" in 4015343f .

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

7 years agomgr/status: fix ceph fs status returns error 18257/head
Yanhu Cao [Wed, 11 Oct 2017 01:31:14 +0000 (09:31 +0800)]
mgr/status: fix ceph fs status returns error

Fixes: http://tracker.ceph.com/issues/21752
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
(cherry picked from commit 4a90daa700142ed1f58f5f2a2cc85f3049bccd64)

7 years agomgr/status: format byte quantities in base 2 multiples
John Spray [Wed, 30 Aug 2017 19:32:11 +0000 (20:32 +0100)]
mgr/status: format byte quantities in base 2 multiples

Fixes: http://tracker.ceph.com/issues/21189
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 2a5ae210928f8c9f1e3b72863c277ae5655bb771)

7 years agotests - Added yaml fragmet to cover testing... 18254/head
Yuri Weinstein [Wed, 11 Oct 2017 20:12:45 +0000 (13:12 -0700)]
tests - Added yaml fragmet to cover testing...
... for http://tracker.ceph.com/issues/21660#note-17

for luminous-x (see similar #18200, #18226)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit e7fdda31803cd37604a9296a876320bfcb849d34)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agotests - Added yaml fragmet to cover testing... 18253/head
Yuri Weinstein [Tue, 10 Oct 2017 20:48:33 +0000 (13:48 -0700)]
tests - Added yaml fragmet to cover testing...
... for http://tracker.ceph.com/issues/21660#note-17
for jewel-x (see similar https://github.com/ceph/ceph/pull/18200)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit b552e636ddd8ce2cfb605b4c124440d8dd1e8e47)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #18025 from liewegas/wip-recovery-preemption-luminous
Sage Weil [Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)]
Merge pull request #18025 from liewegas/wip-recovery-preemption-luminous

luminous: osd: allow recovery preemption

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18154 from ktdreyer/luminous-gitignore-debian-patches
Sage Weil [Wed, 11 Oct 2017 17:19:45 +0000 (12:19 -0500)]
Merge pull request #18154 from ktdreyer/luminous-gitignore-debian-patches

luminous: .gitignore: allow debian .patch files

7 years agoMerge pull request #18189 from tchaikov/wip-retry-oserror-luminous
Sage Weil [Wed, 11 Oct 2017 17:19:08 +0000 (12:19 -0500)]
Merge pull request #18189 from tchaikov/wip-retry-oserror-luminous

luminous: ceph-disk: retry on OSError

7 years agoMerge pull request #18227 from liewegas/wip-bluestore-mempool-luminous
Sage Weil [Wed, 11 Oct 2017 17:18:27 +0000 (12:18 -0500)]
Merge pull request #18227 from liewegas/wip-bluestore-mempool-luminous

luminous: os/bluestore: several mempool accounting fixes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoqa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN 18247/head
Sage Weil [Wed, 11 Oct 2017 13:24:50 +0000 (08:24 -0500)]
qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN

Mgr can get marked down when mon weirdness is happening.

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

7 years agomon/PGMap: let pg_string_state() return boost::optional<>
Kefu Chai [Tue, 10 Oct 2017 12:32:08 +0000 (20:32 +0800)]
mon/PGMap: let pg_string_state() return boost::optional<>

better to be specific, so we don't run into the same problem even we
are using the MSB of uint64_t for a pg state bit in future. we could,
however use uint64_t(-1) to indicate the pg_string_state()'s failure to
parse the state string, because pg_string_state() only translate a
single state a time. but it's always better to be explicit than
implicit.

Fixes: http://tracker.ceph.com/issues/21609
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 260f87a9f1c4e32ff3a596ea341ad07a901f44a9)

Conflicts:
src/mon/PGMap.cc
src/osd/osd_types.cc
src/osd/osd_types.h: trivial resolution

7 years agocommon/options: enable multiple rocksdb compaction threads for filestore 18234/head
Josh Durgin [Tue, 10 Oct 2017 23:54:31 +0000 (19:54 -0400)]
common/options: enable multiple rocksdb compaction threads for filestore

One of the major benefits of rocksdb over leveldb is multithreaded
compaction. The default of 1 thread does not provide much benefit, and
is insufficient for heavy rgw workloads.

For high-write and delete omap workloads I've seen up to 8 compaction
threads be used.  There's little overhead to having a higher max than
are needed, so set the default to 8.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 023fa810aa6b3af305e9027e3f717e54d1bb2712)

Conflicts:
    src/common/options.cc (trivial)

7 years agocommon/options.cc: Set Filestore rocksdb compaction readahead option.
Mark Nelson [Thu, 21 Sep 2017 22:21:16 +0000 (17:21 -0500)]
common/options.cc: Set Filestore rocksdb compaction readahead option.

fixes: http://tracker.ceph.com/issues/21505

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 66567e573836c570040c8d8148c34b0cf9dc9ce2)

7 years agoos/bluestore: move several buffer{ptr,list}s into cache_other mempool 18227/head
Sage Weil [Thu, 28 Sep 2017 12:02:50 +0000 (08:02 -0400)]
os/bluestore: move several buffer{ptr,list}s into cache_other mempool

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

7 years agoos/bluestore: put new attrs in correct mempool too
Sage Weil [Thu, 28 Sep 2017 12:14:37 +0000 (08:14 -0400)]
os/bluestore: put new attrs in correct mempool too

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

7 years agoos/bluestore: put attrs in mempool
Sage Weil [Fri, 22 Sep 2017 12:09:37 +0000 (08:09 -0400)]
os/bluestore: put attrs in mempool

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

7 years agobuffer: add ptr::[try_]reassign_to_mempool
Sage Weil [Fri, 22 Sep 2017 12:08:52 +0000 (08:08 -0400)]
buffer: add ptr::[try_]reassign_to_mempool

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

7 years agoMerge pull request #18200 from ceph/wip-yuriw-21660-luminous
Josh Durgin [Tue, 10 Oct 2017 20:17:46 +0000 (13:17 -0700)]
Merge pull request #18200 from ceph/wip-yuriw-21660-luminous

tests - Added yaml fragmet to cover testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agotests - Added yaml fragmet to cover testing on standanone client.4 18200/head
Yuri Weinstein [Mon, 9 Oct 2017 19:51:59 +0000 (12:51 -0700)]
tests - Added yaml fragmet to cover testing on standanone client.4
for http://tracker.ceph.com/issues/21660#note-17

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoceph-disk: retry on OSError 18189/head
Kefu Chai [Sat, 7 Oct 2017 14:15:11 +0000 (22:15 +0800)]
ceph-disk: retry on OSError

we are likely to
1) create partition, for instance, sdc1
2) partprobe sdc
3) udevadm settle
4) check the device by its path: /dev/sdc1

but there is chance that the uevent sent from kernel fails to reach udev
before we call "udevadm", hence "/dev/sdc1" does not exist even after
"udevadm settle" returns. so we retry in case of OSError here.

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

7 years agoceph-disk: factor out the retry logic into a decorator
Kefu Chai [Sat, 7 Oct 2017 13:13:47 +0000 (21:13 +0800)]
ceph-disk: factor out the retry logic into a decorator

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

7 years agoMerge pull request #18167 from tchaikov/wip-luminous-sphinx
Alfredo Deza [Sun, 8 Oct 2017 16:05:25 +0000 (12:05 -0400)]
Merge pull request #18167 from tchaikov/wip-luminous-sphinx

luminous: admin: bump sphinx to 1.6

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc: switch to upstream sphinx-ditaa 18167/head
Kefu Chai [Mon, 11 Sep 2017 13:54:33 +0000 (21:54 +0800)]
doc: switch to upstream sphinx-ditaa

it works with setuptools and is now compatible with py3

the py3 branch is created to track the upstream's master branch

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

7 years agoadmin: bump sphinx to 1.6
Alfredo Deza [Tue, 15 Aug 2017 13:12:27 +0000 (09:12 -0400)]
admin: bump sphinx to 1.6

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 88a1114cb3f90e52ba718dc832617fa004d63b3c)

7 years agoMerge pull request #17914 from liewegas/wip-21498-luminous
Alfredo Deza [Fri, 6 Oct 2017 21:42:30 +0000 (17:42 -0400)]
Merge pull request #17914 from liewegas/wip-21498-luminous

ceph-disk: fix '--runtime' omission for ceph-osd service

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18135 from liewegas/wip-vta-luminous
Sage Weil [Fri, 6 Oct 2017 20:35:06 +0000 (15:35 -0500)]
Merge pull request #18135 from liewegas/wip-vta-luminous

luminous: cmake: disable VTA on options.cc

7 years ago.gitignore: allow debian .patch files 18154/head
Ken Dreyer [Thu, 7 Sep 2017 17:07:59 +0000 (11:07 -0600)]
.gitignore: allow debian .patch files

The Ubuntu packaging layout with git-buildpackage assumes a
"debian/patches/" directory with several .patch files in it.

When upstream's .gitignore tells Git to ignore .patch files, we have to
edit that line out downstream. When we forget to do that downstream, it
can lead to missing patches and broken downstream builds.

Allow patches in the /debian/patches directory so it's easier to
maintain an Ubuntu package based on upstream's Git repo.

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

7 years agoMerge pull request #18140 from liewegas/wip-21660-luminous
Sage Weil [Fri, 6 Oct 2017 12:38:53 +0000 (07:38 -0500)]
Merge pull request #18140 from liewegas/wip-21660-luminous

luminous: src/messages/MOSDMap: reencode OSDMap for older clients

7 years agoMerge pull request #18037 from ajarr/wip-21602-luminous
Sage Weil [Fri, 6 Oct 2017 03:12:22 +0000 (22:12 -0500)]
Merge pull request #18037 from ajarr/wip-21602-luminous

luminous: ceph_volume_client: add get, put, and delete object interfaces

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18103 from liewegas/wip-21259-luminous
Sage Weil [Fri, 6 Oct 2017 02:03:42 +0000 (21:03 -0500)]
Merge pull request #18103 from liewegas/wip-21259-luminous

luminous: osd: dump bluestore debug on shutdown if debug option is set

7 years agoMerge pull request #18112 from liewegas/wip-localpool-min-size-luminous
Sage Weil [Fri, 6 Oct 2017 02:03:28 +0000 (21:03 -0500)]
Merge pull request #18112 from liewegas/wip-localpool-min-size-luminous

luminous: mgr/localpool: fix min_size, 3x default, crush rule

Reviewed-by: Alexander Marangone <amarango@redhat.com>
7 years agoMerge pull request #18126 from smithfarm/wip-sigpipe-porting-luminous
Sage Weil [Fri, 6 Oct 2017 02:02:53 +0000 (21:02 -0500)]
Merge pull request #18126 from smithfarm/wip-sigpipe-porting-luminous

luminous: msg: reimplement sigpipe blocking

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18127 from liewegas/wip-21470-luminous
Sage Weil [Fri, 6 Oct 2017 02:02:09 +0000 (21:02 -0500)]
Merge pull request #18127 from liewegas/wip-21470-luminous

luminous: os/bluestore: fix another aio stall/deadlock

7 years agoMerge pull request #18128 from liewegas/wip-bluefs-allocation-luminous
Sage Weil [Fri, 6 Oct 2017 02:01:53 +0000 (21:01 -0500)]
Merge pull request #18128 from liewegas/wip-bluefs-allocation-luminous

luminous: os/bluestore: make bluefs behave better near enospc

7 years agoMerge pull request #18131 from liewegas/wip-ifname-luminous
Sage Weil [Fri, 6 Oct 2017 02:01:27 +0000 (21:01 -0500)]
Merge pull request #18131 from liewegas/wip-ifname-luminous

luminous: common/pick_address: add {public,cluster}_network_interface option

7 years agoMerge pull request #18132 from gregsfortytwo/wip-20416-bitwise-assert-luminous
Sage Weil [Fri, 6 Oct 2017 02:01:06 +0000 (21:01 -0500)]
Merge pull request #18132 from gregsfortytwo/wip-20416-bitwise-assert-luminous

osd: make the PG's SORTBITWISE assert a more generous shutdown

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agosrc/messages/MOSDMap: reencode OSDMap for older clients 18140/head
Sage Weil [Thu, 5 Oct 2017 20:26:16 +0000 (15:26 -0500)]
src/messages/MOSDMap: reencode OSDMap for older clients

We explicitly select which missing bits trigger a reencode.  We
already had jewel and earlier covered, but kraken includes all of
the previously mentioned bits but not SERVER_LUMINOUS.  This
prevents kraken clients from decoding luminous maps.

Fixes: http://tracker.ceph.com/issues/21660
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d2664aa34dc4c13da64d1ad187019737080069d7)

7 years agoos/bluestore: add bluestore_bluefs_min_free 18128/head
Sage Weil [Tue, 3 Oct 2017 16:18:17 +0000 (11:18 -0500)]
os/bluestore: add bluestore_bluefs_min_free

We need at least ~1GB free so we can write out new SSTs (which are 256MB
each).

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

(avoided 1_G syntax that luminous doesn't support)

7 years agocmake: disable VTA on options.cc 18135/head
Kefu Chai [Thu, 31 Aug 2017 10:15:28 +0000 (18:15 +0800)]
cmake: disable VTA on options.cc

to silence following warning and to avoid compiling this file twice:

ceph/src/common/options.cc: In function ‘std::vector<Option> get_global_options()’:
ceph/src/common/options.cc:151:21: note: variable tracking
size limit exceeded with -fvar-tracking-assignments, retrying without
 std::vector<Option> get_global_options() {
                     ^~~~~~~~~~~~~~~~~~

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

7 years agoosd/PG: separate event for RemoteReservationCanceled 18025/head
Sage Weil [Wed, 4 Oct 2017 20:28:26 +0000 (15:28 -0500)]
osd/PG: separate event for RemoteReservationCanceled

Right now we transparently map a RemoteReservationRejected into a
*Canceled event because this what peers send over the wire.  Even
once new peers start sending and explicit CANCEL, old peers will
still do so, so we'll maintain this mapping for a while.

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

7 years agoosd/PG: separate verb 'Reject' from passive 'rejected'
Sage Weil [Wed, 4 Oct 2017 19:55:15 +0000 (14:55 -0500)]
osd/PG: separate verb 'Reject' from passive 'rejected'

This reduces pg->reject_reservation() callsites from 2 to 1 and
makes the state transitions a bit more explicit.

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

7 years agoosd: make note about when we get MBackfillReserve REJECT messages
Sage Weil [Sun, 1 Oct 2017 20:05:40 +0000 (15:05 -0500)]
osd: make note about when we get MBackfillReserve REJECT messages

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

7 years agoosd/PG: handle RecoveryReservationRejected in RepWaitRecoveryReserved
Sage Weil [Sun, 1 Oct 2017 20:04:34 +0000 (15:04 -0500)]
osd/PG: handle RecoveryReservationRejected in RepWaitRecoveryReserved

This state is analogous to RepWaitBackfillReserved; just like we do there
we want to handle the REJECT from the primary by canceling our local
remote_reservation.

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

7 years agoosd/PG: ignore RemoteReservationRejected if we are RepNotRecoverying
Sage Weil [Sun, 1 Oct 2017 20:03:22 +0000 (15:03 -0500)]
osd/PG: ignore RemoteReservationRejected if we are RepNotRecoverying

The primary may send us a REJECT (meaning cancel) if recovery/backfill is
preempted there.  That can happen even if the recovery isn't reserved or
requested here (e.g., because the primary is still waiting for the local
reservation).  Just ignore it and remain in RepNotRecovering.

Fixes: http://tracker.ceph.com/issues/21613
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1ce235c5dd0b777223f6465e71fb7ee4befd13d8)

7 years agoosd/PG: cancel local reservation in RemoteReservationRejected handler
Sage Weil [Sun, 1 Oct 2017 20:01:05 +0000 (15:01 -0500)]
osd/PG: cancel local reservation in RemoteReservationRejected handler

We can get a RemoteReservationRejected event either because *we* decide
to reject, or because we get a REJECT from the primary that means "cancel"
(e.g., because recovery/backfill was preempted there).  In both cases we
want to cancel our remote_reservation.

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

7 years agoosd/PG: move reject_reservation out of RemoteReservationRejected reaction
Sage Weil [Sun, 1 Oct 2017 19:59:31 +0000 (14:59 -0500)]
osd/PG: move reject_reservation out of RemoteReservationRejected reaction

The RemoteReservationRejected event is also submitted when we are a
replica or backfill target and get a MBackfillReserve REJECT message
because the primary canceled or was preempted.  In that case, we don't
want to send a REJECT back to the primary; we only need to send it in the
cases where *we*, locally, decide to reject.  Move the call to those call
sites.

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

7 years agoosd: make the PG's SORTBITWISE assert a more generous shutdown 18132/head
Greg Farnum [Fri, 29 Sep 2017 22:18:26 +0000 (15:18 -0700)]
osd: make the PG's SORTBITWISE assert a more generous shutdown

We want to stop working if we get activated while sortbitwise is not set
on the cluster, but we might have old maps where it wasn't if the flag
was changed recently. And doing it in the PG code was a bit silly anyway.

Instead check SORTBITWISE in the main OSDMap handling code prior to
prepublishing it. Let it go through if we aren't active at the time.

Fixes: http://tracker.ceph.com/issues/20416
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0a691b2b1c19fbc30af5c4046736dacb2fb8bfa4)

7 years agocommon/pick_address: add {public,cluster}_network_interface option 18131/head
Sage Weil [Thu, 28 Sep 2017 21:47:17 +0000 (17:47 -0400)]
common/pick_address: add {public,cluster}_network_interface option

Add _interfaces option to constrain the choice of IPs in the network
list to those on interfaces matching the provided list of interface names.
The _interfaces options only work in concert with the _network options,
so you must also specify a list of networks if you want to use a specific
interface, e.g., by specifying a broad network like "::" or "0.0.0.0/0".

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

7 years agoos/bluestore/BlueFS: crash on enospc
Sage Weil [Tue, 3 Oct 2017 15:41:33 +0000 (10:41 -0500)]
os/bluestore/BlueFS: crash on enospc

We were passing this error back to rocksdb, which would then crash (much)
later with a corrupted SST file!  No good.

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

7 years agomsgr: add a mechanism for Solaris to avoid dying on SIGPIPE 18126/head
Greg Farnum [Tue, 3 Oct 2017 22:54:06 +0000 (15:54 -0700)]
msgr: add a mechanism for Solaris to avoid dying on SIGPIPE

This is fairly clean: we define an RAII object in the Messenger.h on
Solaris, and "declare" it with a macro in the implementations. There's
no code duplication and on Linux it's just entirely compiled out.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit cba20a95e816aaf9f0971b29b14b0be8c524b59d)

Conflicts:
    src/msg/async/PosixStack.cc - luminous #include "common/simple_spin.h" is
        missing in master (trivial resolution)

7 years agoos/bluestore: use normal Context for async deferred_try_submit 18127/head
Sage Weil [Tue, 3 Oct 2017 21:48:37 +0000 (16:48 -0500)]
os/bluestore: use normal Context for async deferred_try_submit

I'm not quite sure why the FunctionContext did not ever execute on the
finisher thread (perhaps the [&] captured some state on the stack that it
shouldn't have?).  In any case, using a traditional Context here appears
to resolve the problem (of the async deferred_try_submit() never executing,
leading to a bluestore stall/deadlock).

Fixes: http://tracker.ceph.com/issues/21470
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 67ec75805787ed63b35f8d70478a7a2cd785df06)

7 years agoos/bluestore: wake kv thread when blocking on deferred_bytes
Sage Weil [Fri, 29 Sep 2017 18:47:19 +0000 (13:47 -0500)]
os/bluestore: wake kv thread when blocking on deferred_bytes

We need to wake the kv thread whenever setting deferred_aggressive to
ensure that txns with deferred io that have committed but haven't submitted
their deferred writes get submitted.  This aligns us with the other
users of deferred_aggressive (e.g., _osr_drain_all).

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

7 years agoRevert "SIGPIPE suppression for platforms without SO_NOSIGPIPE or MSG_NOSIGNAL"
Greg Farnum [Tue, 3 Oct 2017 22:06:25 +0000 (15:06 -0700)]
Revert "SIGPIPE suppression for platforms without SO_NOSIGPIPE or MSG_NOSIGNAL"

This reverts commit 131deb39769c1187c334ee84f552d3be01f1751b. It added
code that shouldn't have entered the project repo.

Conflicts:
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h
src/msg/simple/Pipe.cc
src/msg/simple/Pipe.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 21bdb730932196a48407be0effab8813a78c4b1b)

7 years agomgr/localpool: fix rule selection 18112/head
Sage Weil [Wed, 4 Oct 2017 13:25:38 +0000 (08:25 -0500)]
mgr/localpool: fix rule selection

The 'osd pool create' arg parsing is broken; the rule name for
'ceph osd pool create $name $numpgs replicated $rulename' is passed
via the erasure_code_profile param.  Too many req=false options
without a way to disambiguate them.

Work around it by passing both 'rule' and 'erasure_code_profile'
keys, so that if/when the hack in OSDMonitor.cc is removed it will
still work.  Blech.

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

7 years agomgr/localpool: optionally adjust min_size too
Sage Weil [Mon, 2 Oct 2017 22:11:46 +0000 (17:11 -0500)]
mgr/localpool: optionally adjust min_size too

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

7 years agomgr/localpool: default to 3x
Sage Weil [Mon, 2 Oct 2017 22:11:38 +0000 (17:11 -0500)]
mgr/localpool: default to 3x

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

7 years agoosd: make shutdown debug conditional (and off by default) 18103/head
Sage Weil [Thu, 21 Sep 2017 19:19:47 +0000 (15:19 -0400)]
osd: make shutdown debug conditional (and off by default)

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

7 years agoosd: debug_bluestore on shutdown
Sage Weil [Thu, 7 Sep 2017 21:12:42 +0000 (17:12 -0400)]
osd: debug_bluestore on shutdown

...just like we do with filestore etc.

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

7 years agoos/bluestore: dump stray cache content on shutdown
Sage Weil [Thu, 7 Sep 2017 21:11:30 +0000 (17:11 -0400)]
os/bluestore: dump stray cache content on shutdown

Tracking down http://tracker.ceph.com/issues/21259.

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

7 years agoMerge pull request #17734 from liewegas/wip-21089-onmount
Sage Weil [Tue, 3 Oct 2017 18:41:21 +0000 (13:41 -0500)]
Merge pull request #17734 from liewegas/wip-21089-onmount

luminous: os/bluestore: replace 21089 repair with something online (instead of fsck)

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17814 from liewegas/wip-pg-limits-luminous
Sage Weil [Tue, 3 Oct 2017 18:40:56 +0000 (13:40 -0500)]
Merge pull request #17814 from liewegas/wip-pg-limits-luminous

luminous: mon: cluster limit on pgs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agodoc/rados/operations/health-checks: fix TOO_MANY_PGS discussion 17814/head
Sage Weil [Thu, 14 Sep 2017 20:01:14 +0000 (16:01 -0400)]
doc/rados/operations/health-checks: fix TOO_MANY_PGS discussion

Fiddling with pgp_num doesn't help with TOO_MANY_PGS.

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

7 years agomon: rename mon_pg_warn_max_per_osd -> mon_max_pg_per_osd
Sage Weil [Thu, 14 Sep 2017 20:00:31 +0000 (16:00 -0400)]
mon: rename mon_pg_warn_max_per_osd -> mon_max_pg_per_osd

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

7 years agorgw: dont reuse stale RGWObjectCtx for get_bucket_info() 17835/head
Casey Bodley [Fri, 22 Sep 2017 16:03:57 +0000 (12:03 -0400)]
rgw: dont reuse stale RGWObjectCtx for get_bucket_info()

if the earlier call to store->get_bucket_entrypoint_info() failed with
ENOENT, the obj_ctx will cache exists=false.
put_bucket_entrypoint_info() doesn't invalidate that, so this call to
get_bucket_info() was reading from a stale cache and failing with ENOENT

Fixes: http://tracker.ceph.com/issues/21506
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3f4f760a85f162262c5b419e9cf78966c7299f0a)

7 years agoos/bluestore: ignore 0x2000~2000 extent oddity from luminous upgrade 18050/head
Sage Weil [Wed, 20 Sep 2017 16:38:46 +0000 (12:38 -0400)]
os/bluestore: ignore 0x2000~2000 extent oddity from luminous upgrade

Luminous does a block_size granularity freelist, and assumes that
0~ROUND_UP_TO(SUPER_RESERVED,block_size) is used.  Current master uses
min_alloc_size granularity and changes that assumption to
0~ROUND_UP_TO(SUPER_RESERVED,min_alloc_size).  That means if master
fsck's a luminous-created bluestore, it will think 0x2000~2000 is used
(current baked-in min_alloc_size-based assumption) but the old freelist
says it is free (old mkfs assumption).  The disparity is harmless since
the extent is below min_alloc_size, so ignore it.

Fixes: http://tracker.ceph.com/issues/21408
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4959ad310a96208565b47c035ab5d5dded1b8ff5)

7 years agoMerge pull request #17867 from smithfarm/wip-21443-luminous
Sage Weil [Sun, 1 Oct 2017 20:56:10 +0000 (15:56 -0500)]
Merge pull request #17867 from smithfarm/wip-21443-luminous

luminous: mgr: Prometheus crash when update

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #17868 from smithfarm/wip-21452-luminous
Sage Weil [Sun, 1 Oct 2017 20:55:59 +0000 (15:55 -0500)]
Merge pull request #17868 from smithfarm/wip-21452-luminous

luminous: mgr: prometheus module generates invalid output when counter names contain non-alphanum characters

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #17896 from liewegas/wip-bluestore-tool-luminous
Sage Weil [Sun, 1 Oct 2017 20:55:30 +0000 (15:55 -0500)]
Merge pull request #17896 from liewegas/wip-bluestore-tool-luminous

ceph-objectstore-tool and ceph-bluestore-tool: backports from master

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #17930 from jcsp/wip-luminous-health-warn
Sage Weil [Sun, 1 Oct 2017 20:55:11 +0000 (15:55 -0500)]
Merge pull request #17930 from jcsp/wip-luminous-health-warn

mon: show legacy health warning in `status` output

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18031 from xiexingguo/wip-pr-17987
Sage Weil [Sun, 1 Oct 2017 20:54:47 +0000 (15:54 -0500)]
Merge pull request #18031 from xiexingguo/wip-pr-17987

luminous: osd/PrimaryLogPG: kick off recovery on backoffing a degraded object

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18033 from xiexingguo/wip-pr-17698
Sage Weil [Sun, 1 Oct 2017 20:54:17 +0000 (15:54 -0500)]
Merge pull request #18033 from xiexingguo/wip-pr-17698

luminous: os/bluestore: allocate entire write in one go

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18038 from jecluis/wip-21300-luminous
Sage Weil [Sun, 1 Oct 2017 20:53:56 +0000 (15:53 -0500)]
Merge pull request #18038 from jecluis/wip-21300-luminous

luminous: mon/MgrMonitor: handle cmd descs to/from disk in the absence of active mgr

8 years agoos/bluestore: use min_alloc_size for freelist resolution
Sage Weil [Fri, 8 Sep 2017 22:08:51 +0000 (18:08 -0400)]
os/bluestore: use min_alloc_size for freelist resolution

For HDD with min_alloc_size=64k, this is a 16x reduction in allocation
metadata!

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

Conflicts:
Slightly conflict with 834542c4027a8cc4d23eff089827d328919372d2, which
drops the literal description of apply().

8 years agoos/bluestore: align bluefs_extents to min_alloc_size
Sage Weil [Fri, 8 Sep 2017 22:08:07 +0000 (18:08 -0400)]
os/bluestore: align bluefs_extents to min_alloc_size

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

8 years agoos/bluestore/FreelistManager: create: accept min alloc size
Sage Weil [Fri, 8 Sep 2017 22:07:38 +0000 (18:07 -0400)]
os/bluestore/FreelistManager: create: accept min alloc size

Accept a block size other than bdev_block_size.  Let's call it, oh, I don't
know, min_alloc_size.

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

8 years agoos/bluestore: mkfs: choose min_alloc_size earlier
Sage Weil [Fri, 8 Sep 2017 22:06:05 +0000 (18:06 -0400)]
os/bluestore: mkfs: choose min_alloc_size earlier

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