]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agocommon: add templated Context factory
Patrick Donnelly [Sun, 29 Jul 2018 01:12:13 +0000 (18:12 -0700)]
common: add templated Context factory

For use to create Contexts only when needed.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomsg: add const version of get_payload
Patrick Donnelly [Sun, 29 Jul 2018 01:11:44 +0000 (18:11 -0700)]
msg: add const version of get_payload

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomsg: use queue of messages for dispatch
Patrick Donnelly [Sun, 29 Jul 2018 16:33:41 +0000 (09:33 -0700)]
msg: use queue of messages for dispatch

This avoids an allocation for each new message (amortized via deque).

Additionally, use std::move to avoid atomic update to the Message ref.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomsg: dispatch intrusive_ptr Messages
Patrick Donnelly [Sun, 29 Jul 2018 19:27:04 +0000 (12:27 -0700)]
msg: dispatch intrusive_ptr Messages

This codifies the giving of a reference to the Dispatcher and helps avoid
memory leaks. Old-style dispatch is kept to allow older code to continue
working.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomsg: use deque for dispatcher pointers
Patrick Donnelly [Sun, 29 Jul 2018 19:18:09 +0000 (12:18 -0700)]
msg: use deque for dispatcher pointers

To improve cache locality.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23564 from falcon78921/wip-docs-links-1
Kefu Chai [Wed, 15 Aug 2018 03:46:28 +0000 (11:46 +0800)]
Merge pull request #23564 from falcon78921/wip-docs-links-1

doc: fixed broken urls

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #23240 into master
Sage Weil [Wed, 15 Aug 2018 01:31:29 +0000 (20:31 -0500)]
Merge PR #23240 into master

* refs/pull/23240/head:
qa/suites/rados, qa/workunits/rados: Add suite/workunit for ceph-crash
add ceph-crash service
common/options: enable mgr 'crash' module by default
global/signal_handler: add 'done' file to signal crashdump is ready

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #15831 from trociny/wip-18430-1
Jason Dillaman [Tue, 14 Aug 2018 23:05:13 +0000 (19:05 -0400)]
Merge pull request #15831 from trociny/wip-18430-1

librbd: support migrating images with minimal downtime

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: drop snap lock before sending copyup request
Mykola Golub [Sat, 21 Jul 2018 06:59:03 +0000 (09:59 +0300)]
librbd: drop snap lock before sending copyup request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: restart object deep copy with flatten
Mykola Golub [Fri, 6 Jul 2018 10:30:09 +0000 (13:30 +0300)]
librbd: restart object deep copy with flatten

if copyup request was appended with non empty writes when the deep
copy was in flight.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: update in-memory migration snap map after creating snap
Mykola Golub [Fri, 6 Jul 2018 08:56:48 +0000 (11:56 +0300)]
librbd: update in-memory migration snap map after creating snap

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: AsyncOperation may not be reused
Mykola Golub [Mon, 2 Jul 2018 09:17:08 +0000 (12:17 +0300)]
librbd: AsyncOperation may not be reused

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: migrate: skip update object map for snaps that don't overlap
Mykola Golub [Mon, 18 Jun 2018 17:00:04 +0000 (20:00 +0300)]
librbd: migrate: skip update object map for snaps that don't overlap

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: don't update object map if object deep copy returned ENOENT
Mykola Golub [Sat, 9 Jun 2018 10:28:52 +0000 (13:28 +0300)]
librbd: don't update object map if object deep copy returned ENOENT

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: open migration image parent and store its pointer in ImageCtx
Mykola Golub [Sun, 27 May 2018 12:06:59 +0000 (15:06 +0300)]
librbd: open migration image parent and store its pointer in ImageCtx

