]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoceph-volume: is_mounted should use a bytes->string util to compare strings 16970/head
Alfredo Deza [Thu, 10 Aug 2017 13:11:58 +0000 (09:11 -0400)]
ceph-volume: is_mounted should use a bytes->string util to compare strings

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

7 years agoceph-volume: create a utf-8 string decoder for py3 compat
Alfredo Deza [Thu, 10 Aug 2017 13:11:27 +0000 (09:11 -0400)]
ceph-volume: create a utf-8 string decoder for py3 compat

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

7 years agoceph-volume: tests add tests for the is_mounted utility
Alfredo Deza [Wed, 9 Aug 2017 19:56:53 +0000 (15:56 -0400)]
ceph-volume: tests add tests for the is_mounted utility

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

7 years agoceph-volume: lvm activate should check if the device is mounted to prevent errors...
Alfredo Deza [Wed, 9 Aug 2017 19:24:15 +0000 (15:24 -0400)]
ceph-volume: lvm activate should check if the device is mounted to prevent errors from mount

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

7 years agoceph-volume util add a helper to check if a device is mounted
Alfredo Deza [Wed, 9 Aug 2017 19:10:18 +0000 (15:10 -0400)]
ceph-volume util add a helper to check if a device is mounted

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

7 years agoceph-volume: lvm activate should not ignore exit status codes
Alfredo Deza [Wed, 9 Aug 2017 12:20:33 +0000 (08:20 -0400)]
ceph-volume: lvm activate should not ignore exit status codes

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

7 years agoceph-volume: remove unused config from vagrant_variables.yml files
Andrew Schoen [Tue, 8 Aug 2017 17:43:53 +0000 (12:43 -0500)]
ceph-volume: remove unused config from vagrant_variables.yml files

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 855ce630695ed9ca53c314b7e261ec3cc499787d)

7 years agoceph-volume: adds CEPH_VOLUME_DEBUG=1 to functional tests
Andrew Schoen [Tue, 8 Aug 2017 17:24:41 +0000 (12:24 -0500)]
ceph-volume: adds CEPH_VOLUME_DEBUG=1 to functional tests

This will show us tracebacks if ceph-volume fails

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 5a90f4c577bf371a36bf602dc8ea01663aaffe00)

7 years agoceph-volume: add placeholders for prepare_activate testing in tox.ini
Andrew Schoen [Tue, 8 Aug 2017 17:05:40 +0000 (12:05 -0500)]
ceph-volume: add placeholders for prepare_activate testing in tox.ini

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 852a94734f69bfb5544e2d3af34b9e71057df851)

7 years agoceph-volume: adds the xenial distro factor
Andrew Schoen [Tue, 8 Aug 2017 16:44:22 +0000 (11:44 -0500)]
ceph-volume: adds the xenial distro factor

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 1b4275417d457e56eb0c3ac07597447cad7737ae)

7 years agoceph-volume: create a centos7 factor for functional testing
Andrew Schoen [Tue, 8 Aug 2017 16:41:15 +0000 (11:41 -0500)]
ceph-volume: create a centos7 factor for functional testing

We want to run these tests on multiple distros so this change sets the
foundation for that.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit c8e3be6faed1c062826117bc1355b7b752c01bd4)

7 years agoceph-volume: vagrantfile runs storagectl once
Alfredo Deza [Tue, 8 Aug 2017 15:07:02 +0000 (11:07 -0400)]
ceph-volume: vagrantfile runs storagectl once

It assumes that if there is a disk left it has already run. This avoids
issues when reloading/restarting machines with vagrant.

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

7 years agoceph-volume: setup nodes for testinfra testing
Andrew Schoen [Tue, 8 Aug 2017 15:16:12 +0000 (10:16 -0500)]
ceph-volume: setup nodes for testinfra testing

This uses the playbook that exists in ceph-ansible to prepare the nodes for
testing by installing net-tools.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 97b216fdd1657b34db93b264ce814a8f72434d7b)

7 years agoceph-volume: tox define vagrant cwd
Alfredo Deza [Mon, 7 Aug 2017 20:34:22 +0000 (16:34 -0400)]
ceph-volume: tox define vagrant cwd

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

