]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoos/bluestore: fix race between SharedBlobSet::lookup and SharedBlob::put 24701/head
Sage Weil [Mon, 22 Oct 2018 19:38:48 +0000 (14:38 -0500)]
os/bluestore: fix race between SharedBlobSet::lookup and SharedBlob::put

A                             B
SharedBlobSet::lookup()
  takes lock
  nref is not 0
                              SharedBlob::put()
                                --nref
returns SharedBlobRef,
  ++nref
                                takes cache lock
                                SharedBlobSet::remove
                                  takes lock
                                  removes
                                deletes SharedBlob

-> A ends up with a ref to deleted SharedBlob

Fix by verifying that nref is still zero in SharedBlobSet::remove(),
while we are holding the SharedBlobSet::lock.  The lock ensures that we
have increased the ref for the lookup before entering remove, so we can
verify that nref is still zero before removing it.  If not, we have
raced, and put() bails out and does nothing.

Fixes: http://tracker.ceph.com/issues/36526
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24689 into master
Sage Weil [Mon, 22 Oct 2018 14:19:46 +0000 (09:19 -0500)]
Merge PR #24689 into master

* refs/pull/24689/head:
qa/tasks/ceph_manager: fix get_stuck_pgs from pg dump change
Merge PR #24625 into nautilus
qa/suites/rados/mgr/tasks/module_selftest: whitelist 'foo bar security'

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #20004 from mogeb/steady-clock-tools-rados
Kefu Chai [Mon, 22 Oct 2018 09:46:44 +0000 (17:46 +0800)]
Merge pull request #20004 from mogeb/steady-clock-tools-rados

librados: use steady clock for rados_mon_op_timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #24658 from tchaikov/wip-18202-rebased
Kefu Chai [Mon, 22 Oct 2018 09:44:07 +0000 (17:44 +0800)]
Merge pull request #24658 from tchaikov/wip-18202-rebased

blkdev: Rework API and add FreeBSD support

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
6 years agoqa/tasks/ceph_manager: fix get_stuck_pgs from pg dump change 24689/head
Sage Weil [Sun, 21 Oct 2018 15:52:38 +0000 (10:52 -0500)]
qa/tasks/ceph_manager: fix get_stuck_pgs from pg dump change

Fixes 95b7d2340c04dc7cf90085c89606b8c85a8f2803

Fixes: http://tracker.ceph.com/issues/36485
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24184 into master 21364/head
Sage Weil [Sat, 20 Oct 2018 21:40:22 +0000 (16:40 -0500)]
Merge PR #24184 into master

* refs/pull/24184/head:
mgr/DaemonServer: remove any upmaps on merging PGs
mgr/DaemonServer: prevent merge if either pg is remapped|upmap
mgr/DaemonServer: move pending merge check for more consistent code
qa/suites/rados/thrash*/thrashers/careful.yaml: thrash with mgr controller
mgr/DaemonServer: add option to bypass careful throttling for thrasher
PendingReleaseNotes: note about mgr/balancer/max_misplaced change
mgr/DaemonServer: remove stale/misleading check
mgr/DaemonServer: throttle pgp_num changes based on misplaced %
mgr/DaemonServer: block pg_num decrease(merge) until pgp_num is reduced
mgr/DaemonServer: adjust_pgs(): cosmetic change to debug output
mon/PGMap: add get_recovery_stats()
mgr/balancer: mgr/balancer/max_misplaced -> pg_max_misplaced
pybind/mgr/mgr_module: add get_option()
mgr/DaemonServer: allow pg_num increases that abort pending merges
mon/OSDMonitor: resent pre-nautilus client ops on aborted merge
mon/OSDMonitor: make pgp_num track pg_num more consistently

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #24654 into master
Sage Weil [Sat, 20 Oct 2018 20:39:56 +0000 (15:39 -0500)]
Merge PR #24654 into master

* refs/pull/24654/head:
osd: remove unused parameter 'dev' in OSD::mkfs function

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomgr/DaemonServer: remove any upmaps on merging PGs 24184/head
Sage Weil [Mon, 24 Sep 2018 18:53:46 +0000 (13:53 -0500)]
mgr/DaemonServer: remove any upmaps on merging PGs

