]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoMerge pull request #24986 from joscollin/wip-36691-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:18:59 +0000 (08:18 -0800)]
Merge pull request #24986 from joscollin/wip-36691-luminous

luminous: client: request next osdmap for blacklisted client

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #24994 from jonsger/wip-36456-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:18:28 +0000 (08:18 -0800)]
Merge pull request #24994 from jonsger/wip-36456-luminous

luminous: client: explicitly show blacklisted state via asok status command

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25043 from smithfarm/wip-36460-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)]
Merge pull request #25043 from smithfarm/wip-36460-luminous

luminous: mds: rctime not set on system inode (root) at startup

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #25407 from brtknr/luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:17:17 +0000 (08:17 -0800)]
Merge pull request #25407 from brtknr/luminous

luminous: cephfs: ceph-volume-client: allow setting mode of CephFS volumes

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25518 from smithfarm/wip-37423-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:16:50 +0000 (08:16 -0800)]
Merge pull request #25518 from smithfarm/wip-37423-luminous

luminous: qa: wrong setting for msgr failures

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25520 from smithfarm/wip-37602-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:16:17 +0000 (08:16 -0800)]
Merge pull request #25520 from smithfarm/wip-37602-luminous

luminous: mds: severe internal fragment when decoding xattr_map from log event

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #25522 from smithfarm/wip-37606-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:15:18 +0000 (08:15 -0800)]
Merge pull request #25522 from smithfarm/wip-37606-luminous

luminous: mds: directories pinned keep being replicated back and forth between exporting mds and importing mds

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25524 from smithfarm/wip-37604-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:14:45 +0000 (08:14 -0800)]
Merge pull request #25524 from smithfarm/wip-37604-luminous

luminous: mds: PurgeQueue write error handler does not handle EBLACKLISTED

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25698 from xiexingguo/wip-37743
Yuri Weinstein [Fri, 4 Jan 2019 22:56:25 +0000 (14:56 -0800)]
Merge pull request #25698 from xiexingguo/wip-37743

luminous: osd/OSDMap: cancel mapping if target osd is out

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25021 from smithfarm/wip-36506-luminous
Yuri Weinstein [Fri, 4 Jan 2019 22:51:07 +0000 (14:51 -0800)]
Merge pull request #25021 from smithfarm/wip-36506-luminous

luminous: core: mon osdmap cash too small during upgrade to mimic

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #25289 from cbodley/wip-37091-luminous
Yuri Weinstein [Fri, 4 Jan 2019 22:50:25 +0000 (14:50 -0800)]
Merge pull request #25289 from cbodley/wip-37091-luminous

luminous: rgw: catch exceptions from librados::NObjectIterator

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25458 from pdvian/wip-37535-luminous
Yuri Weinstein [Fri, 4 Jan 2019 22:49:43 +0000 (14:49 -0800)]
Merge pull request #25458 from pdvian/wip-37535-luminous

luminous: librbd: reset snaps in rbd_snap_list()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25514 from smithfarm/wip-37343-luminous
Yuri Weinstein [Fri, 4 Jan 2019 22:49:15 +0000 (14:49 -0800)]
Merge pull request #25514 from smithfarm/wip-37343-luminous

luminous: osd: Prioritize user specified scrubs

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #25604 from smithfarm/wip-37697-luminous
Yuri Weinstein [Fri, 4 Jan 2019 22:48:38 +0000 (14:48 -0800)]
Merge pull request #25604 from smithfarm/wip-37697-luminous

luminous: osd: failed assert when osd_memory_target options mismatch

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25772 from alfredodeza/luminous-ceph-volume-fix-join
Alfredo Deza [Thu, 3 Jan 2019 18:23:51 +0000 (13:23 -0500)]
Merge pull request #25772 from alfredodeza/luminous-ceph-volume-fix-join

luminous ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoceph-volume: Fix TypeError: join() takes exactly one argument (2 given) 25772/head
Sebastian Wagner [Mon, 10 Dec 2018 13:38:08 +0000 (14:38 +0100)]
ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 38f289b691ed1275bdf7342a4347434ed340c8fc)

6 years agoMerge pull request #25352 from alfredodeza/luminous-rm37449
Alfredo Deza [Thu, 3 Jan 2019 18:02:20 +0000 (13:02 -0500)]
Merge pull request #25352 from alfredodeza/luminous-rm37449