Use the pointer in copyup and migrate requests, when deep copying an
object.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: use 'open snap by id' in clone request
Mykola Golub [Sun, 27 May 2018 11:58:27 +0000 (14:58 +0300)]
librbd: use 'open snap by id' in clone request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: use 'open snap by id' in deep copy image copy request
Mykola Golub [Fri, 25 May 2018 13:36:13 +0000 (16:36 +0300)]
librbd: use 'open snap by id' in deep copy image copy request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: use 'open snap by id' in refresh parent request
Mykola Golub [Fri, 25 May 2018 13:35:02 +0000 (16:35 +0300)]
librbd: use 'open snap by id' in refresh parent request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: allow to open snapshot by id
Mykola Golub [Fri, 25 May 2018 13:32:13 +0000 (16:32 +0300)]
librbd: allow to open snapshot by id

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: separate read vs write migration parent overlaps
Jason Dillaman [Wed, 18 Apr 2018 15:08:24 +0000 (11:08 -0400)]
librbd: separate read vs write migration parent overlaps

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: corrected usage of ImageState::open flag parameter
Jason Dillaman [Tue, 17 Apr 2018 20:45:24 +0000 (16:45 -0400)]
librbd: corrected usage of ImageState::open flag parameter

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: migration should keep parent linkage by default
Jason Dillaman [Tue, 17 Apr 2018 20:56:17 +0000 (16:56 -0400)]
librbd: migration should keep parent linkage by default

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: move shared common clone parent logic to state machine
Jason Dillaman [Tue, 17 Apr 2018 20:22:06 +0000 (16:22 -0400)]
librbd: move shared common clone parent logic to state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: normalize clone state machine method names and debug logs
Jason Dillaman [Tue, 17 Apr 2018 18:15:47 +0000 (14:15 -0400)]
librbd: normalize clone state machine method names and debug logs

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: update executing state description with migration % complete
Mykola Golub [Sat, 24 Feb 2018 16:30:19 +0000 (18:30 +0200)]
librbd: update executing state description with migration % complete

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: make status show migration details if it is in progress
Mykola Golub [Thu, 22 Feb 2018 20:32:42 +0000 (22:32 +0200)]
rbd: make status show migration details if it is in progress

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: show when parent is migration source in info output
Mykola Golub [Fri, 16 Feb 2018 13:48:46 +0000 (15:48 +0200)]
rbd: show when parent is migration source in info output

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: get_parent_info: don't try to find parent snap name for CEPH_NOSNAP
Mykola Golub [Fri, 16 Feb 2018 13:45:50 +0000 (15:45 +0200)]
librbd: get_parent_info: don't try to find parent snap name for CEPH_NOSNAP

(it is possible now when the parent is a migration source)

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd: CLI to migrate images
Mykola Golub [Wed, 22 Nov 2017 13:50:19 +0000 (15:50 +0200)]
rbd: CLI to migrate images

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agopybind/rbd: API for image migration
Mykola Golub [Sat, 24 Feb 2018 09:43:21 +0000 (11:43 +0200)]
pybind/rbd: API for image migration

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: API for image migration
Mykola Golub [Sat, 24 Feb 2018 09:43:12 +0000 (11:43 +0200)]
librbd: API for image migration

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: allow 'migrating' internal feature on image create
Mykola Golub [Wed, 23 May 2018 14:46:25 +0000 (17:46 +0300)]
librbd: allow 'migrating' internal feature on image create

We want this feature set from the start to avoid races when a client
is opening an image being prepared for migration.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: handle CEPH_NOSNAP case outside of deep_copy::util::compute_snap_map
Mykola Golub [Mon, 9 Apr 2018 12:32:12 +0000 (15:32 +0300)]
librbd: handle CEPH_NOSNAP case outside of deep_copy::util::compute_snap_map

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: add function to wait writes unblocked
Mykola Golub [Wed, 14 Mar 2018 12:11:56 +0000 (14:11 +0200)]
librbd: add function to wait writes unblocked

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: use newly added method to list watchers in remove request
Mykola Golub [Sat, 9 Jun 2018 15:07:42 +0000 (18:07 +0300)]
librbd: use newly added method to list watchers in remove request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: async request to list watchers
Mykola Golub [Thu, 14 Dec 2017 16:52:12 +0000 (18:52 +0200)]
librbd: async request to list watchers

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: allow to remove already opened image
Mykola Golub [Sun, 10 Dec 2017 14:44:07 +0000 (16:44 +0200)]
librbd: allow to remove already opened image

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: shortcut to skip v2 probing when opening v1 image
Mykola Golub [Wed, 22 Nov 2017 13:48:20 +0000 (15:48 +0200)]
librbd: shortcut to skip v2 probing when opening v1 image

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: add flags to open request
Mykola Golub [Sun, 10 Dec 2017 19:16:37 +0000 (21:16 +0200)]
librbd: add flags to open request

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocls/rbd: add assert_snapc_seq method
Mykola Golub [Sun, 15 Jul 2018 09:21:08 +0000 (12:21 +0300)]
cls/rbd: add assert_snapc_seq method

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: add "migration" trash image source
Mykola Golub [Wed, 29 Nov 2017 19:10:57 +0000 (21:10 +0200)]
librbd: add "migration" trash image source

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocls/rbd: add "migration" trash image source
Mykola Golub [Wed, 29 Nov 2017 19:05:18 +0000 (21:05 +0200)]
cls/rbd: add "migration" trash image source

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocls/rbd: methods to set/get/remove image migration header
Mykola Golub [Wed, 22 Nov 2017 13:47:45 +0000 (15:47 +0200)]
cls/rbd: methods to set/get/remove image migration header

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agodoc: added :ref: directive for osdmaptool 23564/head
James McClune [Tue, 14 Aug 2018 22:04:06 +0000 (18:04 -0400)]
doc: added :ref: directive for osdmaptool