Remove any pg_upmap[_items] on pgs that are merging to ensure that they
land on the same OSDs.

This is a bit sloppy: we *could* set the source upmap to match the target
upmap (vs potentially moving both PGs to a third location, and/or then
having the balancer move the resulting PG somewhere else again), but for
now assume upmaps are not a common case and Keep It Simple.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/DaemonServer: prevent merge if either pg is remapped|upmap
Sage Weil [Mon, 24 Sep 2018 18:03:05 +0000 (13:03 -0500)]
mgr/DaemonServer: prevent merge if either pg is remapped|upmap

Remapping means they could be on different OSDs.

Fixes: http://tracker.ceph.com/issues/36166
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/DaemonServer: move pending merge check for more consistent code
Sage Weil [Thu, 20 Sep 2018 13:43:37 +0000 (08:43 -0500)]
mgr/DaemonServer: move pending merge check for more consistent code

No functional change, but this makes the code simpler to read.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/rados/thrash*/thrashers/careful.yaml: thrash with mgr controller
Sage Weil [Wed, 19 Sep 2018 22:09:24 +0000 (17:09 -0500)]
qa/suites/rados/thrash*/thrashers/careful.yaml: thrash with mgr controller

Thrash such that we still exercise the careful throttling in the mgr.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/DaemonServer: add option to bypass careful throttling for thrasher
Sage Weil [Wed, 19 Sep 2018 22:04:38 +0000 (17:04 -0500)]
mgr/DaemonServer: add option to bypass careful throttling for thrasher

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #20581 from chrone81/patch-1
Josh Durgin [Fri, 19 Oct 2018 22:23:55 +0000 (15:23 -0700)]
Merge pull request #20581 from chrone81/patch-1

doc: Fix EC k=3 m=2 profile overhead calculation example.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #22349 from gregsfortytwo/wip-24368-osd-restarts
Gregory Farnum [Fri, 19 Oct 2018 20:00:07 +0000 (13:00 -0700)]
Merge pull request #22349 from gregsfortytwo/wip-24368-osd-restarts

systemd: only restart 3 times in 30 minutes, as fast as possible

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #24646 from dillaman/wip-36500
Mykola Golub [Fri, 19 Oct 2018 15:19:56 +0000 (18:19 +0300)]
Merge pull request #24646 from dillaman/wip-36500

rbd-mirror: always attempt to restart canceled status update task

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #24670 from falcon78921/wip-doc-multisite-link
Casey Bodley [Fri, 19 Oct 2018 15:06:35 +0000 (11:06 -0400)]
Merge pull request #24670 from falcon78921/wip-doc-multisite-link

doc: updated wording from federated to multisite

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24595 from cbodley/wip-24505
Casey Bodley [Fri, 19 Oct 2018 14:00:42 +0000 (10:00 -0400)]
Merge pull request #24595 from cbodley/wip-24505

rgw: user stats account for resharded buckets

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #24673 from tchaikov/wip-librbd-test-os-cleanup
Jason Dillaman [Fri, 19 Oct 2018 13:47:54 +0000 (09:47 -0400)]
Merge pull request #24673 from tchaikov/wip-librbd-test-os-cleanup

librbd,test: remove unused context_cb() function, silence GCC warnings

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24645 from cbodley/wip-36496
Matt Benjamin [Fri, 19 Oct 2018 13:39:03 +0000 (09:39 -0400)]
Merge pull request #24645 from cbodley/wip-36496

cls/user: cls_user_remove_bucket writes modified header

6 years agoMerge PR #24611 into master
Sage Weil [Fri, 19 Oct 2018 13:31:46 +0000 (08:31 -0500)]
Merge PR #24611 into master

* refs/pull/24611/head:
mgr/diskprediction: Solve predictor model file not backward compatibility

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24623 into master
Sage Weil [Fri, 19 Oct 2018 13:31:29 +0000 (08:31 -0500)]
Merge PR #24623 into master

