]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agocommon: prefer std::size to ARRAY_SIZE macro 24703/head
Yao Zongyou [Tue, 23 Oct 2018 04:52:46 +0000 (12:52 +0800)]
common: prefer std::size to ARRAY_SIZE macro

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
6 years agoMerge pull request #19964 from runsisi/wip-build
Kefu Chai [Wed, 24 Oct 2018 02:01:37 +0000 (10:01 +0800)]
Merge pull request #19964 from runsisi/wip-build

cmake: move ceph-osdomap-tool, ceph-monstore-tool out of ceph-test

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #24540 into master
Patrick Donnelly [Tue, 23 Oct 2018 22:32:55 +0000 (15:32 -0700)]
Merge PR #24540 into master

* refs/pull/24540/head:
mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #24709 into master
Patrick Donnelly [Tue, 23 Oct 2018 22:24:09 +0000 (15:24 -0700)]
Merge PR #24709 into master

* refs/pull/24709/head:
PendingReleaseNotes: note about cephfs client state reclaim

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #24466 into master
Patrick Donnelly [Tue, 23 Oct 2018 22:02:26 +0000 (15:02 -0700)]
Merge PR #24466 into master

* refs/pull/24466/head:
common: assert if buffer advance length overflow

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #24529 into master
Patrick Donnelly [Tue, 23 Oct 2018 22:01:53 +0000 (15:01 -0700)]
Merge PR #24529 into master

* refs/pull/24529/head:
mds: cleanup command descriptions

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #24640 into master
Patrick Donnelly [Tue, 23 Oct 2018 22:01:14 +0000 (15:01 -0700)]
Merge PR #24640 into master

* refs/pull/24640/head:
mds: remove MonClient reconnect

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #24533 into master
Patrick Donnelly [Tue, 23 Oct 2018 21:46:34 +0000 (14:46 -0700)]
Merge PR #24533 into master

* refs/pull/24533/head:
qa: add timeouts for remote ops for client mounts

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge pull request #24679 from tspmelo/wip-36528
Lenz Grimmer [Tue, 23 Oct 2018 21:23:18 +0000 (23:23 +0200)]
Merge pull request #24679 from tspmelo/wip-36528

mgr/dashboard: Fix HttpClient Module imports in unit tests

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #24632 from Devp00l/wip-issue-36468
Lenz Grimmer [Tue, 23 Oct 2018 21:22:05 +0000 (23:22 +0200)]
Merge pull request #24632 from Devp00l/wip-issue-36468

mgr/dashboard: Handle class objects as regular objects in KV-table

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24674 from sileht/master
Alfredo Deza [Tue, 23 Oct 2018 20:04:54 +0000 (15:04 -0500)]
Merge pull request #24674 from sileht/master

ceph-volume: extract flake8 config

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #23242 from linuxbox2/wip-rgw-inflight-ops
Matt Benjamin [Tue, 23 Oct 2018 15:21:10 +0000 (11:21 -0400)]
Merge pull request #23242 from linuxbox2/wip-rgw-inflight-ops

rgw: set default objecter_inflight_ops = 24576

6 years agoMerge pull request #24692 from tchaikov/wip-cmake-with-asan
Kefu Chai [Tue, 23 Oct 2018 11:26:59 +0000 (19:26 +0800)]
Merge pull request #24692 from tchaikov/wip-cmake-with-asan

cmake: fixes to enable WITH_ASAN with clang and GCC

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24664 from tspmelo/wip-36513
Lenz Grimmer [Tue, 23 Oct 2018 10:59:06 +0000 (12:59 +0200)]
Merge pull request #24664 from tspmelo/wip-36513

mgr/dashboard: Fix missing failed restore notification

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #24637 from ricardoasmarques/fix-rbd-actions-disable
Lenz Grimmer [Tue, 23 Oct 2018 10:35:53 +0000 (12:35 +0200)]
Merge pull request #24637 from ricardoasmarques/fix-rbd-actions-disable

mgr/dashboard: Fix RBD actions disable

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24612 from Tinatinak/fix_bug24548
Lenz Grimmer [Tue, 23 Oct 2018 10:28:57 +0000 (12:28 +0200)]
Merge pull request #24612 from Tinatinak/fix_bug24548

mgr/dashboard: Fixed documentation link on RGW page

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Fix HttpClient Module imports in unit tests 24679/head
Tiago Melo [Fri, 19 Oct 2018 15:56:21 +0000 (16:56 +0100)]
mgr/dashboard: Fix HttpClient Module imports in unit tests

