]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agomon/OSDMonitor: do not populate void pg_temp into nextmap 25845/head
xie xingguo [Fri, 4 Jan 2019 00:39:01 +0000 (08:39 +0800)]
mon/OSDMonitor: do not populate void pg_temp into nextmap

Due to commit ea723fb, pg_temp with clean acting set are added to inc map.
The original intent was to clear out pg_temps during priming, but as
written it would set a new_pg_temp item clearing the pg_temp even if one
didn't already exist.  Adding the up != acting condition in there makes us
only take that path if there is an existing pg_temp entry to remove.

Fixes: https://tracker.ceph.com/issues/37784
Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
(cherry picked from commit b1d3ca5e78eaee509c923f06e9024c23cc6ce31a)

6 years agoMerge pull request #25838 from alfredodeza/luminous-rm37805
Andrew Schoen [Tue, 8 Jan 2019 21:21:43 +0000 (15:21 -0600)]
Merge pull request #25838 from alfredodeza/luminous-rm37805

luminous ceph-volume tests/functional declare ceph-ansible roles instead of importing them

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume tests/functional declare ceph-ansible roles instead of importing them 25838/head
Alfredo Deza [Mon, 7 Jan 2019 20:15:21 +0000 (15:15 -0500)]
ceph-volume tests/functional declare ceph-ansible roles instead of importing them

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

6 years agoMerge pull request #25776 from alfredodeza/luminous-rm37442
Andrew Schoen [Tue, 8 Jan 2019 15:41:33 +0000 (09:41 -0600)]
Merge pull request #25776 from alfredodeza/luminous-rm37442

luminous ceph-volume normalize comma to dot for string to int conversions

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #25778 from alfredodeza/luminous-rm37486
Andrew Schoen [Tue, 8 Jan 2019 15:38:11 +0000 (09:38 -0600)]
Merge pull request #25778 from alfredodeza/luminous-rm37486

luminous ceph-volume: set permissions right before prime-osd-dir

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #25748 from alfredodeza/luminous-cryptsetup-allow-discards
Andrew Schoen [Mon, 7 Jan 2019 19:55:51 +0000 (13:55 -0600)]
Merge pull request #25748 from alfredodeza/luminous-cryptsetup-allow-discards

luminous ceph-volume: enable device discards

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24374 from smithfarm/wip-26919-luminous
Yuri Weinstein [Mon, 7 Jan 2019 17:21:28 +0000 (09:21 -0800)]
Merge pull request #24374 from smithfarm/wip-26919-luminous

luminous: common: (mon) command sanitization accepts floats when Int type is defined resulting in exception fault in ceph-mon

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25387 from pdvian/wip-37482-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:27:06 +0000 (08:27 -0800)]
Merge pull request #25387 from pdvian/wip-37482-luminous

luminous: rgw: Don't treat colons specially in resource part of ARN

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25444 from theanalyst/wip-luminous-es-fixes
Yuri Weinstein [Mon, 7 Jan 2019 16:26:37 +0000 (08:26 -0800)]
Merge pull request #25444 from theanalyst/wip-luminous-es-fixes

luminous: rgw: es fixes for working with nfs ganesha

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25448 from smithfarm/wip-37519-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:26:03 +0000 (08:26 -0800)]
Merge pull request #25448 from smithfarm/wip-37519-luminous

luminous: rgw: fix max-size in radosgw-admin and REST Admin API

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25484 from pdvian/wip-37549-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:25:26 +0000 (08:25 -0800)]
Merge pull request #25484 from pdvian/wip-37549-luminous

luminous : rgw_file: user info never synced since librgw init

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agoMerge pull request #25506 from smithfarm/wip-37551-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:24:30 +0000 (08:24 -0800)]
Merge pull request #25506 from smithfarm/wip-37551-luminous

luminous: rgw: multisite: sync gets stuck retrying deletes that fail with ERR_PRECONDITION_FAILED

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25512 from smithfarm/wip-36733-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:24:03 +0000 (08:24 -0800)]
Merge pull request #25512 from smithfarm/wip-36733-luminous

luminous: rgw: beast frontend fails to parse ipv6 endpoints

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25644 from pdvian/wip-37563-luminous
Yuri Weinstein [Mon, 7 Jan 2019 16:23:24 +0000 (08:23 -0800)]
Merge pull request #25644 from pdvian/wip-37563-luminous

luminous: rgw: fix version bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
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 agoceph-volume tests.functional fix typo when stopping osd.0 in filestore 25778/head
Alfredo Deza [Mon, 17 Dec 2018 17:35:27 +0000 (12:35 -0500)]
ceph-volume tests.functional fix typo when stopping osd.0 in filestore

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

6 years agoceph-volume tests.functional.lvm stop all osds before activating again to test permis...
Alfredo Deza [Thu, 13 Dec 2018 14:49:41 +0000 (09:49 -0500)]
ceph-volume tests.functional.lvm stop all osds before activating again to test permissions

Otherwise, ``ceph-volume lvm activate --all`` will skip OSDs that are
already running. So the test that verifies that permissions are
corrected will fail because ``activate`` will simply skip them

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

6 years agoceph-volume lvm.activate ensure filestore osd path is chowned always
Alfredo Deza [Thu, 13 Dec 2018 12:45:00 +0000 (07:45 -0500)]
ceph-volume lvm.activate ensure filestore osd path is chowned always

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

6 years agoceph-volume: include the ceph-facts role when needed during testing
Andrew Schoen [Wed, 12 Dec 2018 20:10:59 +0000 (14:10 -0600)]
ceph-volume: include the ceph-facts role when needed during testing

The ceph-ansible stable-3.2 branch does not have the ceph-facts role
but master does. We need to make sure to import this role only when
it's supported.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 569b4fb7b3894275a3b9f4ab603e32099301f9aa)