* refs/pull/24623/head:
mgr: Mutex::Locker -> std::lock_guard
kv: Mutex::Locker -> std::lock_guard
librados: Mutex::Locker -> std::lock_guard
mon: Mutex::Locker -> std::lock_guard
osd: Mutex::Locker -> std::lock_guard

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
6 years agoMerge pull request #24605 from tchaikov/wip-use-ccache-the-old-way
Kefu Chai [Fri, 19 Oct 2018 12:57:04 +0000 (20:57 +0800)]
Merge pull request #24605 from tchaikov/wip-use-ccache-the-old-way

cmake: fix compilation with distcc and other compiler wrappers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoblkdev: FreeBSD support 24658/head
Alan Somers [Thu, 28 Sep 2017 20:13:15 +0000 (14:13 -0600)]
blkdev: FreeBSD support

Signed-off-by: Alan Somers <asomers@gmail.com>
6 years agoblkdev: overhaul API for better portability
Alan Somers [Wed, 4 Oct 2017 22:31:23 +0000 (16:31 -0600)]
blkdev: overhaul API for better portability

* Turn the API into a class so it will work with GoogleMock
* Take file descriptors for all methods, instead of a mix of file
  descriptors, path names, and canonical device names.  It's more
  consistent and it will work better with FreeBSD.
* Split get_device_by_fd into block_device_partition and
  block_device_wholedisk
* Remove dead code

Signed-off-by: Alan Somers <asomers@gmail.com>
6 years agoblkdev: move test_get_blkdev_size to test_get_blkdev_props
Alan Somers [Tue, 3 Oct 2017 15:56:32 +0000 (09:56 -0600)]
blkdev: move test_get_blkdev_size to test_get_blkdev_props

Also, enhance blkdev test program to show more properties than just size

Signed-off-by: Alan Somers <asomers@gmail.com>
6 years agoblkdev: Add dedicated accessors for all property functions
Alan Somers [Thu, 28 Sep 2017 22:51:39 +0000 (16:51 -0600)]
blkdev: Add dedicated accessors for all property functions

Hide get_block_device_string_property and get_block_device_int_property
to lower risk of misuse.

Signed-off-by: Alan Somers <asomers@gmail.com>
6 years agoblkdev: add an enum type for block device properties
Alan Somers [Wed, 27 Sep 2017 16:37:02 +0000 (10:37 -0600)]
blkdev: add an enum type for block device properties

Signed-off-by: Alan Somers <asomers@gmail.com>
6 years agoMerge pull request #21155 from runsisi/wip-auth-cleanup
Kefu Chai [Fri, 19 Oct 2018 11:21:17 +0000 (19:21 +0800)]
Merge pull request #21155 from runsisi/wip-auth-cleanup

auth/cephx: minor code cleanup

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #24672 from SUSE/wip-orchestrator-result-property
Tim Serong [Fri, 19 Oct 2018 11:19:10 +0000 (21:19 +1000)]
Merge pull request #24672 from SUSE/wip-orchestrator-result-property

mgr/orchestrator: use result property in Completion classes

6 years agoMerge pull request #24314 from rhcs-dashboard/dashboards
Lenz Grimmer [Fri, 19 Oct 2018 10:42:23 +0000 (12:42 +0200)]
Merge pull request #24314 from rhcs-dashboard/dashboards

mgr/dashboard: Grafana dashboard updates and additions

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #24628 from Devp00l/wip-issue-36445
Lenz Grimmer [Fri, 19 Oct 2018 09:57:12 +0000 (11:57 +0200)]
Merge pull request #24628 from Devp00l/wip-issue-36445

mgr/dashboard: Add missing test requirement "werkzeug"

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #24669 from falcon78921/wip-docs-36527
Kefu Chai [Fri, 19 Oct 2018 09:32:59 +0000 (17:32 +0800)]
Merge pull request #24669 from falcon78921/wip-docs-36527

doc: add spacing to subcommand references

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #19386 from ganeshmaharaj/qat-ceph-crypto
Kefu Chai [Fri, 19 Oct 2018 09:02:56 +0000 (17:02 +0800)]
Merge pull request #19386 from ganeshmaharaj/qat-ceph-crypto