7 years agoceph-volume: adds a functional testing scenario for lvm create
Andrew Schoen [Fri, 4 Aug 2017 15:40:39 +0000 (10:40 -0500)]
ceph-volume: adds a functional testing scenario for lvm create

This setups up the basic test harness and adds a test for the create
subcommand. The test uses ceph-ansible to deploy a cluster using
``ceph-volume lvm create``, tests the cluster state using the
ceph-ansible test suite, reboots the nodes and then tests again.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 750d9f4125783b29a7af44acb2c3caa43bee707a)

7 years agoRevert "qa/suites/upgrade/jewel-x/parallel: thrash layout"
Sage Weil [Thu, 10 Aug 2017 13:50:54 +0000 (09:50 -0400)]
Revert "qa/suites/upgrade/jewel-x/parallel: thrash layout"

This reverts commit cabd44af3503c368160fef7e56b637dfbf0e9921.  This test
combinatoin is not yet stable.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tasks/ceph.py: tolerate flush pg stats exception
Sage Weil [Tue, 8 Aug 2017 16:08:31 +0000 (12:08 -0400)]
qa/tasks/ceph.py: tolerate flush pg stats exception

If the OSD doesn't see IO, it won't flush more pg/osd stats when the
luminous flag is not yet set (legacy pgmonitor mode).

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

7 years agoqa/suites/upgrade/jewel-x/parallel: thrash layout
Sage Weil [Wed, 9 Aug 2017 20:40:43 +0000 (16:40 -0400)]
qa/suites/upgrade/jewel-x/parallel: thrash layout

We can't kill and restart osds because that will interfere with
the upgrade process.  We can, however, thrash the layout by
tweaking osd weights and so on.  This will exercise osd recovery
paths during the upgrade that aren't normally exercised (outside
of stress-split..which doesn't upgrade individual osds while they
are non-clean).

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

7 years agoosd/PG: force rebuild of missing set on jewel upgrade
Sage Weil [Wed, 9 Aug 2017 16:50:57 +0000 (12:50 -0400)]
osd/PG: force rebuild of missing set on jewel upgrade

Previously we were detecting the need to rebuild missing based on
whether the "divergent_priors" omap key was present.  Unfortunately,
jewel does not always set this, so it is not a reliable indicator.
(It only gets set if you actually have a divergent prior at some
point in the PG's life time on that OSD.)

Fix by using the info_struct_v on the PG to detect whether we need
to do the conversion.  We didn't bump the value when we adding
the missing persistence, but the fastinfo was also added during
the same period between jewel and kraken, so it will work just as
well.

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

7 years agoMerge pull request #16922 from ivancich/luminous-16755
Gregory Farnum [Wed, 9 Aug 2017 18:29:00 +0000 (11:29 -0700)]
Merge pull request #16922 from ivancich/luminous-16755

Merge pull request #16755 from ivancich/wip-pull-new-dmclock

7 years agomon/OSDMonitor: implement 'osd crush ls <node>'
Sage Weil [Tue, 8 Aug 2017 19:56:18 +0000 (15:56 -0400)]
mon/OSDMonitor: implement 'osd crush ls <node>'

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

7 years agoqa/suites/upgarde/jewel-x/point-to-point-x: disable app warnings
Sage Weil [Wed, 9 Aug 2017 13:18:54 +0000 (09:18 -0400)]
qa/suites/upgarde/jewel-x/point-to-point-x: disable app warnings

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

7 years agoMerge pull request #16948 from dillaman/wip-32bit-compat-fixes-luminous
Jason Dillaman [Wed, 9 Aug 2017 16:27:13 +0000 (12:27 -0400)]
Merge pull request #16948 from dillaman/wip-32bit-compat-fixes-luminous

luminous: rbd-mirror: align use of uint64_t in service_daemon::AttributeType

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoAlign use of uint64_t in service_daemon::AttributeType 16948/head
James Page [Wed, 9 Aug 2017 09:04:37 +0000 (10:04 +0100)]
Align use of uint64_t in service_daemon::AttributeType

size_t on a 32-bit architecture is a 32 bit unsigned int which
created ambiguity when casting to bool, uint64_t or std::string
(which are boost::variants for service_daemon::AttributeType).

Align to use of uint64_t to resolve compilation failures in
all 32-bit architectures.

Signed-off-by: James Page <james.page@ubuntu.com>
(cherry picked from commit 87fe8e81bc8c9b55c6bef4144714a33e042dc2f7)

7 years agoMerge pull request #16946 from trociny/wip-20954-luminous
Jason Dillaman [Wed, 9 Aug 2017 14:32:51 +0000 (10:32 -0400)]
Merge pull request #16946 from trociny/wip-20954-luminous

luminous: qa/workunits/rbd: use command line option to specify watcher asok

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/rbd: use command line option to specify watcher asok 16946/head
Mykola Golub [Tue, 8 Aug 2017 18:50:47 +0000 (20:50 +0200)]
qa/workunits/rbd: use command line option to specify watcher asok

The previous method to get the watcher admin socket was fragile
and had started to fail after the recent changes to vstart ceph.conf.

Fixes: http://tracker.ceph.com/issues/20954
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 6a575136a76b9e291c0948e1179f33a2f73853fb)