6 years agoceph-volume tests.functional set root:root in OSDs in filestore
Alfredo Deza [Mon, 10 Dec 2018 19:52:03 +0000 (14:52 -0500)]
ceph-volume tests.functional set root:root in OSDs in filestore

To make sure that ceph-volume will be able to set the right permissions
when trying to activate

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

6 years agoceph-volume tests.functional set root:root in OSDs in bluestore
Alfredo Deza [Mon, 10 Dec 2018 19:38:02 +0000 (14:38 -0500)]
ceph-volume tests.functional set root:root in OSDs in bluestore

To make sure that ceph-volume will be able to set the right permissions
when trying to activate

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

6 years agoceph-volume lvm.activate always chown osd path before osd-prime-dir in bluestore
Alfredo Deza [Mon, 10 Dec 2018 18:27:20 +0000 (13:27 -0500)]
ceph-volume lvm.activate always chown osd path before osd-prime-dir in bluestore

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

6 years agoceph-volume tests.util ensure ints and strings with commas can be converted to ints 25776/head
Alfredo Deza [Wed, 2 Jan 2019 19:18:14 +0000 (14:18 -0500)]
ceph-volume tests.util ensure ints and strings with commas can be converted to ints

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

6 years agoceph-volume test verify strings with a comma can be converted to ints
Alfredo Deza [Fri, 21 Dec 2018 20:26:39 +0000 (15:26 -0500)]
ceph-volume test verify strings with a comma can be converted to ints

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

6 years agoceph-volume util normalize comma with dot for str-to-int conversion
Alfredo Deza [Fri, 21 Dec 2018 20:24:25 +0000 (15:24 -0500)]
ceph-volume util normalize comma with dot for str-to-int conversion

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

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 agoceph-volume: enable device discards 25748/head
Jonas Jelten [Fri, 19 Oct 2018 13:15:03 +0000 (15:15 +0200)]
ceph-volume: enable device discards

When using SSDs as encrypted OSD device, discards do not pass the
encryption layer. This option activates discard requests.

Signed-off-by: Jonas Jelten <jj@stusta.net>
(cherry picked from commit 333330414730bf57c68efe6f1f13841b0a014dae)

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 agorgw: fix version bucket stats 25644/head
lu.shasha [Tue, 19 Sep 2017 06:01:37 +0000 (14:01 +0800)]
rgw: fix version bucket stats

when link a null version delete_marker and the null version instance exists, the existing null version idx should not unlinked in rgw_bucket_link_olh. It will be removed in delete_obj.

Fixes: http://tracker.ceph.com/issues/21429
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit 52a843c598bc0553d8e75ea8290731e26a83aed1)

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 agorgw: beast frontend parses ipv6 addrs 25512/head
Casey Bodley [Thu, 1 Nov 2018 20:17:11 +0000 (16:17 -0400)]
rgw: beast frontend parses ipv6 addrs

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

6 years agorgw: beast frontend uses default port 443 for ssl_endpoint
Casey Bodley [Wed, 31 Oct 2018 18:19:48 +0000 (14:19 -0400)]
rgw: beast frontend uses default port 443 for ssl_endpoint

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 9836ee2643c38afcd0221488d607dffa359e9bd4)

Conflicts:
src/rgw/rgw_asio_frontend.cc
- luminous uses different types for parse_endpoint arguments in function
  definition

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 agorgw: data sync accepts ERR_PRECONDITION_FAILED on remove_object() 25506/head
Casey Bodley [Wed, 28 Nov 2018 18:45:54 +0000 (13:45 -0500)]
rgw: data sync accepts ERR_PRECONDITION_FAILED on remove_object()

sync of deletes uses an If-UnModified-Since precondition, but does not
handle the corresponding ERR_PRECONDITION_FAILED error. treating this as
a failure means that we'll keep retrying the delete which will never
succeed. break this loop by treating ERR_PRECONDITION_FAILED as a
success

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

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 agorgw_file: user info never synced since librgw init 25484/head
taoCH [Wed, 5 Dec 2018 10:20:20 +0000 (18:20 +0800)]
rgw_file: user info never synced since librgw init

Fixed: https://tracker.ceph.com/issues/37527

Signed-off-by: Tao Chen <chentao@umcloud.com>
(cherry picked from commit e611be8dacc2afcfbe40fe5eb7847cf565c27d07)

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 max-size-kb REST quota parameter and add max-size 25448/head
Nick Erdmann [Mon, 24 Sep 2018 10:48:57 +0000 (12:48 +0200)]
rgw: fix max-size-kb REST quota parameter and add max-size

Signed-off-by: Nick Erdmann <n@nirf.de>
(cherry picked from commit 99ce3aaf0b5b78e2c7452ee986d8dbfab08aa2d2)

Conflicts:
doc/radosgw/adminops.rst (trivial resolution)

6 years agorgw/radosgw-admin: allow negative values for --max-size
Nick Erdmann [Wed, 12 Sep 2018 13:56:41 +0000 (15:56 +0200)]
rgw/radosgw-admin: allow negative values for --max-size

Fix regression in e664488e.

Signed-off-by: Nick Erdmann <n@nirf.de>
(cherry picked from commit 0ef92541d34cc897cec97854b358e7e702e44dcb)

6 years agorgw: ES sync: wrap all the decode bls in try block 25444/head
Abhishek Lekshmanan [Tue, 9 Oct 2018 11:52:22 +0000 (13:52 +0200)]
rgw: ES sync: wrap all the decode bls in try block

since decode can throw, wrap all the try block

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 12b12ccea23871688cc4101c72f00b0575f1c01a)

 Conflicts:
src/rgw/rgw_sync_module_es.cc:
using ::encode/::decode