crypto: QAT based Encryption for RGW

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agolibrbd: remove unused context_cb() function 24673/head
Kefu Chai [Fri, 19 Oct 2018 06:20:26 +0000 (14:20 +0800)]
librbd: remove unused context_cb() function

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agotest/objectstore: silence "-Wsign-compare" warnings
Kefu Chai [Fri, 19 Oct 2018 06:21:14 +0000 (14:21 +0800)]
test/objectstore: silence "-Wsign-compare" warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/orchestrator: use result property in Completion classes 24672/head
Tim Serong [Fri, 19 Oct 2018 08:25:45 +0000 (19:25 +1100)]
mgr/orchestrator: use result property in Completion classes

The _Completion class defined a get_result() method, but the orchestrator
CLI and Rook module both just expected a result property, so let's run with
the property version.

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agoauth/cephx: remove unused member method 21155/head
runsisi [Sat, 31 Mar 2018 10:36:43 +0000 (18:36 +0800)]
auth/cephx: remove unused member method

Signed-off-by: runsisi <runsisi@zte.com.cn>
6 years agoauth: remove unused forward declaration
runsisi [Sat, 31 Mar 2018 10:23:06 +0000 (18:23 +0800)]
auth: remove unused forward declaration

Signed-off-by: runsisi <runsisi@zte.com.cn>
6 years agoMerge pull request #24618 from CharlotteRose/wip-number-eviction-events
Jos Collin [Fri, 19 Oct 2018 05:13:51 +0000 (10:43 +0530)]
Merge pull request #24618 from CharlotteRose/wip-number-eviction-events

doc: numbered eviction situations

Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agocrypto: Merge compilation of crypto accelerators under a single cmake. 19386/head
Ganesh Maharaj Mahalingam [Fri, 27 Jul 2018 01:01:46 +0000 (18:01 -0700)]
crypto: Merge compilation of crypto accelerators under a single cmake.

- Control ISA-L and QAT under a crypto makefile
- Allow conditional compile of QAT.

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
6 years agocrypto: QAT Wrapper for Ceph Encryption
Ganesh Maharaj Mahalingam [Fri, 3 Aug 2018 18:16:03 +0000 (11:16 -0700)]
crypto: QAT Wrapper for Ceph Encryption

- Crypto plugin created and currently handles only AES_256_CBC
- Contents
-- Poller thread for QAT HW
-- Contiguous memory allocator using QAT's usdm driver
-- Do in-place crypto operation reducing mem usage.
-- Enable multi-QAT instance to allow parallel operations.

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
6 years agodoc: updated wording from federated to multisite 24670/head
James McClune [Fri, 19 Oct 2018 04:45:33 +0000 (00:45 -0400)]
doc: updated wording from federated to multisite

Updated the terminology from federated architecture
to multisite configuration. Updated the reference link for multisite
configuration.

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agodoc: add spacing to subcommand references 24669/head
James McClune [Fri, 19 Oct 2018 04:34:54 +0000 (00:34 -0400)]
doc: add spacing to subcommand references

Added appropriate spacing for subcommand
code references.

Fixes: https://tracker.ceph.com/issues/36527
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge pull request #24531 from alfredodeza/wip-rm36386
Alfredo Deza [Thu, 18 Oct 2018 18:43:44 +0000 (15:43 -0300)]
Merge pull request #24531 from alfredodeza/wip-rm36386

ceph-volume remove version reporting from help menu

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24453 from cbodley/wip-rgw-putobjprocessor
Matt Benjamin [Thu, 18 Oct 2018 17:09:00 +0000 (13:09 -0400)]
Merge pull request #24453 from cbodley/wip-rgw-putobjprocessor

rgw: refactor PutObjProcessor stack

6 years agoMerge pull request #23304 from smithfarm/wip-23776
Gregory Farnum [Thu, 18 Oct 2018 16:10:16 +0000 (09:10 -0700)]
Merge pull request #23304 from smithfarm/wip-23776

 tools: ceph-authtool: report correct number of caps when creating keyring

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agodoc: numbered eviction situations 24618/head
Scoots Hamilton [Tue, 16 Oct 2018 14:15:08 +0000 (10:15 -0400)]
doc: numbered eviction situations