luminous: ceph-volume: zap: improve zapping to remove all partitions and all LVs, encrypted or not

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24468 from vshankar/wip-36281
Yuri Weinstein [Thu, 3 Jan 2019 16:43:32 +0000 (08:43 -0800)]
Merge pull request #24468 from vshankar/wip-36281

luminous: mds: add "drop cache" command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #24728 from vshankar/wip-36217
Yuri Weinstein [Thu, 3 Jan 2019 16:42:42 +0000 (08:42 -0800)]
Merge pull request #24728 from vshankar/wip-36217

luminous: cephfs-journal-tool: make --rank argument mandatory

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #24924 from vshankar/wip-24759
Yuri Weinstein [Thu, 3 Jan 2019 16:41:30 +0000 (08:41 -0800)]
Merge pull request #24924 from vshankar/wip-24759

luminous: qa/suites/fs: use bigger cinder volumes

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

6 years agoMerge pull request #24324 from smithfarm/wip-32091-luminous
Yuri Weinstein [Thu, 3 Jan 2019 16:39:54 +0000 (08:39 -0800)]
Merge pull request #24324 from smithfarm/wip-32091-luminous

luminous: mds: migrate strays part by part when shutdown mds

Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #24440 from pdvian/wip-36200-luminous
Yuri Weinstein [Thu, 3 Jan 2019 16:39:25 +0000 (08:39 -0800)]
Merge pull request #24440 from pdvian/wip-36200-luminous

luminous: mds: fix mds damaged due to unexpected journal length

Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #24465 from pdvian/wip-36206-luminous
Yuri Weinstein [Thu, 3 Jan 2019 16:38:52 +0000 (08:38 -0800)]
Merge pull request #24465 from pdvian/wip-36206-luminous

luminous: libcephfs: expose CEPH_SETATTR_MTIME_NOW and CEPH_SETATTR_ATIME_NOW

Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #24552 from pdvian/wip-36279-luminous
Yuri Weinstein [Thu, 3 Jan 2019 16:37:59 +0000 (08:37 -0800)]
Merge pull request #24552 from pdvian/wip-36279-luminous

luminous : qa: tolerate failed rank while waiting for state

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #24872 from trociny/wip-36642-luminous
Yuri Weinstein [Thu, 3 Jan 2019 16:36:53 +0000 (08:36 -0800)]
Merge pull request #24872 from trociny/wip-36642-luminous

luminous: osdc: reduce ObjectCacher's memory fragments

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25569 from batrick/i24929
Yuri Weinstein [Thu, 3 Jan 2019 16:34:41 +0000 (08:34 -0800)]
Merge pull request #25569 from batrick/i24929

luminous: qa: test_recovery_pool tries asok on wrong node

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #25752 from alfredodeza/luminous-better-devid
Alfredo Deza [Thu, 3 Jan 2019 14:35:33 +0000 (09:35 -0500)]
Merge pull request #25752 from alfredodeza/luminous-better-devid

luminous common/blkdev, ceph-volume: improve get_device_id

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoceph-volume: Micron SSDs don't include vendor name in ID_SERIAL 25752/head
Sage Weil [Thu, 6 Dec 2018 16:02:35 +0000 (10:02 -0600)]
ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL

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

6 years agoceph-volume: update get_device_id to match in-tree implementation
Sage Weil [Thu, 6 Dec 2018 15:43:36 +0000 (09:43 -0600)]
ceph-volume: update get_device_id to match in-tree implementation

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

6 years agoosd/OSDMap: cancel mapping if target osd is out 25698/head
xie xingguo [Wed, 19 Dec 2018 09:01:23 +0000 (17:01 +0800)]
osd/OSDMap: cancel mapping if target osd is out

Suppose we have a bad pg_upmap_item, say:
```
pg_upmap_items 2.0 [0,8,5,4,6,12]
```
which maps osd.6 to osd.12 that is currently marked as out.

It turns out **maybe_remove_pg_upmaps** can not handle the
above case well because **_apply_upmap** will silently discard
any bad mappings whenver they try to target at some current
__out__ OSDs. So if you call **pg_to_raw_up(2.0)**, you'll probably
get something like: ```up [8,4,6] ``` (e.g., the last mapping pair 6->12
is simply ignored by **_apply_upmap**).

