]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoqa/workunits/rados: test pool op permissions
Jason Dillaman [Thu, 21 Jun 2018 02:20:14 +0000 (22:20 -0400)]
qa/workunits/rados: test pool op permissions

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

Conflicts:
qa/workunits/rados/test_pool_access.sh: use CEPH_KEYRING env variable

7 years agoqa/workunits/rbd: test self-managed snapshot create/remove permissions
Jason Dillaman [Tue, 5 Jun 2018 19:40:44 +0000 (15:40 -0400)]
qa/workunits/rbd: test self-managed snapshot create/remove permissions

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

Conflicts:
qa/workunits/rbd/permissions.sh: use CEPH_KEYRING env variable

7 years agopybind/rados: new methods for manipulating self-managed snapshots
Jason Dillaman [Tue, 5 Jun 2018 18:48:17 +0000 (14:48 -0400)]
pybind/rados: new methods for manipulating self-managed snapshots

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 21538304d78df9f3b9f54a5b3c9b6b62fc3e6b48)
(cherry picked from commit 5bd343db3903d8aca45a40436a6dc240bdc1a0f3)

7 years agomon/OSDMonitor: enforce caps for all remaining pool ops
Jason Dillaman [Thu, 21 Jun 2018 01:30:47 +0000 (21:30 -0400)]
mon/OSDMonitor: enforce caps for all remaining pool ops

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

7 years agomon/OSDMonitor: enforce caps when creating/deleting unmanaged snapshots
Jason Dillaman [Tue, 5 Jun 2018 17:24:48 +0000 (13:24 -0400)]
mon/OSDMonitor: enforce caps when creating/deleting unmanaged snapshots

The entity will require write access to the OSD service or permission
for the synthetic "osd pool op unmanaged-snap" command.

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

Conflicts:
src/mon/OSDMonitor.cc: use 'bufferlist::begin' instead of 'bufferlist::cbegin'
(cherry picked from commit 3dfb23d036c068ec5166151ed63628738d68908a)

Conflicts:
src/mon/CMakeLists.txt: added 'OSDCap.cc'

7 years agoMerge pull request #21368 from smithfarm/wip-23675-luminous
Yuri Weinstein [Fri, 22 Jun 2018 16:25:45 +0000 (09:25 -0700)]
Merge pull request #21368 from smithfarm/wip-23675-luminous

luminous: qa/workunits/mon/test_mon_config_key.py fails on master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22115 from pdvian/wip-24048-luminous
Yuri Weinstein [Fri, 22 Jun 2018 16:24:59 +0000 (09:24 -0700)]
Merge pull request #22115 from pdvian/wip-24048-luminous

luminous: crush, osd: handle multiple parents properly when applying pg upmaps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #22215 from tchaikov/luminous-24025
Yuri Weinstein [Fri, 22 Jun 2018 16:24:18 +0000 (09:24 -0700)]
Merge pull request #22215 from tchaikov/luminous-24025

luminous: cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22269 from xiaoxichen/backport_22243
Yuri Weinstein [Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)]
Merge pull request #22269 from xiaoxichen/backport_22243

luminous: mon/OSDMonitor: Respect paxos_propose_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22296 from tchaikov/luminous-24321
Yuri Weinstein [Fri, 22 Jun 2018 16:22:55 +0000 (09:22 -0700)]
Merge pull request #22296 from tchaikov/luminous-24321

luminous: qa: wait longer for osd to flush pg stats

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22366 from b-ranto/wip-branto-mgr-luminous
Yuri Weinstein [Fri, 22 Jun 2018 16:22:16 +0000 (09:22 -0700)]
Merge pull request #22366 from b-ranto/wip-branto-mgr-luminous

luminous: Sync up ceph-mgr prometheus module

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #22650 from liewegas/wip-24319-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:30:03 +0000 (17:30 -0700)]
Merge pull request #22650 from liewegas/wip-24319-luminous

luminous: os/bluestore: fix SharedBlobSet refcounting race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22567 from pdvian/wip-24334-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:23:44 +0000 (17:23 -0700)]
Merge pull request #22567 from pdvian/wip-24334-luminous