Signed-off-by: Scoots Hamilton <scoots@redhat.com>
6 years agoMerge pull request #19571 from Fusl/patch-1
Casey Bodley [Thu, 18 Oct 2018 15:30:12 +0000 (11:30 -0400)]
Merge pull request #19571 from Fusl/patch-1

doc: doc/radosgw/s3.rst: Adding AWS S3 `Storage Class` as `Not Supported`

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24660 from tchaikov/wip-crimson-cleanup
Kefu Chai [Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)]
Merge pull request #24660 from tchaikov/wip-crimson-cleanup

crimson: crimson/mon: remove timeout support from mon::Client::authenticate()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24626 from jtlayton/wip-mgr-urlparse
jtlayton [Thu, 18 Oct 2018 12:32:17 +0000 (08:32 -0400)]
Merge pull request #24626 from jtlayton/wip-mgr-urlparse

mgr/rook: fix urljoin import

6 years agoMerge pull request #24604 from yangdongsheng/token_fix
Jason Dillaman [Thu, 18 Oct 2018 11:30:02 +0000 (07:30 -0400)]
Merge pull request #24604 from yangdongsheng/token_fix

common/Throttle: TokenBucketThrottle: use reference to m_blockers.front()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24653 from mynaramana/claydoc
Kefu Chai [Thu, 18 Oct 2018 04:37:56 +0000 (12:37 +0800)]
Merge pull request #24653 from mynaramana/claydoc

doc: erasure-code-clay fixes typos

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #22162 from liuzhanhao/master
Kefu Chai [Thu, 18 Oct 2018 04:29:07 +0000 (12:29 +0800)]
Merge pull request #22162 from liuzhanhao/master

doc: Update cpp.rst to accommodate the new APIs in libs3

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoosd: remove unused parameter 'dev' in OSD::mkfs function 24654/head
Yao Guotao [Thu, 18 Oct 2018 02:35:39 +0000 (10:35 +0800)]
osd: remove unused parameter 'dev' in OSD::mkfs function

Signed-off-by: Yao Guotao <yaoguot@gmail.com>
6 years agodoc: erasure-code-clay fixes typos 24653/head
Myna V [Wed, 17 Oct 2018 15:23:07 +0000 (20:53 +0530)]
doc: erasure-code-clay fixes typos

Signed-off-by: Myna <mynaramana@gmail.com>
6 years agotests/ceph-authtool: add reproducer for "with 0 caps" issue 23304/head
Nathan Cutler [Sun, 29 Jul 2018 20:20:11 +0000 (22:20 +0200)]
tests/ceph-authtool: add reproducer for "with 0 caps" issue

Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agotools: ceph-authtool: report correct number of caps when creating
Nathan Cutler [Sun, 29 Jul 2018 17:32:20 +0000 (19:32 +0200)]
tools: ceph-authtool: report correct number of caps when creating

Fixes: https://tracker.ceph.com/issues/23776
Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agorbd-mirror: always attempt to restart canceled status update task 24646/head
Jason Dillaman [Wed, 17 Oct 2018 21:16:05 +0000 (17:16 -0400)]
rbd-mirror: always attempt to restart canceled status update task

Fixes: http://tracker.ceph.com/issues/36500
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agocls/user: cls_user_remove_bucket writes modified header 24645/head
Casey Bodley [Wed, 17 Oct 2018 18:50:18 +0000 (14:50 -0400)]
cls/user: cls_user_remove_bucket writes modified header

if cls_user_remove_bucket() modifies the header with dec_header_stats(),
it should write the updated header back

Fixes: http://tracker.ceph.com/issues/36496
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #24503 into master
Patrick Donnelly [Wed, 17 Oct 2018 17:18:50 +0000 (10:18 -0700)]
Merge PR #24503 into master

* refs/pull/24503/head:
qa: increase timeout for cleanup

Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge PR #24455 into master
Patrick Donnelly [Wed, 17 Oct 2018 17:17:29 +0000 (10:17 -0700)]
Merge PR #24455 into master

* refs/pull/24455/head:
qa: use timeout for fs asok operations

Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge PR #24615 into master
Sage Weil [Wed, 17 Oct 2018 16:08:31 +0000 (11:08 -0500)]
Merge PR #24615 into master