7 years agoMerge pull request #16943 from theanalyst/wip-luminous-16889
Abhishek L [Wed, 9 Aug 2017 14:03:57 +0000 (16:03 +0200)]
Merge pull request #16943 from theanalyst/wip-luminous-16889

luminous: rgw: Use namespace for lc_pool and roles_pool

Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Reviewed-By: Matt Benjamin <mbenjamin@redhat.com>
7 years agorgw: use namespace for roles pool 16943/head
Orit Wasserman [Tue, 8 Aug 2017 08:24:06 +0000 (11:24 +0300)]
rgw:  use namespace for roles pool

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 4c378ffbbd984d4c7985415ea067661b7b3a2e98)

7 years agorgw: initialize lc pool as namespace
Orit Wasserman [Tue, 8 Aug 2017 08:22:42 +0000 (11:22 +0300)]
rgw: initialize lc pool as namespace

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Fixes: http://tracker.ceph.com/issues/20177
(cherry picked from commit 39d76cad38272b8f6db79bdb51a054fa41189b41)

7 years agoRevert "os/bluestore: allow multiple DeferredBatches in flight at once"
Sage Weil [Tue, 8 Aug 2017 13:23:31 +0000 (09:23 -0400)]
Revert "os/bluestore: allow multiple DeferredBatches in flight at once"

This reverts commit ca32d575eb2673737198a63643d5d1923151eba3.

If we have multiple batches in flight then we have to worry about writes
to the same blocks reordering.

Also, 3c6a6c46d5808d6c42ed4dcfb441bad64366686b is sufficient to avoid the
stall/deadlock in http://tracker.ceph.com/issues/20295.

# Conflicts:
# src/os/bluestore/BlueStore.cc

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

7 years agomon: add mon_health_preluminous_compat_warning
Sage Weil [Tue, 8 Aug 2017 14:28:10 +0000 (10:28 -0400)]
mon: add mon_health_preluminous_compat_warning

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

7 years agoosd: downgrade (ok) PG scrub messages to debug
John Spray [Tue, 8 Aug 2017 18:53:11 +0000 (19:53 +0100)]
osd: downgrade (ok) PG scrub messages to debug

Otherwise someone watching the log at INFO level gets
pelted with potentially millions of log messages
while the system is scrubbing.

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

7 years agomon: downgrade "scrub ok" message to debug.
John Spray [Tue, 8 Aug 2017 18:36:03 +0000 (19:36 +0100)]
mon: downgrade "scrub ok" message to debug.

This hides lines like:
[INF]  scrub ok on 0,1,2: ScrubResult(keys {pgmap_pg=13} crc {pgmap_pg=2458062599})

from the normal cluster log views.

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

7 years agoMerge pull request #16921 from dillaman/wip-rbd-ls-luminous
Jason Dillaman [Wed, 9 Aug 2017 01:19:25 +0000 (21:19 -0400)]
Merge pull request #16921 from dillaman/wip-rbd-ls-luminous

luminous: rbd: parallelize rbd ls -l

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #16755 from ivancich/wip-pull-new-dmclock 16922/head
Gregory Farnum [Tue, 8 Aug 2017 21:27:28 +0000 (14:27 -0700)]
Merge pull request #16755 from ivancich/wip-pull-new-dmclock