Make **clean_pg_upmaps** do the tidy-up check instead, since it
already has __bare__ access to those pg_upmaps and pg_upmap_items.

Fixes: http://tracker.ceph.com/issues/37501
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
(cherry picked from commit d06b65a0ab210e7a920761765531d929dd5798ec)

Conflicts:
        - *maybe_remove_pg_upmaps* input changed, in master
          we now have a passed in *nextmap* parameter

6 years agoMerge pull request #25532 from smithfarm/wip-37643-luminous
Kefu Chai [Thu, 20 Dec 2018 14:04:44 +0000 (22:04 +0800)]
Merge pull request #25532 from smithfarm/wip-37643-luminous

luminous: ceph-create-keys: fix octal notation for Python 3 without losing compatibility with Python 2

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25609 from joscollin/wip-37685-luminous
Nathan Cutler [Thu, 20 Dec 2018 12:47:20 +0000 (13:47 +0100)]
Merge pull request #25609 from joscollin/wip-37685-luminous

luminous: doc/user-management: Remove obsolete reset caps command

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agodoc/user-management: Remove obsolete reset caps command 25609/head
Brad Hubbard [Fri, 14 Dec 2018 05:01:21 +0000 (15:01 +1000)]
doc/user-management: Remove obsolete reset caps command

This command has not worked since hammer and makes no sense in an
environment where we do not allow empty caps

Fixes: http://tracker.ceph.com/issues/37663
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit e4e7f3ea6af8316cd46bb74c3f6d6819b99cea53)

 Conflicts:
doc/rados/operations/user-management.rst
Dropped the allow empty caps paragraph, as done in master.

6 years agoos/bluestore: add boundary for cache-autotune related settings 25604/head
xie xingguo [Thu, 6 Dec 2018 10:15:55 +0000 (18:15 +0800)]
os/bluestore: add boundary for cache-autotune related settings

E.g., because user configures something wrong or we don't expected.

Fixes: http://tracker.ceph.com/issues/37507
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit c2c9245ee63cb135020061d90822745d91bb962d)

6 years agoqa: add status field to method 24552/head
Patrick Donnelly [Mon, 17 Dec 2018 18:27:30 +0000 (10:27 -0800)]
qa: add status field to method

From: ab4f33bd248bf192c1a81fea05a81c7f85ede52d
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #25552 from jan--f/25203-luminous
Alfredo Deza [Mon, 17 Dec 2018 17:39:22 +0000 (12:39 -0500)]
Merge pull request #25552 from jan--f/25203-luminous

luminous ceph-volume: fix Batch object in py3 environments

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoqa: add status option 25569/head
Patrick Donnelly [Fri, 14 Dec 2018 19:29:28 +0000 (11:29 -0800)]
qa: add status option

From: 333444e8aac065058c0a2353beff8005044659f7
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: remove dead code
Patrick Donnelly [Sat, 14 Jul 2018 01:15:03 +0000 (18:15 -0700)]
qa: remove dead code

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

6 years agoqa: run asok command on correct machine
Patrick Donnelly [Tue, 10 Jul 2018 20:14:05 +0000 (13:14 -0700)]
qa: run asok command on correct machine

The MDS may not be on the same machine where the cluster command is run.

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

6 years agoceph-volume: add Batch smoketest 25552/head
Jan Fajerski [Mon, 26 Nov 2018 13:54:50 +0000 (14:54 +0100)]
ceph-volume: add Batch smoketest

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 936ee680f7633620c8a1127db9630a22326b9e2c)

6 years agoceph-volume: fix Batch object in py3 environments
Jan Fajerski [Fri, 30 Nov 2018 08:22:51 +0000 (09:22 +0100)]
ceph-volume: fix Batch object in py3 environments

Fixes: https://tracker.ceph.com/issues/37356
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 851c7693daa315b7972702bedf09dd66a37667d8)

6 years agoMerge pull request #25500 from joscollin/wip-37600-luminous
Nathan Cutler [Thu, 13 Dec 2018 11:25:11 +0000 (12:25 +0100)]
Merge pull request #25500 from joscollin/wip-37600-luminous

luminous: doc: broken link on troubleshooting-mon page

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoceph-create-keys: Misc Python 3 fixes 25532/head
James Page [Wed, 5 Dec 2018 16:29:43 +0000 (16:29 +0000)]
ceph-create-keys: Misc Python 3 fixes