luminous: ARMv8 feature detection broken, leading to illegal instruction crashes

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22568 from pdvian/wip-24351-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:23:10 +0000 (17:23 -0700)]
Merge pull request #22568 from pdvian/wip-24351-luminous

luminous: slow mon ops from osd_failure

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #22381 from pdvian/wip-24258-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:21:11 +0000 (17:21 -0700)]
Merge pull request #22381 from pdvian/wip-24258-luminous

luminous: crush: fix device_class_clone for unpopulated/empty weight-sets

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22391 from pdvian/wip-24290-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:20:37 +0000 (17:20 -0700)]
Merge pull request #22391 from pdvian/wip-24290-luminous

luminous: common: fix typo in rados bench write JSON output

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #22592 from pdvian/wip-24356-luminous
Yuri Weinstein [Fri, 22 Jun 2018 00:18:27 +0000 (17:18 -0700)]
Merge pull request #22592 from pdvian/wip-24356-luminous

luminous: osd: increase default hard pg limit

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22474 from yuriw/wip-yuriw-p2p-luminous
Josh Durgin [Thu, 21 Jun 2018 23:56:16 +0000 (16:56 -0700)]
Merge pull request #22474 from yuriw/wip-yuriw-p2p-luminous

qa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded 22474/head
Yuri Weinstein [Fri, 8 Jun 2018 14:53:37 +0000 (07:53 -0700)]
qa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #22641 from ceph/backport-luminous-22627
Alfredo Deza [Thu, 21 Jun 2018 13:58:13 +0000 (09:58 -0400)]
Merge pull request #22641 from ceph/backport-luminous-22627

luminous: lvm: when osd creation fails log the exception

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #22201 from batrick/i24185
Yuri Weinstein [Wed, 20 Jun 2018 19:58:52 +0000 (12:58 -0700)]
Merge pull request #22201 from batrick/i24185

luminous: client: anchor dentries for trimming to make cap traversal safe

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
7 years agoMerge pull request #22558 from pdvian/wip-24331-luminous
Yuri Weinstein [Wed, 20 Jun 2018 19:58:02 +0000 (12:58 -0700)]
Merge pull request #22558 from pdvian/wip-24331-luminous

luminous: mon/MDSMonitor: do not send redundant MDS health messages to cluster log

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #22603 from batrick/i23792
Yuri Weinstein [Wed, 20 Jun 2018 19:57:35 +0000 (12:57 -0700)]
Merge pull request #22603 from batrick/i23792

luminous: MDSMonitor: crash after assigning standby-replay daemon in multifs setup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/suites/rados/objecstore/backends/objectstore: capture coredumps 22650/head
Sage Weil [Mon, 18 Jun 2018 20:35:38 +0000 (15:35 -0500)]
qa/suites/rados/objecstore/backends/objectstore: capture coredumps

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

7 years agoos/bluestore: more debug output
Sage Weil [Fri, 15 Jun 2018 19:13:14 +0000 (14:13 -0500)]
os/bluestore: more debug output

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

7 years agoos/bluestore: print cnode from _open_collections
Sage Weil [Thu, 14 Jun 2018 19:15:20 +0000 (14:15 -0500)]
os/bluestore: print cnode from _open_collections

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

7 years agoos/bluestore: print cnode on fsck
Sage Weil [Fri, 15 Jun 2018 15:41:25 +0000 (10:41 -0500)]
os/bluestore: print cnode on fsck

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

7 years agoqa/suites/rados/objecstore: preserve data dir for ceph_test_objecstore
Sage Weil [Wed, 13 Jun 2018 11:55:18 +0000 (06:55 -0500)]
qa/suites/rados/objecstore: preserve data dir for ceph_test_objecstore

If we fail, preserve the data directory.

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

7 years agoos/bluestore: fix SharedBlobSet deregister race
Sage Weil [Sun, 10 Jun 2018 20:57:31 +0000 (15:57 -0500)]
os/bluestore: fix SharedBlobSet deregister race

In commit 8c8944b2c45ca9dc5b8fd4db1590e1d24206c0b3 we fixed one narrow race
and introduced a new (probably less narrow) one:

A: put shared blob foo, nref = 0, start removing self from set
B: open_shared_blob -> lookup gets nullptr (nref==null), creates a new shared blob
  B: takes lock, sets sb_map[sbid] = newblob
A: gets lock, erases sb_map[sbid]
B: open_shared_blob -> lookup gets null, creates another new shared blob

Fix by only removing the sb_map entry for the nref=0 sb if it still points
to us.  If it doesn't, that means some new blob has shown up in its place.

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

7 years agoMerge pull request #22438 from pdvian/wip-24298-luminous
Yuri Weinstein [Wed, 20 Jun 2018 16:44:42 +0000 (09:44 -0700)]
Merge pull request #22438 from pdvian/wip-24298-luminous

luminous: rgw: fix 'copy part' without 'x-amz-copy-source-range' when compressi…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22465 from pdvian/wip-24302-luminous
Yuri Weinstein [Wed, 20 Jun 2018 16:42:22 +0000 (09:42 -0700)]
Merge pull request #22465 from pdvian/wip-24302-luminous

luminous: rgw: Allow swift acls to be deleted.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22541 from pdvian/wip-24314-luminous
Yuri Weinstein [Wed, 20 Jun 2018 16:41:57 +0000 (09:41 -0700)]
Merge pull request #22541 from pdvian/wip-24314-luminous

luminous: test/rgw: fix for bucket checkpoints

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22551 from smithfarm/wip-24477-luminous
Yuri Weinstein [Wed, 20 Jun 2018 16:41:30 +0000 (09:41 -0700)]
Merge pull request #22551 from smithfarm/wip-24477-luminous

luminous: Bucket lifecycles stick around after buckets are deleted

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agolvm: when osd creation fails log the exception 22641/head
Andrew Schoen [Tue, 19 Jun 2018 19:34:57 +0000 (14:34 -0500)]
lvm: when osd creation fails log the exception

Fixes: http://tracker.ceph.com/issues/24456
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit d622dadef09a53d24c6a7b9119051594f8da1cae)

7 years agoclient: delay dentry trimming until after cap traversal 22201/head
Patrick Donnelly [Fri, 18 May 2018 00:06:52 +0000 (17:06 -0700)]
client: delay dentry trimming until after cap traversal

Fixes: http://tracker.ceph.com/issues/24137
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9199179799b41d9534b27bcceefc1bc9f2763bac)

Conflicts:
    src/client/Client.cc

7 years agomon: respect standby_for_fscid when choosing standby replay mds 22603/head
Yan, Zheng [Thu, 19 Apr 2018 02:44:11 +0000 (10:44 +0800)]
mon: respect standby_for_fscid when choosing standby replay mds

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e3a38e9e89577f54c8a52fa32b3e0d14fe8e7088)

7 years agomon: fix standby replay in multimds setup
Yan, Zheng [Thu, 19 Apr 2018 02:15:23 +0000 (10:15 +0800)]
mon: fix standby replay in multimds setup

The code should break loops for two level. otherwise, in multimds setup,
a standby mds may get assigned to standby replay multiple times. This
bug may cause monitor to crash.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23658
(cherry picked from commit 8d40e21de0a115cc92e4da04ec61a34ac59145e1)

7 years agoosd: increase default hard pg limit 22592/head
Josh Durgin [Wed, 23 May 2018 16:17:04 +0000 (09:17 -0700)]
osd: increase default hard pg limit

The hard limit was too easy to hit during failure cases, especially
due to mismatched device sizes causing high variance in pgs/osd.

Fixes: https://tracker.ceph.com/issues/24243
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit dfdedce89521f89046fb13287d9fdd683c91e242)

7 years agomon/OSDMonitor: no_reply on MOSDFailure ops we eventually process 22568/head
Sage Weil [Sun, 27 May 2018 14:55:04 +0000 (09:55 -0500)]
mon/OSDMonitor: no_reply on MOSDFailure ops we eventually process

Failure ops get attached to the failure report.  Once we finally process
them, mark them no_reply so that the forwarding mon will know about it.
The other paths through prepare_failure() do no_reply on the messages
that don't get logged in the failure_info_t::reporters.

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