osd: bring in dmclock library changes

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 25f1edefbf21f17f5501d9894f0c4979c04b3f08)

7 years agorbd: parallelize rbd ls -l 16921/head
Piotr Dałek [Wed, 7 Jun 2017 14:01:37 +0000 (16:01 +0200)]
rbd: parallelize rbd ls -l

When a cluster contains a large number of images, "rbd ls -l" takes a
long time to finish. In my particular case, it took about 58s to
process 3000 images.
"rbd ls -l" opens each of image and that takes majority of time, so
improve this by using aio_open() and aio_close() to do it
asynchronously. This reduced total processing time down to around 15
seconds when using default 10 concurrently opened images.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
(cherry picked from commit 8f76fc861b0a628fa2269b04f77b7e31d4a7a006)

7 years agoMerge pull request #16914 from theanalyst/wip-16734
Abhishek L [Tue, 8 Aug 2017 18:53:40 +0000 (20:53 +0200)]
Merge pull request #16914 from theanalyst/wip-16734

luminous: rgw_lc: support for AWSv4 authentication

Reviewed-By: Daniel Gryniewicz <dang@redhat.com>
Reviewed-By: Radoslaw Zarzynski <rzarzynski@redhat.com>
Reviewed-By: Matt Benjamin <mbenjami@redhat.com>
7 years agorgw_lc: support for AWSv4 authentication 16914/head
Abhishek Lekshmanan [Tue, 1 Aug 2017 15:42:31 +0000 (17:42 +0200)]
rgw_lc: support for AWSv4 authentication

adding support for AWSv4 authentication for Put Object LC, also adding
types to all of the LC ops in the process

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit cc51f32c22f294f59b369350e54b86892015cbab)

7 years agoMerge pull request #16912 from dillaman/wip-20701-luminous
Jason Dillaman [Tue, 8 Aug 2017 17:52:46 +0000 (13:52 -0400)]
Merge pull request #16912 from dillaman/wip-20701-luminous

luminous: doc: update rbd-mirroring documentation

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc/release-notes: indicate that rbd-mirror should use unique IDs 16912/head
Jason Dillaman [Tue, 8 Aug 2017 16:46:56 +0000 (12:46 -0400)]
doc/release-notes: indicate that rbd-mirror should use unique IDs

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

7 years agodoc: updated rbd-mirror daemon instructions
Jason Dillaman [Tue, 8 Aug 2017 16:43:32 +0000 (12:43 -0400)]
doc: updated rbd-mirror daemon instructions

Fixes: http://tracker.ceph.com/issues/20701
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b7ba3f68c3baf5ad8b0b307afcf2bfbfa18d597c)

7 years agodoc: re-ordered rbd table of contents
Jason Dillaman [Tue, 8 Aug 2017 15:53:42 +0000 (11:53 -0400)]
doc: re-ordered rbd table of contents

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

7 years agoMerge pull request #16875 from dillaman/wip-lirbd-group-luminous
Jason Dillaman [Tue, 8 Aug 2017 16:57:24 +0000 (12:57 -0400)]
Merge pull request #16875 from dillaman/wip-lirbd-group-luminous

luminous: librbd: remove consistency group rbd cli and API support

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge PR #16378 into HEAD
Patrick Donnelly [Tue, 8 Aug 2017 16:40:27 +0000 (09:40 -0700)]
Merge PR #16378 into HEAD

* refs/remotes/upstream/pull/16378/head:
doc: remove accidental additions to release notes
qa/cephfs: Fix race in test_volume_client
qa/cephfs: Test filtered df
PendingReleaseNotes: add note about df filtering
client: Support new, filtered MStatfs
objecter: Support new, filtered MStatfs
mon/PGMap stats: Support new, filtered MStatfs
messages: Add optional data pool to MStatfs

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: remove accidental additions to release notes 16378/head
Patrick Donnelly [Tue, 8 Aug 2017 16:28:57 +0000 (09:28 -0700)]
doc: remove accidental additions to release notes