Use octal notation for file permissions.

Switch file() calls to open().

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

6 years agoMerge pull request #25418 from xiexingguo/wip-luminous-upmap-fixes
Xie Xingguo [Thu, 13 Dec 2018 05:54:32 +0000 (13:54 +0800)]
Merge pull request #25418 from xiexingguo/wip-luminous-upmap-fixes

luminous: osd: backport recent upmap fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25286 from smithfarm/wip-37397-luminous
Nathan Cutler [Wed, 12 Dec 2018 23:58:12 +0000 (00:58 +0100)]
Merge pull request #25286 from smithfarm/wip-37397-luminous

luminous: tests: /usr/bin/ld: cannot find -lradospp in rados mimic

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #25041 from smithfarm/wip-36750-luminous
Yuri Weinstein [Wed, 12 Dec 2018 23:39:47 +0000 (15:39 -0800)]
Merge pull request #25041 from smithfarm/wip-36750-luminous

luminous: mgr: [restful] deep_scrub is not a valid OSD command

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #25047 from swinds24/fix_36764
Yuri Weinstein [Wed, 12 Dec 2018 23:39:11 +0000 (15:39 -0800)]
Merge pull request #25047 from swinds24/fix_36764

luminous: mgr: hold lock while accessing the request list and submitting request

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #25216 from k0ste/luminous_backports
Yuri Weinstein [Wed, 12 Dec 2018 23:38:20 +0000 (15:38 -0800)]
Merge pull request #25216 from k0ste/luminous_backports

luminous: mgr: prometheus: added bluestore db and wal devices to ceph_disk_occupation metric.//

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agomds: use uniform write handler for PQ 25524/head
Patrick Donnelly [Tue, 27 Nov 2018 00:17:23 +0000 (16:17 -0800)]
mds: use uniform write handler for PQ

MDS would go damaged after blacklisting the MDS caused the PQ to see a write
error. Instead, just respawn and/or do usual write error handling (default
r/o).

Fixes: https://tracker.ceph.com/issues/37394
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 2fb665194f61914711454c2084eb1539bd3588b5)

Conflicts:
    src/msd/MDSRank.cc
- use Mutex::Locker instead of std::lock_guard

6 years agoMerge pull request #25259 from k0ste/luminous_backports4
Yuri Weinstein [Wed, 12 Dec 2018 23:35:40 +0000 (15:35 -0800)]
Merge pull request #25259 from k0ste/luminous_backports4

luminous: mgr/balancer: add cmd to list all plans

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomds: queue inodes into MDCache::export_pin_queue after setattr is journaled 25522/head
Xuehan Xu [Mon, 19 Nov 2018 06:56:50 +0000 (14:56 +0800)]
mds: queue inodes into MDCache::export_pin_queue after setattr is journaled

This makes sure that, when doing inodes' migration, their "export_pin" is indeed the
mds it should be pinned to.

Fixes: http://tracker.ceph.com/issues/37368
Signed-off-by: Xuehan Xu <xuxuehan@360.cn>
(cherry picked from commit 93cbee3dd9c1446a027e7673645a1856ea68637a)

6 years agoosdc/Journaler: make try_read_entry store data in contiguous memory 25520/head
Yan, Zheng [Tue, 27 Nov 2018 08:15:21 +0000 (16:15 +0800)]
osdc/Journaler: make try_read_entry store data in contiguous memory

If bufferlist consists of discontiguous memory, decoding types whose
denc_traits needs contiguous memory is inefficient. The bufferlist may
get copied to temporary memory multiple times. (copy_shallow() in
src/include/denc.h actually does deep copy)

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

6 years agoqa: fix delay type config name 25518/head
Patrick Donnelly [Thu, 1 Nov 2018 20:01:26 +0000 (13:01 -0700)]
qa: fix delay type config name

Setting as-is is a no-op.

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

6 years agoosd: Prioritize user specified scrubs 25514/head
David Zafman [Thu, 15 Nov 2018 07:56:51 +0000 (23:56 -0800)]
osd: Prioritize user specified scrubs

Fixes: http://tracker.ceph.com/issues/37269
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 5f1a7ef029b0c4b59bc73fd709bdc096970a36ce)