* refs/pull/24615/head:
cmake: mark gcc 7 as minimum C++ compiler (due to std++17)

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #24617 from p-na/fix-python3-issue
Lenz Grimmer [Wed, 17 Oct 2018 16:06:58 +0000 (18:06 +0200)]
Merge pull request #24617 from p-na/fix-python3-issue

mgr/dashboard: Fix Python3 issue

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agocrimson/mon: remove timeout support from mon::Client::authenticate() 24660/head
Kefu Chai [Wed, 17 Oct 2018 11:38:30 +0000 (19:38 +0800)]
crimson/mon: remove timeout support from mon::Client::authenticate()

as the timeout parameter is not used by OSD.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: reuse common_mountcephfs_objs in crimson-common
Kefu Chai [Wed, 17 Oct 2018 02:54:55 +0000 (10:54 +0800)]
cmake: reuse common_mountcephfs_objs in crimson-common

so we won't built them twice.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #24102 into master
Sage Weil [Wed, 17 Oct 2018 15:07:15 +0000 (10:07 -0500)]
Merge PR #24102 into master

* refs/pull/24102/head:
global: fix err_to_stderr can't work when it was configured to false
osd: replace cout/derr with dout(0) to avoid writing trivial logs to syslog file

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24236 into master
Sage Weil [Wed, 17 Oct 2018 15:06:57 +0000 (10:06 -0500)]
Merge PR #24236 into master

* refs/pull/24236/head:
osd: Log error and abort if fails to pick address

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #24359 into master
Sage Weil [Wed, 17 Oct 2018 15:06:42 +0000 (10:06 -0500)]
Merge PR #24359 into master

* refs/pull/24359/head:
qa/tests: update ansible version to 2.6 for master branch testing.
qa/tests: use lvm as default for ceph-ansible testing, this should also work with raw devices

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge PR #24603 into master
Sage Weil [Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)]
Merge PR #24603 into master

* refs/pull/24603/head:
crush: get "ceph osd crush class create/rm" back

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24613 into master
Sage Weil [Wed, 17 Oct 2018 15:05:39 +0000 (10:05 -0500)]
Merge PR #24613 into master

* refs/pull/24613/head:
OSD: fix a typo err when increase recvoery bytes statistics

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #24586 from mynaramana/claydoc
Kefu Chai [Wed, 17 Oct 2018 14:55:38 +0000 (22:55 +0800)]
Merge pull request #24586 from mynaramana/claydoc

erasure-code: fixes alignment issue when clay code is used with jerasure, cauchy_orig

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #24625 into nautilus
Sage Weil [Wed, 17 Oct 2018 14:46:18 +0000 (09:46 -0500)]
Merge PR #24625 into nautilus

* refs/pull/24625/head:
qa/suites/rados/mgr/tasks/module_selftest: whitelist 'foo bar security'

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
6 years agomgr/rook: fix urljoin import 24626/head
Jeff Layton [Tue, 16 Oct 2018 22:53:32 +0000 (18:53 -0400)]
mgr/rook: fix urljoin import

This is the correct syntax to ensure that we get urljoin, no matter
the python version.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge pull request #24608 from cyx1231st/wip-seastar-msgr-accepting
Kefu Chai [Wed, 17 Oct 2018 13:51:22 +0000 (21:51 +0800)]
Merge pull request #24608 from cyx1231st/wip-seastar-msgr-accepting

crimson/net: implement accepting/connecting states

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: implement accepting/connecting states 24608/head
Yingxin [Mon, 15 Oct 2018 20:54:23 +0000 (04:54 +0800)]
crimson/net: implement accepting/connecting states

- introduce the new accepting/connecting connection states.
- return ConnectionRef immediately when connect().
- manage the ownership of the accepting connections.
- manage the ownership of the registered connections.
- encapsulate a Socket class because it is not created when constructing
  a SocketConnection, and allow it to be replaced in the future.
- refactor related interfaces.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
6 years agoMerge PR #24624 into master
Patrick Donnelly [Wed, 17 Oct 2018 13:42:49 +0000 (06:42 -0700)]
Merge PR #24624 into master