Some of the tests were importing the wrong HttpClient Module and that was
causing random errors.

Fixes: https://tracker.ceph.com/issues/36528
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Fix missing failed restore notification 24664/head
Tiago Melo [Thu, 18 Oct 2018 16:00:46 +0000 (17:00 +0100)]
mgr/dashboard: Fix missing failed restore notification

Fixes: http://tracker.ceph.com/issues/36513
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24544 from votdev/bug_24729
Lenz Grimmer [Tue, 23 Oct 2018 06:50:14 +0000 (08:50 +0200)]
Merge pull request #24544 from votdev/bug_24729

mgr/dashboard: Confirmation modal doesn't close

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #24699 from rhcs-dashboard/add-tslint-rule
Lenz Grimmer [Tue, 23 Oct 2018 06:48:54 +0000 (08:48 +0200)]
Merge pull request #24699 from rhcs-dashboard/add-tslint-rule

mgr/dashboard: Add TSLint rule "no-unused-variable"

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #24694 from tspmelo/wip-36544
Lenz Grimmer [Tue, 23 Oct 2018 06:47:55 +0000 (08:47 +0200)]
Merge pull request #24694 from tspmelo/wip-36544

mgr/dashboard: Fix problem with ErasureCodeProfileService

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #24696 from dillaman/wip-36542
Mykola Golub [Tue, 23 Oct 2018 06:41:43 +0000 (09:41 +0300)]
Merge pull request #24696 from dillaman/wip-36542

qa/tasks/qemu: use unique clone directory to avoid race with workunit

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #24698 into master
Sage Weil [Tue, 23 Oct 2018 03:46:23 +0000 (22:46 -0500)]
Merge PR #24698 into master