6 years agoosd: make scrub right now when pg stats_invalid is true
kungf [Thu, 21 Sep 2017 10:55:45 +0000 (18:55 +0800)]
osd: make scrub right now when pg stats_invalid is true

Signed-off-by: kungf <yang.wang@easystack.cn>
(cherry picked from commit a2ac3078ccc28656861718a248a3f4199fc17434)

6 years agotest: Add test for requested scrub priority
David Zafman [Thu, 6 Sep 2018 04:42:43 +0000 (21:42 -0700)]
test: Add test for requested scrub priority

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1841928e28654722a5d98df89a40454bbd993314)

6 years agoMerge pull request #25326 from theanalyst/wip-luminous-reshard-fixes-1
Casey Bodley [Wed, 12 Dec 2018 19:07:20 +0000 (14:07 -0500)]
Merge pull request #25326 from theanalyst/wip-luminous-reshard-fixes-1

luminous: bucket resharding fixes

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #24547 from linuxbox2/luminous-24595
Yuri Weinstein [Wed, 12 Dec 2018 16:49:40 +0000 (08:49 -0800)]
Merge pull request #24547 from linuxbox2/luminous-24595

luminous: rgw: apply quota config to users created via external auth

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24621 from cbodley/wip-24358
Yuri Weinstein [Wed, 12 Dec 2018 16:49:12 +0000 (08:49 -0800)]
Merge pull request #24621 from cbodley/wip-24358

luminous: rgw: add ssl support to beast frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24909 from smithfarm/wip-36414-luminous
Yuri Weinstein [Wed, 12 Dec 2018 16:48:31 +0000 (08:48 -0800)]
Merge pull request #24909 from smithfarm/wip-36414-luminous

luminous: rgw: librgw: crashes in multisite configuration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24944 from jonsger/luminous-backport-pr#24700
Yuri Weinstein [Wed, 12 Dec 2018 16:48:02 +0000 (08:48 -0800)]
Merge pull request #24944 from jonsger/luminous-backport-pr#24700

luminous: rgw: SSE encryption does not detect ssl termination in proxy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25088 from jonsger/wip-36757-luminous
Yuri Weinstein [Wed, 12 Dec 2018 16:47:33 +0000 (08:47 -0800)]
Merge pull request #25088 from jonsger/wip-36757-luminous

luminous: rgw: rgw-admin: reshard add can add a non-existent bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25195 from pdvian/wip-37284-luminous
Yuri Weinstein [Wed, 12 Dec 2018 16:47:08 +0000 (08:47 -0800)]
Merge pull request #25195 from pdvian/wip-37284-luminous

luminous: rgw: radosgw-admin: translate reshard status codes (trivial)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25320 from theanalyst/wip-luminous-zone-deletion
Yuri Weinstein [Wed, 12 Dec 2018 16:46:41 +0000 (08:46 -0800)]
Merge pull request #25320 from theanalyst/wip-luminous-zone-deletion

luminous: rgw: fixes for zone deletion

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agodoc: broken link on troubleshooting-mon page 25500/head
James McClune [Thu, 29 Nov 2018 03:10:33 +0000 (22:10 -0500)]
doc: broken link on troubleshooting-mon page
Fixes: https://tracker.ceph.com/issues/37451
This fix involves adding :ref: labels to the add-or-rm-mons.rst
page. I also added :ref: labels for other headings within
add-or-rm-mons.rst (for future reference).

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
(cherry picked from commit ca05e456969a721631f5e9882c896cab76a4a3dc)

Conflicts:
doc/rados/troubleshooting/troubleshooting-mon.rst
Fixed the :ref: sentence and removed the _replace line.

6 years agoMerge pull request #25284 from jdurgin/wip-osd-memory-target-docs-luminous
Josh Durgin [Mon, 10 Dec 2018 23:54:02 +0000 (15:54 -0800)]
Merge pull request #25284 from jdurgin/wip-osd-memory-target-docs-luminous

luminous: doc/rados: update bluestore provisioning and autotuning docs

Reviewed-by: Mark Nelson <mnelson@redhat.com>
6 years agolibrbd: reset snaps in rbd_snap_list() 25458/head
Kefu Chai [Mon, 3 Dec 2018 16:28:31 +0000 (00:28 +0800)]
librbd: reset snaps in rbd_snap_list()