Added :ref: directive for osdmaptool utility.

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agodoc: added osdmaptool cross reference
James McClune [Tue, 14 Aug 2018 21:59:09 +0000 (17:59 -0400)]
doc: added osdmaptool cross reference

Added osdmaptool cross reference for docs/rados/operations/control.rst.

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge pull request #23532 from alfredodeza/wip-rm24960
Andrew Schoen [Tue, 14 Aug 2018 20:59:24 +0000 (20:59 +0000)]
Merge pull request #23532 from alfredodeza/wip-rm24960

ceph-volume:  expand auto engine for single type devices on filestore

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #23402 from cbodley/wip-23659
Casey Bodley [Tue, 14 Aug 2018 20:53:30 +0000 (16:53 -0400)]
Merge pull request #23402 from cbodley/wip-23659

qa/rgw: patch keystone requirements.txt

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
6 years agoMerge PR #23426 into master
Patrick Donnelly [Tue, 14 Aug 2018 18:50:09 +0000 (11:50 -0700)]
Merge PR #23426 into master

* refs/pull/23426/head:
client: privatize some class members
client: reorganize Client header

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge PR #23470 into master
Patrick Donnelly [Tue, 14 Aug 2018 16:41:01 +0000 (09:41 -0700)]
Merge PR #23470 into master

* refs/pull/23470/head:
tools/cephfs-shell: unable to copy files to a sub-directory from local file system

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agotools/cephfs-shell: unable to copy files to a sub-directory from local file system 23470/head
Pavani Rajula [Tue, 14 Aug 2018 16:18:04 +0000 (21:48 +0530)]
tools/cephfs-shell: unable to copy files to a sub-directory from local file system

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

Signed-off-by: Pavani Rajula <rpavani1998@gmail.com>
6 years agoMerge PR #23561 into master
Patrick Donnelly [Tue, 14 Aug 2018 15:59:29 +0000 (08:59 -0700)]
Merge PR #23561 into master

* refs/pull/23561/head:
tools/cephfs: do not split args if it's already a list

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoceph-volume lvm.zap loop over all vgs from a pv to destroy them 23532/head
Alfredo Deza [Tue, 14 Aug 2018 15:59:25 +0000 (11:59 -0400)]
ceph-volume lvm.zap loop over all vgs from a pv to destroy them

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge PR #23552 into master
Sage Weil [Tue, 14 Aug 2018 15:34:29 +0000 (10:34 -0500)]
Merge PR #23552 into master

* refs/pull/23552/head:
ceph_test_objectstore: queue split on parent pg sequencer
os/bluestore: fix split vs finish_write race

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoceph-volume tests.util ensure dmcrypt_close will skip non-existent paths
Alfredo Deza [Mon, 13 Aug 2018 19:42:26 +0000 (15:42 -0400)]
ceph-volume tests.util ensure dmcrypt_close will skip non-existent paths

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume util.encryption if crypt path does not exist, skip it
Alfredo Deza [Mon, 13 Aug 2018 19:41:46 +0000 (15:41 -0400)]
ceph-volume util.encryption if crypt path does not exist, skip it

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume lvm.zap unmount lvs and close dmcrypt on partitions
Alfredo Deza [Mon, 13 Aug 2018 16:12:46 +0000 (12:12 -0400)]
ceph-volume lvm.zap unmount lvs and close dmcrypt on partitions

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph_test_objectstore: queue split on parent pg sequencer 23552/head
Sage Weil [Tue, 14 Aug 2018 13:58:31 +0000 (08:58 -0500)]
ceph_test_objectstore: queue split on parent pg sequencer