7 years agomon/OSDMonitor: no_reply on ignored MOSDFailure
Sage Weil [Sun, 27 May 2018 14:49:37 +0000 (09:49 -0500)]
mon/OSDMonitor: no_reply on ignored MOSDFailure

If we are ignoring the message, tell the forwarding mon to discard it's
state.

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

7 years agocommon/arch/arm: Improve CPU feature check. 22567/head
Adam Kupczyk [Thu, 24 May 2018 11:25:02 +0000 (13:25 +0200)]
common/arch/arm: Improve CPU feature check.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit d998580c7dbeff5ced5e9eb1e11d160a2a8d7852)

7 years agocommon/crc/aarch64: Added cpu feature pmull and make aarch64 specific crc function...
Adam Kupczyk [Wed, 23 May 2018 13:06:19 +0000 (15:06 +0200)]
common/crc/aarch64: Added cpu feature pmull and make aarch64 specific crc function to depend on it.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 90b1c1f1c4a57a59f598cd93dc9ce8a1532db238)

7 years agomon/MDSMonitor: do not send redundant MDS health messages to cluster log 22558/head
Sage Weil [Fri, 25 May 2018 16:42:49 +0000 (11:42 -0500)]
mon/MDSMonitor: do not send redundant MDS health messages to cluster log

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

7 years agoMerge pull request #22109 from tchaikov/luminous-24180
Yuri Weinstein [Wed, 13 Jun 2018 22:00:56 +0000 (15:00 -0700)]
Merge pull request #22109 from tchaikov/luminous-24180

luminous: mon/LogMonitor: call no_reply() on ignored log message

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22290 from pdvian/wip-24216-luminous
Yuri Weinstein [Wed, 13 Jun 2018 22:00:19 +0000 (15:00 -0700)]
Merge pull request #22290 from pdvian/wip-24216-luminous

luminous: common: partially revert 95fc248 to make get_process_name work

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22308 from pdvian/wip-24214-luminous
Yuri Weinstein [Wed, 13 Jun 2018 21:59:36 +0000 (14:59 -0700)]
Merge pull request #22308 from pdvian/wip-24214-luminous

luminous: Module 'balancer' has failed: could not find bucket -14

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22414 from wido/luminous-influx
Yuri Weinstein [Wed, 13 Jun 2018 21:59:14 +0000 (14:59 -0700)]
Merge pull request #22414 from wido/luminous-influx

luminous: backport various fixes to mgr/influx module

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoqa: test for trim_caps segfault for trimmed dentries
Patrick Donnelly [Fri, 18 May 2018 02:36:42 +0000 (19:36 -0700)]
qa: test for trim_caps segfault for trimmed dentries

Test case by Yan Zheng [1].

[1] http://tracker.ceph.com/issues/24137#note-6

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit abb2fa4d5bcba7ae7318c384cd10da348f68fd78)

7 years agorgw: add tenant to shard_id in RGWDeleteLC::execute() 22551/head
weiqiaomiao [Wed, 27 Jul 2016 00:58:33 +0000 (08:58 +0800)]
rgw: add tenant to shard_id in RGWDeleteLC::execute()

in RGWDeleteLC::execute(), we should add bucket.tenant to shard_id,
otherwise, the lc entry can't delete after this op

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 3e7cffb17ed6a473ecbcf8475a72dd2416e077f4)

Conflicts:
src/rgw/rgw_op.cc - luminous does not have 3e528f1ee837a09e1337283a2992e81a87f1bd98

7 years agotest/rgw: fix for bucket checkpoints 22541/head
Casey Bodley [Mon, 21 May 2018 14:42:06 +0000 (10:42 -0400)]
test/rgw: fix for bucket checkpoints

both zones must complete a checkpoint before comparing their bucket contents

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

7 years agoMerge pull request #22530 from ceph/backport-luminous-22062
Alfredo Deza [Tue, 12 Jun 2018 14:40:35 +0000 (10:40 -0400)]
Merge pull request #22530 from ceph/backport-luminous-22062