in SnapIterator in rbd.pyx, rbd_snap_list_end() is called by
SnapIterator.__dealloc__(). and rbd_snap_list_end() frees
snaps->name if it is not nullptr.  but there is chance that
snaps->name is never initialized after snaps is allocated by
SnapIterator.__init__, in that case, we will free() a wild pointer.

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

6 years agorgw: fix typo 25326/head
J. Eric Ivancich [Wed, 28 Nov 2018 17:55:35 +0000 (12:55 -0500)]
rgw: fix typo

This fixes a typo in a log message. It's a separate commit so
downstream commits point to the right upstream commits via
cherry-pick.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 7d1768f2a332c5ac389cbb4bbeda28752e4f17bc)

6 years agorgw: perf -- remove bucket shards asynchronously rather than synchronously
J. Eric Ivancich [Tue, 20 Nov 2018 18:32:54 +0000 (13:32 -0500)]
rgw: perf -- remove bucket shards asynchronously rather than synchronously

We can now take advantage of the new asynchronous bucket shard removal
code and where we used to remove each shard synchronously now remove
them asynchronously. This would be a huge win when we have tens of
thousands of shards.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit cb0da45c5d6e4dff6514919b3b894df0eea7c1e4)

 Conflicts:
src/rgw/rgw_rados.cc
conflicts with placement set and rgw rados refactor

6 years agorgw: clean up unused bucket index shards
J. Eric Ivancich [Tue, 20 Nov 2018 14:52:39 +0000 (09:52 -0500)]
rgw: clean up unused bucket index shards

Clean up old bucket index shards when a resharding is complete. Also,
when a resharding fails, clean up unfinished bucket index shards. Do
both clean-ups asynchronously.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit f84f70d451036ee99011b8e2c7b974f15d3a005a)

 Conflicts:
src/rgw/rgw_rados.h
merge conflict as bucket_placement functions were moved after the rgw rados
refactor

6 years agorgw: a little code clean-up by adding const
J. Eric Ivancich [Mon, 19 Nov 2018 21:10:52 +0000 (16:10 -0500)]
rgw: a little code clean-up by adding const

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 48e22fb76feffb551074f274986bc4125a02003f)

6 years agorgw: remove never-called RGWRados member function
J. Eric Ivancich [Fri, 16 Nov 2018 22:08:46 +0000 (17:08 -0500)]
rgw: remove never-called RGWRados member function

Because RGWRados::cls_rgw_init_index is never called, remove it.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4593778c6d830a1a0d33528507f1795aee019ce4)

6 years agorgw: rename function for clarity
J. Eric Ivancich [Wed, 7 Nov 2018 20:33:52 +0000 (15:33 -0500)]
rgw: rename function for clarity

The function cls_rgw_bucket_init was renamed to
cls_rgw_bucket_init_index in order to better describe its
functionality.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 20868bd3b893ba2e17d2bfdc63d6544dbe677a9b)

6 years agorgw: fix bug in error codes returned
J. Eric Ivancich [Fri, 16 Nov 2018 15:47:48 +0000 (10:47 -0500)]
rgw: fix bug in error codes returned

Fixes two bugs where positive error code was returned rather than
negative error code, which is the RGW norm.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit dc0732c524c2d8fb5b423f8cce8c6cc9aa7ca44a)

6 years agoosd/OSDMap: fix upmap mis-killing for erasure-coded PGs 25418/head
xie xingguo [Sat, 1 Dec 2018 09:42:01 +0000 (17:42 +0800)]
osd/OSDMap: fix upmap mis-killing for erasure-coded PGs

The up-set of erasure-coded PGs may include CRUSH_ITEM_NONE,
which as a result causes mis-killing of valid upmap items.

Fixes: https://tracker.ceph.com/issues/37493
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
(cherry picked from commit f043dcc6d8663ed960a354b2441fd3f8dd66c62d)

Conflicts:
        - *maybe_remove_pg_upmaps* input changed, in master
          we now have a passed in *nextmap* parameter

6 years agomon: auto clean up stale upmap items
xie xingguo [Wed, 21 Nov 2018 06:25:45 +0000 (14:25 +0800)]
mon: auto clean up stale upmap items

See https://www.spinics.net/lists/ceph-users/msg49518.html

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 4181aa86906886423af80e478e45554606fc7cf6)

Conflicts:
        - *nextmap* has been renamed to *tmpmap*
        - add the *have_pg_upmaps* wrapper which is necessary for unittest