Presumably this was caused by a bad rebase.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #16903 from dillaman/wip-16877-luminous
Jason Dillaman [Tue, 8 Aug 2017 15:23:49 +0000 (11:23 -0400)]
Merge pull request #16903 from dillaman/wip-16877-luminous

luminous: test/librbd: fix race condition with OSD map refresh

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agotest/librbd: fix race condition with OSD map refresh 16903/head
Jason Dillaman [Mon, 7 Aug 2017 18:29:07 +0000 (14:29 -0400)]
test/librbd: fix race condition with OSD map refresh

Fixes: http://tracker.ceph.com/issues/20918
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5c29664434c6e9e2f72aa4b02b369613250694e8)

7 years agoMerge pull request #16899 from dillaman/wip-20941-luminous
Jason Dillaman [Tue, 8 Aug 2017 13:58:28 +0000 (09:58 -0400)]
Merge pull request #16899 from dillaman/wip-20941-luminous

luminous: librbd: default localize parent reads to false

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge pull request #16895 from dillaman/wip-15339-luminous
Jason Dillaman [Tue, 8 Aug 2017 13:28:32 +0000 (09:28 -0400)]
Merge pull request #16895 from dillaman/wip-15339-luminous

luminous: rbd-ggate: tool to map images on FreeBSD via GEOM Gate

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agolibrbd: default localize parent reads to false 16899/head
Jason Dillaman [Mon, 7 Aug 2017 21:44:30 +0000 (17:44 -0400)]
librbd: default localize parent reads to false

Fixes: http://tracker.ceph.com/issues/20941
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit cfc3d4603668e23232c2f0b9af6fd838040f47ec)

7 years agotest: add wrapper to run rbd-ggate test on FreeBSD 16895/head
Mykola Golub [Sun, 6 Aug 2017 14:27:22 +0000 (16:27 +0200)]
test: add wrapper to run rbd-ggate test on FreeBSD

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
7 years agorbd-ggate: tool to map images on FreeBSD via GEOM Gate
Mykola Golub [Sun, 14 May 2017 09:00:24 +0000 (09:00 +0000)]
rbd-ggate: tool to map images on FreeBSD via GEOM Gate

rbd-ggate spawns a process responsible for the creation of ggate
device and forwarding I/O requests between the GEOM Gate kernel
subsystem and RADOS.

On FreeBSD it provides functionality similar to rbd-nbd on Linux.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
7 years agorgw: Fix the last policy use-after-free
Adam C. Emerson [Mon, 7 Aug 2017 21:46:38 +0000 (17:46 -0400)]
rgw: Fix the last policy use-after-free

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 5353d952683a5a13a681c594e119b570bfdc3c39)

7 years agorgw: Fix another use after free
Adam C. Emerson [Mon, 7 Aug 2017 21:27:53 +0000 (17:27 -0400)]
rgw: Fix another use after free

This one was caused by iterator invalidation in set operations. In
this case just replace the set entirely with a bitfield.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 97d026dde679cabf1aaf026be3f08bfef63c140f)

7 years agorgw: Fix use after free in IAM policy parser
Adam C. Emerson [Mon, 24 Jul 2017 20:10:11 +0000 (16:10 -0400)]
rgw: Fix use after free in IAM policy parser

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 8377ba6525de5ebfe33a7dda14f17d96e8ac4ef4)

7 years agoqa/suites/upgrade/kraken-x/stress-split*: whitelist
Sage Weil [Mon, 7 Aug 2017 20:02:33 +0000 (16:02 -0400)]
qa/suites/upgrade/kraken-x/stress-split*: whitelist

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

7 years agoqa/suites/upgrade/kraken-x/parallel: whitelist
Sage Weil [Mon, 7 Aug 2017 19:57:55 +0000 (15:57 -0400)]
qa/suites/upgrade/kraken-x/parallel: whitelist

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

7 years agoqa/suites/upgrade/jewel-x/parallel: fix POOL_APP_NOT_ENABLED disable
Sage Weil [Mon, 7 Aug 2017 13:49:55 +0000 (09:49 -0400)]
qa/suites/upgrade/jewel-x/parallel: fix POOL_APP_NOT_ENABLED disable

This code runs on the mgr.

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