luminous: ceph-volume dmcrypt and activate --all documentation updates

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/man/ceph-volume explain encryption and activate all with examples 22530/head
Alfredo Deza [Thu, 17 May 2018 13:40:15 +0000 (09:40 -0400)]
doc/man/ceph-volume explain encryption and activate all with examples

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

7 years agodoc/ceph-volume activate is able to use --all for existing OSDs
Alfredo Deza [Thu, 17 May 2018 13:05:52 +0000 (09:05 -0400)]
doc/ceph-volume activate is able to use --all for existing OSDs

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

Conflicts:
doc/ceph-volume/lvm/activate.rst

7 years agodoc/ceph-volume encryption is enabled with the --dmcrypt flag
Alfredo Deza [Thu, 17 May 2018 12:46:03 +0000 (08:46 -0400)]
doc/ceph-volume encryption is enabled with the --dmcrypt flag

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

7 years agodoc/ceph-volume prepapre accepts a --dmcrypt flag
Alfredo Deza [Thu, 17 May 2018 12:45:26 +0000 (08:45 -0400)]
doc/ceph-volume prepapre accepts a --dmcrypt flag

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

7 years agodoc/ceph-volume activate does not need a dmcrypt flag
Alfredo Deza [Thu, 17 May 2018 12:44:41 +0000 (08:44 -0400)]
doc/ceph-volume activate does not need a dmcrypt flag

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

7 years agoMerge pull request #22510 from ceph/backport-luminous-22399
Alfredo Deza [Tue, 12 Jun 2018 10:47:51 +0000 (06:47 -0400)]
Merge pull request #22510 from ceph/backport-luminous-22399

luminous: ceph-volume tests do not include admin keyring in OSD nodes

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #22506 from ceph/backport-luminous-22437
Alfredo Deza [Tue, 12 Jun 2018 10:45:36 +0000 (06:45 -0400)]
Merge pull request #22506 from ceph/backport-luminous-22437

luminous: ceph-volume tests destroy osds on monitor hosts

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #22513 from ceph/backport-luminous-21890
Alfredo Deza [Tue, 12 Jun 2018 10:44:54 +0000 (06:44 -0400)]
Merge pull request #22513 from ceph/backport-luminous-21890

luminous: ceph-volume describe better the options for migrating away from ceph-disk

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/rados add an anchor to reference replacing osds 22513/head
Alfredo Deza [Tue, 8 May 2018 17:48:20 +0000 (13:48 -0400)]
doc/rados add an anchor to reference replacing osds

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

7 years agodoc/ceph-volume describe the options for migrating away from ceph-disk
Alfredo Deza [Tue, 8 May 2018 17:47:48 +0000 (13:47 -0400)]
doc/ceph-volume describe the options for migrating away from ceph-disk

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

7 years agodoc/ceph-volume high-level description of simple activate at index.rst
Alfredo Deza [Tue, 8 May 2018 17:47:11 +0000 (13:47 -0400)]
doc/ceph-volume high-level description of simple activate at index.rst

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

7 years agoceph-volume tests do not include admin keyring in OSD nodes 22510/head
Alfredo Deza [Mon, 4 Jun 2018 20:01:15 +0000 (16:01 -0400)]
ceph-volume tests do not include admin keyring in OSD nodes

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

7 years agoceph-volume tests functional osd destroy on mons only for dmcrypt 22506/head
Alfredo Deza [Wed, 6 Jun 2018 15:37:21 +0000 (11:37 -0400)]
ceph-volume tests functional osd destroy on mons only for dmcrypt

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

7 years agoceph-volume tests/functional destroy filestore osds on the monitors
Alfredo Deza [Wed, 6 Jun 2018 13:02:42 +0000 (09:02 -0400)]
ceph-volume tests/functional destroy filestore osds on the monitors

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

7 years agoceph-volume tests/functional destroy bluestore osds on the monitors
Alfredo Deza [Wed, 6 Jun 2018 12:59:34 +0000 (08:59 -0400)]
ceph-volume tests/functional destroy bluestore osds on the monitors

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

7 years agoMerge pull request #21938 from pdvian/wip-23985-luminous
Yuri Weinstein [Mon, 11 Jun 2018 14:16:51 +0000 (07:16 -0700)]
Merge pull request #21938 from pdvian/wip-23985-luminous