6 years agoosd/OSDMap: add pg-existence sanity check
xie xingguo [Wed, 21 Nov 2018 01:36:21 +0000 (09:36 +0800)]
osd/OSDMap: add pg-existence sanity check

The reason why __get_pg_pool_size(pg)__ or __get_pg_pool_crush_rule(pg)__ fails is
that the pg does not exist anymore. So it generally makes sense to check __pg_exists(pg)__
before moving further.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 79ef3bea7550559b7ea4e2b68dc407c7eb25defa)

Conflicts:
- *nextmap* has been renamed to *tmpmap*

6 years agoosd/OSDMap.cc: move sanity checks to the proper place
xie xingguo [Wed, 20 Jun 2018 01:27:46 +0000 (09:27 +0800)]
osd/OSDMap.cc: move sanity checks to the proper place

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 3dcd4eaf867369437720a21daf3c344cc4b9844e)

6 years agoosd/OSDMap.cc: remove pg_upmap/pg_upmap_items too if osd is gone
xie xingguo [Wed, 20 Jun 2018 01:04:19 +0000 (09:04 +0800)]
osd/OSDMap.cc: remove pg_upmap/pg_upmap_items too if osd is gone

If an osd is gone or moved out from the specific crush rule,
we should cancel any pg_upmap/pg_upmap_items still bound to
that osd too.

The original code does not work for the above case because
get_parent_of_type() will fail if that osd does not belong
to the crush_rule passed in and hence hits the assert below:

```
src/osd/OSDMap.cc: 4078: FAILED assert(target > 0)
```

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 8a11ed479d7ea95f76170e74123ca2c48e3a3963)

6 years agoceph-volume-client: allow setting mode of CephFS volumes 25407/head
Tom Barron [Tue, 30 Oct 2018 19:09:54 +0000 (15:09 -0400)]
ceph-volume-client: allow setting mode of CephFS volumes

volume groups, snapshots, and snapshot groups.

Signed-off-by: Tom Barron <tpb@dyncloud.net>
(cherry picked from commit f5906585f3a7df823b904e86ba0a11ea81327e10)

6 years agoMerge pull request #25350 from alfredodeza/luminous-c-v-inventory-add-device_id
Alfredo Deza [Tue, 4 Dec 2018 12:06:40 +0000 (07:06 -0500)]
Merge pull request #25350 from alfredodeza/luminous-c-v-inventory-add-device_id

luminous ceph-volume add device_id to inventory listing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agoPendingReleaseNotes: add release notes for cephfs-journal-tool changes 24728/head
Venky Shankar [Mon, 3 Dec 2018 07:38:26 +0000 (02:38 -0500)]
PendingReleaseNotes: add release notes for cephfs-journal-tool changes

Fixes: https://tracker.ceph.com/issues/36217
Signed-off-by: Venky Shankar <vshankar@redhat.com>
6 years agotest: make rank argument mandatory when running journal_tool
Venky Shankar [Tue, 4 Sep 2018 06:20:54 +0000 (02:20 -0400)]
test: make rank argument mandatory when running journal_tool

Also, fix a bunch of quirky journal_tool invocations that pass
"--rank" argument as the command argument rather than passing it
as function argument.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit f65193d95534dd34b593c92e1848b181737b0561)

6 years agocephfs-journal-tool: make "--rank" argument mandatory
Venky Shankar [Mon, 23 Jul 2018 06:35:05 +0000 (02:35 -0400)]
cephfs-journal-tool: make "--rank" argument mandatory

... and do not silenty act on the default filesystem.
Force users to specify the filesystem name and rank.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 5e4702e303bd70b4ff1de973375bef952c0d8b6a)

 Conflicts:
src/tools/cephfs/JournalTool.cc
src/tools/cephfs/JournalTool.h

6 years agocephfs-journal-tool: pass local arg vector for Journal actions
Venky Shankar [Mon, 23 Jul 2018 06:30:47 +0000 (02:30 -0400)]
cephfs-journal-tool: pass local arg vector for Journal actions

Some helper functions clobber the passed in arg vector. This
causes operations on all but the first rank to fail as the
operations for the first rank tampers with the arg vector.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit d5e482a6c2782993e6e9903eb6f11f5ebe260925)