* refs/pull/24624/head:
client: Mutex::Locker -> std::lock_guard
mds: Mutex::Locker -> std::lock_guard

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoerasure-code: fixing bugs in clay-code plugin 24586/head
Myna V [Wed, 17 Oct 2018 04:31:22 +0000 (10:01 +0530)]
erasure-code: fixing bugs in clay-code plugin

* Fixes alignment issue while using clay code with jerasure, cauchy_orig
* Fixes ceph_erasure_code_non_regression to adapt to new decode

Signed-off-by: Myna <mynaramana@gmail.com>
6 years agoqa/suites/rados/mgr/tasks/module_selftest: whitelist 'foo bar security' 24625/head
Sage Weil [Tue, 16 Oct 2018 22:40:25 +0000 (17:40 -0500)]
qa/suites/rados/mgr/tasks/module_selftest: whitelist 'foo bar security'

Avoid failures like

"2018-10-16 20:36:00.437153 mgr.y (mgr.25609) 6 : cluster [SEC] foo bar security" in cluster log

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: Fix Python3 issue 24617/head
Patrick Nawracay [Tue, 16 Oct 2018 14:28:24 +0000 (16:28 +0200)]
mgr/dashboard: Fix Python3 issue

Which results in a 500 error when trying to access the `Performance
Counter` tab on the OSD list.

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agoMerge pull request #24629 from cyx1231st/wip-seastar-fix
Kefu Chai [Wed, 17 Oct 2018 11:22:03 +0000 (19:22 +0800)]
Merge pull request #24629 from cyx1231st/wip-seastar-fix

crimson/net: fix compile errors in test_alien_echo.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: fix compile errors 24629/head
Yingxin [Wed, 17 Oct 2018 15:12:45 +0000 (23:12 +0800)]
crimson/net: fix compile errors

test_alien_echo.cc is using common_init_finish, but it is not available
if defined WITH_SEASTAR.

Dispatcher::ms_verify_authorizer() is removed by PR#24095.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
6 years agoMerge pull request #24607 from p-na/fix-osd-list-status-labels
Lenz Grimmer [Wed, 17 Oct 2018 10:59:07 +0000 (12:59 +0200)]
Merge pull request #24607 from p-na/fix-osd-list-status-labels

mgr/dashboard: Fix spaces around status labels on OSD list

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24614 from s0nea/wip-dashboard-configs-textarea-vertical-resize
Lenz Grimmer [Wed, 17 Oct 2018 10:57:55 +0000 (12:57 +0200)]
Merge pull request #24614 from s0nea/wip-dashboard-configs-textarea-vertical-resize

mgr/dashboard: configs textarea disallow horizontal resize

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24631 from Devp00l/wip-issue-36466
Lenz Grimmer [Wed, 17 Oct 2018 10:56:21 +0000 (12:56 +0200)]
Merge pull request #24631 from Devp00l/wip-issue-36466

mgr/dashboard: Add left padding to helper icon

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Add left padding to helper icon 24631/head
Stephan Müller [Mon, 8 Oct 2018 15:07:11 +0000 (17:07 +0200)]
mgr/dashboard: Add left padding to helper icon

Fixes: https://tracker.ceph.com/issues/36466
Signed-off-by: Stephan Müller <smueller@suse.com>
6 years agomgr/dashboard: Add missing test requirement "werkzeug" 24628/head
Stephan Müller [Mon, 15 Oct 2018 14:55:00 +0000 (16:55 +0200)]
mgr/dashboard: Add missing test requirement "werkzeug"

Fixes: https://tracker.ceph.com/issues/36445
Signed-off-by: Stephan Müller <smueller@suse.com>
6 years agodoc: erasure-code cleanup of clay plugin documentation
Myna V [Wed, 17 Oct 2018 04:29:39 +0000 (09:59 +0530)]
doc: erasure-code cleanup of clay plugin documentation

Signed-off-by: Myna <mynaramana@gmail.com>
6 years agomgr/diskprediction: Solve predictor model file not backward compatibility 24611/head
hsiang41 [Tue, 16 Oct 2018 09:30:01 +0000 (17:30 +0800)]
mgr/diskprediction: Solve predictor model file not backward compatibility

Use pickle library instead of joblib library. It can avoid library not compatible with different operation system.