7 years agomon/MonCommands: mark 'pg force_create_pg' deprecated
Sage Weil [Sat, 5 Aug 2017 19:33:37 +0000 (15:33 -0400)]
mon/MonCommands: mark 'pg force_create_pg' deprecated

It's deprecated.

Also, this avoids a dup when we have an upgrading mon cluster
and it's also in PGMonitorCommands.

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

7 years agomon: include PGMonitor commands with mixed-version mons
Sage Weil [Sat, 5 Aug 2017 19:30:15 +0000 (15:30 -0400)]
mon: include PGMonitor commands with mixed-version mons

While we have a mixed version cluster, we have to advertise our
PGMonitor commands to our peons or else commands like 'pg dump'
won't work.

Once the mon feature flag is set, we can drop that because each
mon will include the mgr commands (either those stored in paxos
or the statically compiled ones until that point).

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

7 years agomon: use vector<MonCommand> throughput for commands
Sage Weil [Sat, 5 Aug 2017 19:08:26 +0000 (15:08 -0400)]
mon: use vector<MonCommand> throughput for commands

The old code was pretty messy. This is standardizes on std::vector
throughout.  We also drop the win_election command args because
when we win an election we always set the leader commands to our
commands, and we can do that inside win_command() without passing
them in from here.

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

7 years agoMerge pull request #16878 from dillaman/wip-rbd-mirror-image-ids-luminous
Jason Dillaman [Mon, 7 Aug 2017 19:57:11 +0000 (15:57 -0400)]
Merge pull request #16878 from dillaman/wip-rbd-mirror-image-ids-luminous

luminous: rbd-mirror: simplify notifications for image assignment

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
7 years agorbd-mirror: clean up logging during test shut down 16878/head
Jason Dillaman [Mon, 31 Jul 2017 12:37:38 +0000 (08:37 -0400)]
rbd-mirror: clean up logging during test shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: avoid silently failing to register image replayer admin sockets
Jason Dillaman [Thu, 27 Jul 2017 19:35:15 +0000 (15:35 -0400)]
rbd-mirror: avoid silently failing to register image replayer admin sockets

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: restore deletion propagation and image replayer cleanup
Jason Dillaman [Fri, 21 Jul 2017 15:18:46 +0000 (11:18 -0400)]
rbd-mirror: restore deletion propagation and image replayer cleanup

The previous intermediate commits removed handling for deletion
propagation and image replayer cleanup since this logic has been
moved from instance to image replayer. Note that eventually the
policy's release notification will be responsible for the cleanup
of image replayers.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: ensure threads are mockable for testing
Jason Dillaman [Fri, 21 Jul 2017 19:40:03 +0000 (15:40 -0400)]
rbd-mirror: ensure threads are mockable for testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: moved wait for deletion logic within image replayer
Jason Dillaman [Fri, 21 Jul 2017 20:12:13 +0000 (16:12 -0400)]
rbd-mirror: moved wait for deletion logic within image replayer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: simplified acquire/release notification messages
Jason Dillaman [Thu, 20 Jul 2017 20:30:42 +0000 (16:30 -0400)]
rbd-mirror: simplified acquire/release notification messages

The other instances should already know about the possible peers, so
we can co-opt these messages for use by the policy mapper.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: co-opt image acquire/release notifications
Jason Dillaman [Thu, 20 Jul 2017 20:39:51 +0000 (16:39 -0400)]
rbd-mirror: co-opt image acquire/release notifications

This notifications will now be used by the policy when a (re)map is
required.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: new 'peer image removed' notification to instance watchers
Jason Dillaman [Thu, 20 Jul 2017 20:10:39 +0000 (16:10 -0400)]
rbd-mirror: new 'peer image removed' notification to instance watchers

Note: this commit intentionally breaks backwards compatibility with
Luminous RC instance watcher notifications.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: simplify resync handling within image replayer
Jason Dillaman [Wed, 19 Jul 2017 20:18:23 +0000 (16:18 -0400)]
rbd-mirror: simplify resync handling within image replayer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: pre-register image id before creating image
Jason Dillaman [Wed, 19 Jul 2017 20:13:23 +0000 (16:13 -0400)]
rbd-mirror: pre-register image id before creating image