6 years agocephfs-journal-tool: dump to per rank output file wherever necessary
Venky Shankar [Mon, 23 Jul 2018 06:28:07 +0000 (02:28 -0400)]
cephfs-journal-tool: dump to per rank output file wherever necessary

cephfs-journal-tool supports operations on all ranks. Operations
such as dump/export do not write to distinct filenames hence
overwriting the data dumped or exported for the previous rank.

With this change (and further commits), for operations on all
ranks, dump/export would write to distinct filenames suffixed
by the mds rank (.0, .1, etc..). For operations on a single rank
or if there exist a single rank, the passed in filename is used
as it is.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit cb19db75c7f23278d2598b58526d1bf8bf00b679)

 Conflicts:
src/tools/cephfs/JournalTool.h

6 years agoceph-volume tests patch udevadm so it doesn't actually call udevadm in a test 25352/head
Alfredo Deza [Fri, 30 Nov 2018 17:31:02 +0000 (12:31 -0500)]
ceph-volume tests patch udevadm so it doesn't actually call udevadm in a test

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

6 years agoceph-volume util.disk use device.path for error reporting
Alfredo Deza [Fri, 30 Nov 2018 13:27:01 +0000 (08:27 -0500)]
ceph-volume util.disk use device.path for error reporting

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

6 years agoceph-volume tests.functional add back sdc1 partitions with parted to redeploy after...
Alfredo Deza [Fri, 30 Nov 2018 11:44:56 +0000 (06:44 -0500)]
ceph-volume tests.functional add back sdc1 partitions with parted to redeploy after zapping

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

6 years agoceph-volume tests.functional add back partitions with parted to redeploy after zapping
Alfredo Deza [Thu, 29 Nov 2018 23:07:09 +0000 (18:07 -0500)]
ceph-volume tests.functional add back partitions with parted to redeploy after zapping

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

6 years agoceph-volume tests.functional recreate partitions previously removed with --destroy
Alfredo Deza [Thu, 29 Nov 2018 19:10:46 +0000 (14:10 -0500)]
ceph-volume tests.functional recreate partitions previously removed with --destroy

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

6 years agoceph-volume tests.util ensure that both disk and device report is_device
Alfredo Deza [Wed, 28 Nov 2018 21:09:49 +0000 (16:09 -0500)]
ceph-volume tests.util ensure that both disk and device report is_device

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

6 years agoceph-volume tests.util ensure is_encrypted works for lv, partition, and mapper devices
Alfredo Deza [Wed, 28 Nov 2018 21:01:52 +0000 (16:01 -0500)]
ceph-volume tests.util ensure is_encrypted works for lv, partition, and mapper devices

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

6 years agoceph-volume tests.util ensure partitions are listed as top-level keys
Alfredo Deza [Wed, 28 Nov 2018 18:53:56 +0000 (13:53 -0500)]
ceph-volume tests.util ensure partitions are listed as top-level keys

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

6 years agoceph-volume tests add mapper test for dm paths
Alfredo Deza [Wed, 28 Nov 2018 18:47:01 +0000 (13:47 -0500)]
ceph-volume tests add mapper test for dm paths

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

6 years agoceph-volume tests update is_mapper unit test when zapping
Alfredo Deza [Wed, 28 Nov 2018 18:46:05 +0000 (13:46 -0500)]
ceph-volume tests update is_mapper unit test when zapping

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

6 years agoceph-volume util.device check both dm and mapper paths for is_mapper property
Alfredo Deza [Wed, 28 Nov 2018 18:26:59 +0000 (13:26 -0500)]
ceph-volume util.device check both dm and mapper paths for is_mapper property

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

6 years agoceph-volume lvm skip empty vg_name removals
Alfredo Deza [Wed, 28 Nov 2018 13:18:03 +0000 (08:18 -0500)]
ceph-volume lvm skip empty vg_name removals

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

6 years agoceph-volume util.arg_validators optionally skip gpt header check
Alfredo Deza [Wed, 28 Nov 2018 12:56:34 +0000 (07:56 -0500)]
ceph-volume util.arg_validators optionally skip gpt header check

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

6 years agoceph-volume util.device if no vgs, set it to an empty list
Alfredo Deza [Wed, 28 Nov 2018 12:52:46 +0000 (07:52 -0500)]
ceph-volume util.device if no vgs, set it to an empty list

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