Signed-off-by: Rick Chen <rick.chen@prophetstor.com>
6 years agoTokenBucketThrottle: use reference to m_blockers.front() and then update it 24604/head
Dongsheng Yang [Mon, 15 Oct 2018 05:06:29 +0000 (01:06 -0400)]
TokenBucketThrottle: use reference to m_blockers.front() and then update it

As we need to update the blocker below, then we need to use reference to front object,
rather than a new object of blocker.

Fixes: http://tracker.ceph.com/issues/36475
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
6 years agoMerge PR #24578 into master
Sage Weil [Tue, 16 Oct 2018 22:57:24 +0000 (17:57 -0500)]
Merge PR #24578 into master

* refs/pull/24578/head:
pybind/ceph_argparse.py: do not create file for validating CephFilepath

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #24565 into master
Sage Weil [Tue, 16 Oct 2018 22:56:59 +0000 (17:56 -0500)]
Merge PR #24565 into master

* refs/pull/24565/head:
mgr: python 3 compat fixes

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
6 years agoMerge PR #24558 into master
Sage Weil [Tue, 16 Oct 2018 22:56:43 +0000 (17:56 -0500)]
Merge PR #24558 into master

* refs/pull/24558/head:
pybind/mgr: Fix Python 3 imports in diskprediction & insights

Reviewed-by: Noah Watkins <nwatkins@redhat.com>
6 years agoMerge PR #24528 into master
Sage Weil [Tue, 16 Oct 2018 22:55:59 +0000 (17:55 -0500)]
Merge PR #24528 into master

* refs/pull/24528/head:
common/condition_variable_debug: fix wait hooks
common/mutex_debug: remove no-op before/after hooks
common/mutex_debug: do lockdep post-lock step in caller
os/bluestore: {Mutex,Cond} -> ceph::{mutex,condition_variable}
os/bluestore: std::recursive_mutex -> ceph::recursive_mutex
os/bluestore: re-add is_locked assert
os/bluestore: std::{mutex,condition_variable} -> ceph::{mutex,condition_variable}
os/bluestore: use deduction for lock_guard<>, unique_lock<>

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
6 years agoMerge PR #24151 into master
Sage Weil [Tue, 16 Oct 2018 22:43:02 +0000 (17:43 -0500)]
Merge PR #24151 into master

* refs/pull/24151/head:
mgr/devicehealth: use is_valid_daemon_name helper
mgr/devicehealth: generalize to mon and osd daemons
mon: implement 'smart [devid]' tell command
mgr: parse mon metadata properly
mon: report device id used by mon
common/blkdev: add get_device_by_path
common/blkdev: migrate block_device_run_smartctl from OSD.cc

Reviewed-by: John Spray <john.spray@redhat.com>
6 years agoMerge PR #24566 into master
Sage Weil [Tue, 16 Oct 2018 19:34:19 +0000 (14:34 -0500)]
Merge PR #24566 into master

* refs/pull/24566/head:
osd,mon: keep last_epoch_started along with last_epoch_clean premerge

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agomgr: Mutex::Locker -> std::lock_guard 24623/head
Sage Weil [Tue, 16 Oct 2018 19:11:33 +0000 (14:11 -0500)]
mgr: Mutex::Locker -> std::lock_guard

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agokv: Mutex::Locker -> std::lock_guard
Sage Weil [Tue, 16 Oct 2018 19:11:21 +0000 (14:11 -0500)]
kv: Mutex::Locker -> std::lock_guard

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agolibrados: Mutex::Locker -> std::lock_guard
Sage Weil [Tue, 16 Oct 2018 19:10:37 +0000 (14:10 -0500)]
librados: Mutex::Locker -> std::lock_guard

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoclient: Mutex::Locker -> std::lock_guard 24624/head
Sage Weil [Tue, 16 Oct 2018 19:08:20 +0000 (14:08 -0500)]
client: Mutex::Locker -> std::lock_guard

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomds: Mutex::Locker -> std::lock_guard
Sage Weil [Tue, 16 Oct 2018 19:07:33 +0000 (14:07 -0500)]
mds: Mutex::Locker -> std::lock_guard

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