This fixes a potential race condition that could occur previously
if rbd-mirror daemon failed between creating an image and recording
the image id to the remote journal.

Fixes: http://tracker.ceph.com/issues/15764
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: clean up bootstrap recovery from missing local image
Jason Dillaman [Wed, 19 Jul 2017 18:24:36 +0000 (14:24 -0400)]
rbd-mirror: clean up bootstrap recovery from missing local image

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: image replayer should query remote mirror uuid / image id
Jason Dillaman [Wed, 19 Jul 2017 16:20:34 +0000 (12:20 -0400)]
rbd-mirror: image replayer should query remote mirror uuid / image id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: helper state machine for querying remote peer uuid / image id
Jason Dillaman [Fri, 21 Jul 2017 00:17:23 +0000 (20:17 -0400)]
rbd-mirror: helper state machine for querying remote peer uuid / image id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: helper state machine for retrieving image id from global id
Jason Dillaman [Wed, 19 Jul 2017 14:14:14 +0000 (10:14 -0400)]
rbd-mirror: helper state machine for retrieving image id from global id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: remove consistency group rbd cli and API support 16875/head
Jason Dillaman [Tue, 13 Dec 2016 20:58:42 +0000 (15:58 -0500)]
librbd: remove consistency group rbd cli and API support

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/clusters/fixed-[23]: 4 osds per node, not 3
Sage Weil [Thu, 3 Aug 2017 18:28:56 +0000 (14:28 -0400)]
qa/clusters/fixed-[23]: 4 osds per node, not 3

Smithi have 4 nvme partitions available for use.

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

7 years agoqa/suites: change fixed-2.yaml users to get 4 openstack disks
Sage Weil [Mon, 7 Aug 2017 15:56:20 +0000 (11:56 -0400)]
qa/suites: change fixed-2.yaml users to get 4 openstack disks

Follow-up for 4203c4f88785d8149235dd34d37f87e471084d71

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

7 years agoqa: big: add openstack.yaml
Nathan Cutler [Mon, 7 Aug 2017 10:07:36 +0000 (12:07 +0200)]
qa: big: add openstack.yaml

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

7 years agoqa/clusters/fixed-2: 4 osds per node, not 3
Sage Weil [Sat, 5 Aug 2017 18:34:27 +0000 (14:34 -0400)]
qa/clusters/fixed-2: 4 osds per node, not 3

We need this for the thrashing with ec k=2 m=2 pools.

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

7 years agoqa/suites/rados/thrash/workloads/cache-agent-big: m=2
Sage Weil [Sat, 5 Aug 2017 18:33:13 +0000 (14:33 -0400)]
qa/suites/rados/thrash/workloads/cache-agent-big: m=2

...because we do the test_map_discontinuity thing.

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

7 years agocrush/CrushWrapper: fix out of bounds access
Sage Weil [Mon, 7 Aug 2017 13:36:54 +0000 (09:36 -0400)]
crush/CrushWrapper: fix out of bounds access

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

7 years agoMerge pull request #16845 from amitkumar50/cov-librados-aio
Jos Collin [Mon, 7 Aug 2017 14:51:13 +0000 (14:51 +0000)]
Merge pull request #16845 from amitkumar50/cov-librados-aio

test/librados: Initialize member variables in aio.cc

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agotest/librados: Initializing left members from aio.cc 16845/head
amitkuma [Sun, 6 Aug 2017 16:43:36 +0000 (22:13 +0530)]
test/librados: Initializing left members from aio.cc

Fixes the coverity Issue:

** 1322815 Uninitialized pointer field
CID 1322815 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member m_sem is not initialized
in this constructor nor in any functions that it calls.

** 1322816 Uninitialized pointer field
CID 1322816 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member m_sem is not initialized
in this constructor nor in any functions that it calls.

** 1322817 Uninitialized pointer field
CID 1322817 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member m_sem is not initialized
in this constructor nor in any functions that it calls.

Signed-off-by: Amit Kumar amitkuma@redhat.com
7 years agoMerge pull request #16393 from PCzhangPC/fix3
Jason Dillaman [Mon, 7 Aug 2017 14:03:20 +0000 (10:03 -0400)]
Merge pull request #16393 from PCzhangPC/fix3