This matches the OSD.

It also ensure that we drain transactions that precede the split, which
will include any finish_write calls that might otherwise attach the
Buffer to the wrong cache shard: _txc_finish() calls finish_write and
passes the cache shard without the cache shard lock held, but may block
waiting for split_cache() which then changes the destination collection's
shard.  Once it gets the lock and proceeds it would operate on the wrong
cache shard, leading to a failed assert later when the sharedblob is
trimmed.

Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #23539 from cyx1231st/wip-seastar-msgr-cyx
Kefu Chai [Tue, 14 Aug 2018 12:47:44 +0000 (20:47 +0800)]
Merge pull request #23539 from cyx1231st/wip-seastar-msgr-cyx

crimson/net: fix unittest_seastar_messenger errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #22457 from p-na/dash-settings
Ricardo Marques [Tue, 14 Aug 2018 08:27:09 +0000 (09:27 +0100)]
Merge pull request #22457 from p-na/dash-settings

mgr/dashboard: Add backend support for changing dashboard configuration settings via the REST API

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agocrimson/net: fix unittest_seastar_messenger errors 23539/head
Yingxin [Sun, 12 Aug 2018 22:44:37 +0000 (06:44 +0800)]
crimson/net: fix unittest_seastar_messenger errors

fix several bugs that may fail unittest_seastar_messenger:
1. keep holding the connection reference until closed.
2. zero h.reply before start to use it.
3. set server-side features correctly.
4. add missing return to link write with flush.
5. remove an empty lambda operation.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
6 years agodoc: updated reference link for osdmaptool utility
James McClune [Tue, 14 Aug 2018 03:39:46 +0000 (23:39 -0400)]
doc: updated reference link for osdmaptool utility

Reference link for osdmaptool utility was broken (404 error).

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agodoc: updated link for submitting patches
James McClune [Tue, 14 Aug 2018 03:29:41 +0000 (23:29 -0400)]
doc: updated link for submitting patches

Updated link for Submitting Patches (404 error).

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agotools/cephfs: do not split args if it's already a list 23561/head
Kefu Chai [Tue, 14 Aug 2018 01:59:00 +0000 (09:59 +0800)]
tools/cephfs: do not split args if it's already a list

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #23537 into master
Patrick Donnelly [Mon, 13 Aug 2018 23:39:32 +0000 (16:39 -0700)]
Merge PR #23537 into master

* refs/pull/23537/head:
tools/cephfs-shell:fixing the issue in using  with_argparse.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23519 from falcon78921/wip-doc-troubleshoot-osds
Gregory Farnum [Mon, 13 Aug 2018 20:57:58 +0000 (13:57 -0700)]
Merge pull request #23519 from falcon78921/wip-doc-troubleshoot-osds

doc: cleaned up troubleshooting OSDs documentation

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoqa/suites/rados, qa/workunits/rados: Add suite/workunit for ceph-crash 23240/head
Dan Mick [Fri, 3 Aug 2018 03:20:41 +0000 (20:20 -0700)]
qa/suites/rados, qa/workunits/rados: Add suite/workunit for ceph-crash

Signed-off-by: Dan Mick <dan.mick@redhat.com>
6 years agoMerge pull request #23401 from cbodley/wip-rgw-getomapkeys2-more
Casey Bodley [Mon, 13 Aug 2018 19:44:45 +0000 (15:44 -0400)]
Merge pull request #23401 from cbodley/wip-rgw-getomapkeys2-more

rgw: RGWRadosGetOmapKeysCR uses 'more' flag from omap_get_keys2()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #23406 into master
Sage Weil [Mon, 13 Aug 2018 18:00:51 +0000 (13:00 -0500)]
Merge PR #23406 into master

* refs/pull/23406/head:
TestOSDMap: Test with negative upmap values
osd/OSDMap: Disallow negative values in _apply_upmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #23512 into master
Sage Weil [Mon, 13 Aug 2018 18:00:46 +0000 (13:00 -0500)]
Merge PR #23512 into master

* refs/pull/23512/head:
osd: vary tick interval +/- 5% to avoid scrub livelocks
osd: tick at OSD_TICK_INTERVAL, not heartbeat interval

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #23515 into master
Sage Weil [Mon, 13 Aug 2018 18:00:41 +0000 (13:00 -0500)]
Merge PR #23515 into master