* refs/pull/24698/head:
Merge PR #24697 into nautilus
ceph_test_msgr: fix authorizer behavior
Merge pull request #24667 from liewegas/wip-ec-thrash-full
Merge PR #24689 into nautilus
qa/suites/rados/thrash-erasure-code*/thrashers/*: less likely resv rejection injection

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #24691 from iridescent-rsy/fix_typo
Kefu Chai [Tue, 23 Oct 2018 02:56:13 +0000 (10:56 +0800)]
Merge pull request #24691 from iridescent-rsy/fix_typo

common: fix typos in BackoffThrottle

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #24697 into nautilus 24698/head
Sage Weil [Tue, 23 Oct 2018 01:45:40 +0000 (20:45 -0500)]
Merge PR #24697 into nautilus

* refs/pull/24697/head:
ceph_test_msgr: fix authorizer behavior

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #24652 from badone/wip-undefined-gperftool-symbols-2
Brad Hubbard [Mon, 22 Oct 2018 23:37:35 +0000 (09:37 +1000)]
Merge pull request #24652 from badone/wip-undefined-gperftool-symbols-2

rpm: Use updated gperftools-libs at runtime

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agomgr/dashboard: Add TSLint rule 24699/head
alfonsomthd [Mon, 22 Oct 2018 17:38:38 +0000 (19:38 +0200)]
mgr/dashboard: Add TSLint rule
- TSlint no-unused-variable rule added.
- Cleanup: unused imports and variables.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agoMerge pull request #24591 from tspmelo/wip-testing-module
Lenz Grimmer [Mon, 22 Oct 2018 17:33:53 +0000 (19:33 +0200)]
Merge pull request #24591 from tspmelo/wip-testing-module

mgr/dashboard: Unit Tests cleanup

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoceph_test_msgr: fix authorizer behavior 24697/head
Sage Weil [Mon, 22 Oct 2018 15:00:28 +0000 (10:00 -0500)]
ceph_test_msgr: fix authorizer behavior

Fixes breakage from this PR 2152d8ffb73a507a3d08d48b38c5a8e73f887138.

Fixes: http://tracker.ceph.com/issues/36495
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_assert.h: do not pack assert params if WITH_ASAN 24692/head
Kefu Chai [Mon, 22 Oct 2018 08:41:45 +0000 (16:41 +0800)]
include/ceph_assert.h: do not pack assert params if WITH_ASAN

we pack the asset() params for smaller code size, but this creates a
inlined `assert_data_ctx` instance for every compilation unit which
call ceph_assert() defined in .h .

__PRETTY_FUNCTION__ is likely to be referenced by `assert_data_ctx`
sections which are included by different compiled object files. if the
ceph_assert() call is used by header file, then there will be multiple
`assert_data_ctx` sections sharing the same identifier. these sections are
defined as "COMDAT" group sections, i.e. common data sections. when linker
see multiple COMDAT sections with the same identifer, it will simply discard
the duplicated ones, and only keep a single copy of them. without enabling
ASan, GCC can always handle this problem just fine. but the dedup feature
does not work well with ASan. if ASan is enabled, and we link the objects
with the wrong order, some references will be pointing to the discarded
sections.

to address this issue, we could audit the link command line and inspect
all .o files to make sure they are properly ordered. but this is
non-trivial. as a workaround, in this change, the assert params are not
packed, and sent to the  __ceph_assert_fail() overrides which accepts
unpacked params directly, so the COMDAT section is not created.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoqa/tasks/qemu: use unique clone directory to avoid race with workunit 24696/head
Jason Dillaman [Mon, 22 Oct 2018 14:44:40 +0000 (10:44 -0400)]
qa/tasks/qemu: use unique clone directory to avoid race with workunit

If there is a workunit task associated with the same client, the two
tasks will attempt to clone the suite repo to the same directory.
Worse, if it's parallel tasks, the two clones will clobber each
other.

Fixes: http://tracker.ceph.com/issues/36542
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24667 from liewegas/wip-ec-thrash-full
Josh Durgin [Mon, 22 Oct 2018 14:39:26 +0000 (07:39 -0700)]
Merge pull request #24667 from liewegas/wip-ec-thrash-full

qa/suites/rados/thrash-erasure-code*/thrashers/*: less likely resv rejection injection

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #23103 from ifed01/wip-ifed-bluefs-migrate
Kefu Chai [Mon, 22 Oct 2018 14:33:08 +0000 (22:33 +0800)]
Merge pull request #23103 from ifed01/wip-ifed-bluefs-migrate

os/bluestore: allow ceph-bluestore-tool to coalesce, add and migrate BlueFS backing volumes

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #23090 from mingshuaiwang/master
Kefu Chai [Mon, 22 Oct 2018 14:30:41 +0000 (22:30 +0800)]
Merge pull request #23090 from mingshuaiwang/master

OSD: ceph-osd parent process need to restart log service after fork

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #24689 into nautilus
Sage Weil [Mon, 22 Oct 2018 14:20:50 +0000 (09:20 -0500)]
Merge PR #24689 into nautilus

* refs/pull/24689/head:
qa/tasks/ceph_manager: fix get_stuck_pgs from pg dump change

Reviewed-by: Kefu Chai <kchai@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 agomgr/dashboard: Fix RBD actions disable 24637/head
Ricardo Marques [Wed, 17 Oct 2018 13:10:46 +0000 (14:10 +0100)]
mgr/dashboard: Fix RBD actions disable

Fixes: https://tracker.ceph.com/issues/36403
Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agomgr/dashboard: Confirmation modal doesn't close 24544/head
Volker Theile [Thu, 11 Oct 2018 13:02:39 +0000 (15:02 +0200)]
mgr/dashboard: Confirmation modal doesn't close

Fixes: https://tracker.ceph.com/issues/24729
Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agomgr/dashboard: Fix problem with ErasureCodeProfileService 24694/head
Tiago Melo [Mon, 22 Oct 2018 10:57:01 +0000 (11:57 +0100)]
mgr/dashboard: Fix problem with ErasureCodeProfileService

ErasureCodeProfileService was being provided twice and that was causing
problems in production mode.

Fixes: https://tracker.ceph.com/issues/36544
Signed-off-by: Tiago Melo <tmelo@suse.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 agoinclude/ceph_assert: always use __PRETTY_FUNCTION__ for C++
Kefu Chai [Mon, 22 Oct 2018 08:07:13 +0000 (16:07 +0800)]
include/ceph_assert: always use __PRETTY_FUNCTION__ for C++

we've moved to GCC-7, no need to check for ancient compiler versions

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake,ceph.in: preload libasan if WITH_ASAN
Kefu Chai [Mon, 22 Oct 2018 06:06:38 +0000 (14:06 +0800)]
cmake,ceph.in: preload libasan if WITH_ASAN

we need to preload libasan.so as the python exectuable is not likely to
be compiled with ASan enabled.
see:
https://github.com/google/sanitizers/wiki/AddressSanitizerAsDso#asan-and-ld_preload

just to ease the use of ASan, for fine-tuned behaviour, use
`ASAN_OPTIONS`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoceph.in: extract get_cmake_variables()
Kefu Chai [Mon, 22 Oct 2018 05:13:49 +0000 (13:13 +0800)]
ceph.in: extract get_cmake_variables()

so it can be reused

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: should compile libzstd with -fPIC
Kefu Chai [Mon, 22 Oct 2018 05:13:11 +0000 (13:13 +0800)]
cmake: should compile libzstd with -fPIC

otherwise we will have

/usr/bin/ld: libzstd/lib/libzstd.a(error_private.c.o): relocation
R_X86_64_32S against `.rodata' can not be used when making a shared
object; recompile with -fPIC

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: pass Sanitizers flags to linker for linking .so
Kefu Chai [Mon, 22 Oct 2018 04:42:10 +0000 (12:42 +0800)]
cmake: pass Sanitizers flags to linker for linking .so

see
https://github.com/google/sanitizers/wiki/AddressSanitizer#using-addresssanitizer

to be specific,

> In order to use AddressSanitizer you will need to compile and link your
> program using `clang` with the `-fsanitize=address` switch.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: pass cflags to disutils using CC instead of CFLAGS
Kefu Chai [Mon, 22 Oct 2018 04:28:01 +0000 (12:28 +0800)]
cmake: pass cflags to disutils using CC instead of CFLAGS

in python's distutils.ccompiler, linker_exe is composed using CC instead
of LDFLAGS. the latter only effects how it builds (shared) library.

and put CMAKE_C_FLAGS into the cflags for the compiler for building
python C extensions, it's more consistent this way. more importantly,
if we build with ASan enabled, the canary program, a.k.a. rados_dummy.c,
won't link without proper CFLAGS.

without this change, rados.so fails to build with errors like:

/usr/bin/ld: /var/ssd/ceph/build/lib/librados.so: undefined reference to
`__asan_stack_free_10'
/usr/bin/ld: /var/ssd/ceph/build/lib/librados.so: undefined reference to
`__asan_report_exp_store8'
...
...

clang: error: linker command failed with exit code 1 (use -v to see
invocation)

Link Error: RADOS library not found
make[3]: ***
[src/pybind/rados/CMakeFiles/cython_rados.dir/build.make:57:
src/pybind/rados/CMakeFiles/cython_rados] Error 1

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/TextTable: define endrow
Kefu Chai [Mon, 22 Oct 2018 03:38:57 +0000 (11:38 +0800)]
common/TextTable: define endrow

otherwise "cmake -DWITH_ASAN=ON -DCMAKE_BUILD_TYPE=Debug" will fail to
build with

/usr/bin/ld: //var/ssd/ceph/build/lib/libceph-common.so.0: undefined
reference to `TextTable::endrow'

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon: fix typos in BackoffThrottle 24691/head
Shiyang Ruan [Mon, 22 Oct 2018 05:06:34 +0000 (13:06 +0800)]
common: fix typos in BackoffThrottle

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
6 years agoPendingReleaseNotes: note about cephfs client state reclaim 24709/head
Yan, Zheng [Mon, 22 Oct 2018 03:57:08 +0000 (11:57 +0800)]
PendingReleaseNotes: note about cephfs client state reclaim

Fixes: http://tracker.ceph.com/issues/36394
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
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 agoceph-volume: extract flake8 config 24674/head
Mehdi Abaakouk [Fri, 19 Oct 2018 10:02:48 +0000 (12:02 +0200)]
ceph-volume: extract flake8 config

It's preferable to use [flake8] section to configure flake8.

So external tools/editor can read the configuration.

Signed-off-by: Mehdi Abaakouk <sileht@sileht.net>
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 agoqa/suites/rados/thrash-erasure-code*/thrashers/*: less likely resv rejection injection 24667/head
Sage Weil [Thu, 18 Oct 2018 22:15:08 +0000 (17:15 -0500)]
qa/suites/rados/thrash-erasure-code*/thrashers/*: less likely resv rejection injection

For EC pools we have a lot of shards, and 30% probability on each one
means we are very like to repeatedly fail backfill reservations.. long
enough that teuthology gives up waiting.

Signed-off-by: Sage Weil <sage@redhat.com>
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 agomgr/dashboard: Fixed documentation link on RGW page 24612/head
Tina Kallio [Mon, 15 Oct 2018 18:32:42 +0000 (20:32 +0200)]
mgr/dashboard: Fixed documentation link on RGW page

Fixes: https://tracker.ceph.com/issues/24548
Signed-off-by: Tina Kallio <tina.kallio@gmail.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>