luminous: librbd: prevent watcher from unregistering with in-flight actions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22142 from pdvian/wip-24084-luminous
Yuri Weinstein [Mon, 11 Jun 2018 14:16:24 +0000 (07:16 -0700)]
Merge pull request #22142 from pdvian/wip-24084-luminous

luminous: rbd-mirror: ensure remote demotion is replayed locally

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22143 from pdvian/wip-24059-luminous
Yuri Weinstein [Mon, 11 Jun 2018 14:15:56 +0000 (07:15 -0700)]
Merge pull request #22143 from pdvian/wip-24059-luminous

luminous: Deleting a pool with active notify linger ops can result in seg fault

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22172 from pdvian/wip-24086-luminous
Yuri Weinstein [Mon, 11 Jun 2018 14:14:53 +0000 (07:14 -0700)]
Merge pull request #22172 from pdvian/wip-24086-luminous

luminous: [rbd-mirror] potential races during PoolReplayer shut-down

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa: wait longer for osd to flush pg stats 22296/head
Kefu Chai [Sat, 9 Jun 2018 05:51:18 +0000 (13:51 +0800)]
qa: wait longer for osd to flush pg stats

it's the test_create_from_mon()'s counterpart of 38074726.

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

7 years agoqa: wait longer for osd to flush pg stats
Kefu Chai [Mon, 28 May 2018 11:37:44 +0000 (19:37 +0800)]
qa: wait longer for osd to flush pg stats

pg sends pg-stats to mgr every 5 seconds, so we cannot check for the
number of pgs right after creating the pool, at that moment, the number
of pgs could be 0, that's why manger.wait_for_clean() returns right
away, and leaves us with 0 pgs: the pgs serving the pool are still being
created. that's why `manager.get_num_active_clean()` returns `0`
sometimes. so, we should force osd to flush their stats to mgr, and wait
until the pg stats converages.

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

7 years agoMerge pull request #21412 from ukernel/luminous-23698
Yuri Weinstein [Sat, 9 Jun 2018 14:24:39 +0000 (07:24 -0700)]
Merge pull request #21412 from ukernel/luminous-23698

luminous: mds: misc load balancer fixes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21897 from batrick/i24055
Yuri Weinstein [Sat, 9 Jun 2018 14:24:08 +0000 (07:24 -0700)]
Merge pull request #21897 from batrick/i24055

luminous: VolumeClient: allow ceph_volume_client to create 'volumes' without namespace isolation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #22354 from ukernel/luminous-24369
Yuri Weinstein [Sat, 9 Jun 2018 14:23:02 +0000 (07:23 -0700)]
Merge pull request #22354 from ukernel/luminous-24369

luminous: client: void sending mds request while holding cap reference

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomon/ConfigKeyService: dump: print placeholder value for binary blobs 21368/head
Abhishek Lekshmanan [Fri, 8 Jun 2018 15:41:54 +0000 (17:41 +0200)]
mon/ConfigKeyService: dump: print placeholder value for binary blobs

JSON cannot express arbitrary binary blobs.  Instead of outputting invalid
and unparseable JSON, represent the value of blobs as something like
'<<< binary blob of length 12 >>>'.

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

Conflicts:
PendingReleaseNotes: 12.2.6 dropped, will be added in a seperate pr
src/mon/ConfigKeyService.cc (ConfigKeyService::store_dump does not take
            prefix argument in luminous)

7 years agoMerge pull request #21968 from ceph/backport-21605
Yuri Weinstein [Fri, 8 Jun 2018 14:34:13 +0000 (07:34 -0700)]
Merge pull request #21968 from ceph/backport-21605

luminous: mon: High MON cpu usage when cluster is changing

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22253 from jdurgin/wip-stat-decode
Yuri Weinstein [Fri, 8 Jun 2018 14:33:48 +0000 (07:33 -0700)]
Merge pull request #22253 from jdurgin/wip-stat-decode