* refs/pull/23515/head:
os/bluestore_tool: print actual usage in BlueFS::dump_block_extents.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #23516 into master
Sage Weil [Mon, 13 Aug 2018 18:00:36 +0000 (13:00 -0500)]
Merge PR #23516 into master

* refs/pull/23516/head:
os/bluestore: check bluefs_extents consistency (DB vs. BlueFS)

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #23517 into master
Sage Weil [Mon, 13 Aug 2018 18:00:32 +0000 (13:00 -0500)]
Merge PR #23517 into master

* refs/pull/23517/head:
os/bluestore: uniform loging format for bluefs_extent_t.
os/bluestore_tool: handle fsck's returned  status properly.
os/bluestore_tool: fix multiple extents handling in BlueFS::log_dump

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #23536 into master
Patrick Donnelly [Mon, 13 Aug 2018 17:16:32 +0000 (10:16 -0700)]
Merge PR #23536 into master

* refs/pull/23536/head:
mds: report lagginess at lower debug
MDSMonitor: note beacons and cluster changes at low dbg level

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fix split vs finish_write race
Sage Weil [Mon, 13 Aug 2018 17:10:31 +0000 (12:10 -0500)]
os/bluestore: fix split vs finish_write race

In _tcx_finish(), we were looking at the right Cache for the collection,
and then calling finish_write with that Cache and taking the lock.  This
could race with a split_cache() such that after we got the lock the
collection was not on a different cache.  This would in turn lead to a
failed assertion later on in _rm_buffer when the sharedblob was trimmed.

Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #23291 into master
Sage Weil [Mon, 13 Aug 2018 15:49:41 +0000 (10:49 -0500)]
Merge PR #23291 into master

* refs/pull/23291/head:
tests: add Cephx-resembling scenarios to crypto tests.
tests: differentiate AES testing regarding text size.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #22879 into master
Sage Weil [Mon, 13 Aug 2018 13:48:14 +0000 (08:48 -0500)]
Merge PR #22879 into master

* refs/pull/22879/head:
doc/rados/operations/user-management: document 'network' clause of moncap and osdcap
mds/SessionMap: make Session::connection private
mds/MDSAuthCaps: parse and enforce network restriction
mds/MDSAuthCaps: pass addr to is_capable
mds/SessionMap: track socket_addr for each Session
osd/OSDCap: enforce network restriction
osd/OSDCap: take addr arg to is_capable
osd/OSDCap: parse 'network' clause in grant
mon: adapt MonCap network checks to addrvecs
mon/MonCap: enforce network constraint (if present)
mon/MonCap: take addr for MonCap::is_capable
mon/MonCap: parse 'network ...' suffix
osd: add peer_socket_addr to Session
mon: use addrvec for RoutedRequest and MForward
msg/Connection: add get_peer_socket_addr()
common/ipaddr: add network_contains() helper
common/ipaddr: add parse_network helper
common/ipaddr: expose netmask_ipv[46]

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #23510 from tchaikov/wip-cmake-boost-build
Kefu Chai [Mon, 13 Aug 2018 13:42:10 +0000 (21:42 +0800)]
Merge pull request #23510 from tchaikov/wip-cmake-boost-build

cmake: fix build WITH_SYSTEM_BOOST=ON

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoceph-volume tests.functional batch add filestore sceanrios to tox.ini
Alfredo Deza [Mon, 13 Aug 2018 11:42:35 +0000 (07:42 -0400)]
ceph-volume tests.functional batch add filestore sceanrios to tox.ini

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge PR #23542 into master
Patrick Donnelly [Mon, 13 Aug 2018 02:15:20 +0000 (19:15 -0700)]
Merge PR #23542 into master

* refs/pull/23542/head:
qa: fix mon config section

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: fix mon config section 23542/head
Patrick Donnelly [Mon, 13 Aug 2018 02:13:06 +0000 (19:13 -0700)]
qa: fix mon config section

Fixes: fc6e683832125a1042638f21b623e29d0d4c34d8
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #23444 into master
Patrick Donnelly [Mon, 13 Aug 2018 01:29:34 +0000 (18:29 -0700)]
Merge PR #23444 into master