rbd: 'image-meta remove' for missing key does not return error

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #16851 from xiexingguo/wip-doc-update-class-cli
Sage Weil [Mon, 7 Aug 2017 13:26:35 +0000 (08:26 -0500)]
Merge pull request #16851 from xiexingguo/wip-doc-update-class-cli

doc/release-notes: update device class cli

7 years agoMerge pull request #16551 from fangyuxiangGL/data-notifier-interval
Yuri Weinstein [Mon, 7 Aug 2017 12:48:54 +0000 (05:48 -0700)]
Merge pull request #16551 from fangyuxiangGL/data-notifier-interval

rgw: add a separate configuration for data notify interval

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16726 from theanalyst/rgw-crypt-debug-log
Yuri Weinstein [Mon, 7 Aug 2017 12:48:14 +0000 (05:48 -0700)]
Merge pull request #16726 from theanalyst/rgw-crypt-debug-log

rgw_crypt: log error messages during failures

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@mirantis.com>
7 years agoMerge pull request #16770 from tianshan/fix_create_bucket
Yuri Weinstein [Mon, 7 Aug 2017 12:45:52 +0000 (05:45 -0700)]
Merge pull request #16770 from tianshan/fix_create_bucket

rgw: should not restrict location_constraint same when user not provide

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16862 from scienceluo/wip-luo-check-fix-branch
Jos Collin [Mon, 7 Aug 2017 09:30:48 +0000 (09:30 +0000)]
Merge pull request #16862 from scienceluo/wip-luo-check-fix-branch

common/cmdparse.cc: remove unused variable 'argnum' in dump_cmd_to_json()

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoCommon: remove variable 'argnum' that is modified but its new value is never used. 16862/head
Luo Kexue [Mon, 7 Aug 2017 08:21:16 +0000 (16:21 +0800)]
Common: remove variable 'argnum' that is modified but its new value is never used.

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
7 years agodoc/release-notes: update device class cli 16851/head
xie xingguo [Mon, 7 Aug 2017 02:04:35 +0000 (10:04 +0800)]
doc/release-notes: update device class cli

These commands are nearly stable and are unlikely to change for now...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16847 from amitkumar50/cov-1054870
Jos Collin [Mon, 7 Aug 2017 04:01:36 +0000 (04:01 +0000)]
Merge pull request #16847 from amitkumar50/cov-1054870

rgw: Initialize of member variable admin_specified in RGWUserAdminOpState

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16822 from liewegas/wip-20849
Sage Weil [Mon, 7 Aug 2017 02:43:22 +0000 (21:43 -0500)]
Merge pull request #16822 from liewegas/wip-20849

os/bluestore: _do_remove: dirty shard individually as each blob is unshared

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16844 from xiexingguo/wip-bluestore-core
Sage Weil [Mon, 7 Aug 2017 01:17:57 +0000 (20:17 -0500)]
Merge pull request #16844 from xiexingguo/wip-bluestore-core

os/bluestore: default journal media to store media if bluefs is disabled

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #14053 from jdurgin/wip-19191
Sage Weil [Sun, 6 Aug 2017 19:08:34 +0000 (14:08 -0500)]
Merge pull request #14053 from jdurgin/wip-19191

osd/PG: reset the missing set when restarting backfill

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16837 from xiexingguo/wip-still-more-class-fixes
Sage Weil [Sun, 6 Aug 2017 19:07:33 +0000 (14:07 -0500)]
Merge pull request #16837 from xiexingguo/wip-still-more-class-fixes

crush: more class fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16838 from xiexingguo/wip-fix-purge
Sage Weil [Sun, 6 Aug 2017 19:07:15 +0000 (14:07 -0500)]
Merge pull request #16838 from xiexingguo/wip-fix-purge

mon/OSDMonitor: sanity check osd before performing 'osd purge'

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16832 from liewegas/wip-20915
Sage Weil [Sun, 6 Aug 2017 18:41:21 +0000 (13:41 -0500)]
Merge pull request #16832 from liewegas/wip-20915

rpm,deb: fix ceph-volume

Reviewed-by: Nathan Cutler <ncutler@suse.com>