luminous - osd/osd_types: fix object_stat_sum_t decode

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22331 from pdvian/wip-24245-luminous
Yuri Weinstein [Fri, 8 Jun 2018 14:33:06 +0000 (07:33 -0700)]
Merge pull request #22331 from pdvian/wip-24245-luminous

luminous : mon/MgrMonitor: change 'unresponsive' message to info level

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22351 from pdvian/wip-24247-luminous
Yuri Weinstein [Fri, 8 Jun 2018 14:32:21 +0000 (07:32 -0700)]
Merge pull request #22351 from pdvian/wip-24247-luminous

luminous: os/bluestore: simplify and fix SharedBlob::put()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22360 from tchaikov/luminous-24361
Yuri Weinstein [Fri, 8 Jun 2018 14:31:35 +0000 (07:31 -0700)]
Merge pull request #22360 from tchaikov/luminous-24361

luminous: mon: enable level_compaction_dynamic_level_bytes for rocksdb

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoAllow swift acls to be deleted. 22465/head
Marcus Watts [Wed, 31 Jan 2018 20:46:57 +0000 (15:46 -0500)]
Allow swift acls to be deleted.

The openstack "swift" command deletes acls by submitting an
acl with an empty string.  The existing logic uses c++ strings,
which can't distinguish between an empty string and a non-existant
string.  Additional, the strings are coming from RGWEnv which
supplies C strings not c++.  Using C strings instead makes it
trivial to pass "non-existance" (as a null string).  It also avoids
some type conversion with string copying.

Fixes: http://tracker.ceph.com/issues/22897
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 1fc69243bdfadb1a8c68a9fa5491e32287bc33b4)

7 years agoMerge pull request #22400 from yuriw/wip-yuriw-p2p-luminous
Josh Durgin [Thu, 7 Jun 2018 23:51:11 +0000 (16:51 -0700)]
Merge pull request #22400 from yuriw/wip-yuriw-p2p-luminous

qa/tests - moved point-to-point suite into own folder

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21437 from pdvian/wip-23683-luminous
Yuri Weinstein [Thu, 7 Jun 2018 22:17:06 +0000 (15:17 -0700)]
Merge pull request #21437 from pdvian/wip-23683-luminous

luminous: rgw: radosgw-admin should not use metadata cache for readonly commands

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21724 from smithfarm/wip-23231-luminous
Yuri Weinstein [Thu, 7 Jun 2018 22:16:39 +0000 (15:16 -0700)]
Merge pull request #21724 from smithfarm/wip-23231-luminous

luminous: rgw: rgw_statfs should report the correct stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21738 from cbodley/wip-23906
Yuri Weinstein [Thu, 7 Jun 2018 22:15:52 +0000 (15:15 -0700)]
Merge pull request #21738 from cbodley/wip-23906

luminous: rgw: fix use of libcurl with empty header values

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22177 from pdvian/wip-24120-luminous
Yuri Weinstein [Thu, 7 Jun 2018 22:15:11 +0000 (15:15 -0700)]
Merge pull request #22177 from pdvian/wip-24120-luminous

luminous: rgw: trim all spaces inside a metadata value

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #22302 from linuxbox2/wip-luminous-irange
Yuri Weinstein [Thu, 7 Jun 2018 22:13:44 +0000 (15:13 -0700)]
Merge pull request #22302 from linuxbox2/wip-luminous-irange

luminous: rgw: add configurable AWS-compat invalid range get behavior

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22352 from pdvian/wip-24252-luminous
Yuri Weinstein [Thu, 7 Jun 2018 22:12:47 +0000 (15:12 -0700)]
Merge pull request #22352 from pdvian/wip-24252-luminous

luminous: rgw: Do not modify email if argument is not set

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22363 from mdw-at-linuxbox/wip-luminous-rgw-implt
Yuri Weinstein [Thu, 7 Jun 2018 22:10:47 +0000 (15:10 -0700)]
Merge pull request #22363 from mdw-at-linuxbox/wip-luminous-rgw-implt

luminous: rgw: making implicit_tenants backwards compatible

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #21316 from pdvian/wip-23607-luminous
Yuri Weinstein [Thu, 7 Jun 2018 12:03:38 +0000 (05:03 -0700)]
Merge pull request #21316 from pdvian/wip-23607-luminous