* refs/pull/23444/head:
cephfs-shell: avoid sys.argv modification
tools/cephfs-shell: added support for batch file processing and to execute commands from arguments.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agodoc/rados/operations/user-management: document 'network' clause of moncap and osdcap 22879/head
Sage Weil [Thu, 5 Jul 2018 16:44:25 +0000 (11:44 -0500)]
doc/rados/operations/user-management: document 'network' clause of moncap and osdcap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomds/SessionMap: make Session::connection private
Sage Weil [Thu, 9 Aug 2018 19:09:39 +0000 (14:09 -0500)]
mds/SessionMap: make Session::connection private

Ensure all setters go through set_connection()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocephfs-shell: avoid sys.argv modification 23444/head
Patrick Donnelly [Sun, 12 Aug 2018 22:01:34 +0000 (15:01 -0700)]
cephfs-shell: avoid sys.argv modification

In multiple locations in the code.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomds/MDSAuthCaps: parse and enforce network restriction
Sage Weil [Fri, 3 Aug 2018 20:20:16 +0000 (15:20 -0500)]
mds/MDSAuthCaps: parse and enforce network restriction

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomds/MDSAuthCaps: pass addr to is_capable
Sage Weil [Fri, 3 Aug 2018 19:45:45 +0000 (14:45 -0500)]
mds/MDSAuthCaps: pass addr to is_capable

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomds/SessionMap: track socket_addr for each Session
Sage Weil [Fri, 3 Aug 2018 19:36:14 +0000 (14:36 -0500)]
mds/SessionMap: track socket_addr for each Session

Make sure socket_addr is populated when connection is set.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/OSDCap: enforce network restriction
Sage Weil [Fri, 3 Aug 2018 18:59:40 +0000 (13:59 -0500)]
osd/OSDCap: enforce network restriction

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/OSDCap: take addr arg to is_capable
Sage Weil [Fri, 3 Aug 2018 18:50:39 +0000 (13:50 -0500)]
osd/OSDCap: take addr arg to is_capable

Not enforced yet; just plumbing!

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/OSDCap: parse 'network' clause in grant
Sage Weil [Fri, 3 Aug 2018 18:27:28 +0000 (13:27 -0500)]
osd/OSDCap: parse 'network' clause in grant

This mirrors what we do in the MonCap (but, naturally, is a slightly
different since we're using a the spirit parse in a totally different way).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: adapt MonCap network checks to addrvecs
Sage Weil [Thu, 5 Jul 2018 17:59:13 +0000 (12:59 -0500)]
mon: adapt MonCap network checks to addrvecs

Breaking this out in a separate commit to make the backport a bit easier.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonCap: enforce network constraint (if present)
Sage Weil [Thu, 5 Jul 2018 16:40:06 +0000 (11:40 -0500)]
mon/MonCap: enforce network constraint (if present)

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonCap: take addr for MonCap::is_capable
Sage Weil [Thu, 5 Jul 2018 16:39:48 +0000 (11:39 -0500)]
mon/MonCap: take addr for MonCap::is_capable

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonCap: parse 'network ...' suffix
Sage Weil [Tue, 3 Jul 2018 19:31:52 +0000 (14:31 -0500)]
mon/MonCap: parse 'network ...' suffix

Allow an optional network constraint to any grant.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd: add peer_socket_addr to Session
Sage Weil [Fri, 3 Aug 2018 18:41:30 +0000 (13:41 -0500)]
osd: add peer_socket_addr to Session

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: use addrvec for RoutedRequest and MForward
Sage Weil [Thu, 5 Jul 2018 17:13:15 +0000 (12:13 -0500)]
mon: use addrvec for RoutedRequest and MForward

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/Connection: add get_peer_socket_addr()
Sage Weil [Thu, 5 Jul 2018 16:56:15 +0000 (11:56 -0500)]
msg/Connection: add get_peer_socket_addr()

Return the addr that is actually being used for this socket (among the
potentially many in the addrvec).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ipaddr: add network_contains() helper
Sage Weil [Thu, 9 Aug 2018 18:20:07 +0000 (13:20 -0500)]
common/ipaddr: add network_contains() helper

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ipaddr: add parse_network helper
Sage Weil [Thu, 9 Aug 2018 18:13:18 +0000 (13:13 -0500)]
common/ipaddr: add parse_network helper

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ipaddr: expose netmask_ipv[46]
Sage Weil [Tue, 3 Jul 2018 23:07:46 +0000 (18:07 -0500)]
common/ipaddr: expose netmask_ipv[46]

Signed-off-by: Sage Weil <sage@redhat.com>