luminous: rbd: improve 'import-diff' corrupt input error messages

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22180 from pdvian/wip-24156-luminous
Yuri Weinstein [Thu, 7 Jun 2018 12:02:57 +0000 (05:02 -0700)]
Merge pull request #22180 from pdvian/wip-24156-luminous

luminous: [rbd-mirror] potential deadlock when running asok 'flush' command

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22370 from dillaman/wip-24378-luminous
Yuri Weinstein [Thu, 7 Jun 2018 12:01:38 +0000 (05:01 -0700)]
Merge pull request #22370 from dillaman/wip-24378-luminous

luminous: librbd: commit IO as safe when complete if writeback cache is disabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agocrush, osd: handle multiple parents properly when applying pg upmaps 22115/head
xiexingguo [Fri, 4 May 2018 13:20:29 +0000 (21:20 +0800)]
crush, osd: handle multiple parents properly when applying pg upmaps

Fixes: http://tracker.ceph.com/issues/23921
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
(cherry picked from commit 482ec97c98107be20c9ca1f34636323703ecfa5c)

Conflicts:
src/crush/CrushWrapper.h : Resolved for get_children_of_type

7 years agomgr/influx: Only fetch the current time once when gathering data 22414/head
Wido den Hollander [Wed, 31 Jan 2018 13:43:54 +0000 (14:43 +0100)]
mgr/influx: Only fetch the current time once when gathering data

By fetching the current time once and storing it into a variable
we save a lot of system calls. On large clusters this can be a lot
of system calls.

In addition we also make sure that all points gathered in the same
loop/run have exactly the same timestamp.

Otherwise there will be a difference in time between the items in
InfluxDB which then causes problems when creating graphs with for
example Grafana.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 0857d3bcd4175f39582376fb9980cf3f66fa09ce)

7 years agomgr/influx: Send more information about pools
Wido den Hollander [Wed, 31 Jan 2018 12:15:05 +0000 (13:15 +0100)]
mgr/influx: Send more information about pools

In addition to the existing statistics also send Read and Write IOps,
but also quota information.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit c803f38a17af625edc1cee29f21e510a03396204)

7 years agomgr/influx: Catch ConnectionError if raised
Wido den Hollander [Tue, 30 Jan 2018 14:45:40 +0000 (15:45 +0100)]
mgr/influx: Catch ConnectionError if raised

The InfluxDBClient can also re-raise a ConnectionError from the
python requests module if that was caught.

The Exception might be:

  ConnectionError: ('Connection aborted.', error(104, 'Connection reset by peer'))

Catch and log this error instead of having it raised which might
cause problems further down.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit a0c2c8b900cd2bab2ef8041722036036efd2cb0f)

7 years agoAdd InfluxDB SSL Option
Tobias Gall [Wed, 13 Dec 2017 18:14:50 +0000 (19:14 +0100)]
Add InfluxDB SSL Option

Add possibility to connect to InfluxDB via https.
Also adding the option for verifying the https cert.

Signed-off-by: Tobias Gall <tobias.gall@mailbox.org>
(cherry picked from commit f5efaa2f522b7cc7497db1d5a82785e7f08b7bb0)

7 years agomgr/influx: Print (in debug) time it takes to send data to Influx
Wido den Hollander [Mon, 11 Dec 2017 14:44:05 +0000 (15:44 +0100)]
mgr/influx: Print (in debug) time it takes to send data to Influx

On large clusters it might take a very long time to send data to Influx
due to the gathering and parsing of statistics.

By keeping a counter and printing it admins can adjust the interval if it
becomes to heavy for their cluster.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 3f07636bc235ace8da3f2f07aefd56e53085ea0e)

7 years agomgr/influx: Revise configuration of module
Wido den Hollander [Mon, 11 Dec 2017 14:12:51 +0000 (15:12 +0100)]
mgr/influx: Revise configuration of module

It's a lot like the Zabbix module and allows for setting configuration
options on run-time and also fetch them from the module.

A few additional commands have been registered to make sure it is easy
to interact with the module.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 429718af1cb30de49e8c7550b04bd788010ba1a4)