]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Andrew Schoen [Tue, 16 Jul 2019 16:59:35 +0000 (11:59 -0500)]
Merge pull request #29028 from ceph/backport-nautilus-28060
nautilus: ceph-volume: use the Device.rotational property instead of sys_api
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2019 21:04:54 +0000 (14:04 -0700)]
Merge pull request #29022 from smithfarm/wip-40762-nautilus
nautilus: rgw: list bucket with start marker and delimiter will miss next object with char '0'
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Andrew Schoen [Fri, 10 May 2019 16:04:35 +0000 (11:04 -0500)]
ceph-volume: skip missing interpreters when running tox tests
This will skip tests for versions of python that don't exist on the node
that's running the tests.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
f1db0a864814d9b81192d89b6eebb6c624ddec3b )
Andrew Schoen [Fri, 10 May 2019 14:02:08 +0000 (09:02 -0500)]
ceph-volume: use the Device.rotational property instead of sys_api
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=
1666822
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
8ebff475dfa136c88101ef7364820fe3c5cee547 )
Tianshan Qu [Tue, 11 Jun 2019 04:27:12 +0000 (12:27 +0800)]
rgw: always generate after delimiter char to skip directory
the following code also need after_delim_s to skip directory after list
1000 objects
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit
8c6678387b00c862d71cffd6fed6ca6c236e3fb7 )
Tianshan Qu [Tue, 21 May 2019 10:50:06 +0000 (18:50 +0800)]
rgw: fix list bucket with start maker and delimiter '/' will miss next object with char '0'
'/' + 1 = '0', and the start marker will be skipped, so it will miss the
'0' object.
Fixes: http://tracker.ceph.com/issues/39989
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit
43b5264c7d61ae3be56d68f131b544edee307a46 )
Conflicts:
src/rgw/rgw_rados.cc
- nautilus lacks "unsigned" in the line "unsigned char e = delim.back();"
Alfredo Deza [Wed, 10 Jul 2019 12:33:14 +0000 (08:33 -0400)]
Merge pull request #27723 from ceph/backport-nautilus-26957
nautilus: ceph-volume: look for rotational data in lsblk
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Andrew Schoen [Thu, 14 Mar 2019 20:14:40 +0000 (15:14 -0500)]
ceph-volume: look for rotational data in lsblk
Also ask lsblk if a device is rotational if no information
is found in /sys/block, default to True if nothing is found.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=
1666822
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
de748f9aef894b247622ee5dc49c1fbc31097ad0 )
Alfredo Deza [Mon, 8 Jul 2019 17:27:16 +0000 (13:27 -0400)]
Merge pull request #28923 from ceph/backport-nautilus-28294
nautilus: tests: pass --ssh-config to pytest to resolve hosts when connecting
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 8 Jul 2019 17:26:01 +0000 (13:26 -0400)]
Merge pull request #28925 from ceph/backport-nautilus-28866
nautilus: ceph-volume broken assertion errors after pytest changes
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Mon, 8 Jul 2019 17:24:52 +0000 (13:24 -0400)]
Merge pull request #28924 from ceph/backport-nautilus-28836
nautilus: ceph-volume tests add a sleep in tox for slow OSDs after booting
Alfredo Deza [Wed, 3 Jul 2019 18:59:18 +0000 (14:59 -0400)]
ceph-volume api.lvm catch IndexError when parsing dmmapper output
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
bfff70d07a1ccf7fb11a96dd7c63335cfc9b5e26 )
Alfredo Deza [Wed, 3 Jul 2019 18:58:31 +0000 (14:58 -0400)]
ceph-volume tests update to use error.value instead of str(error)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
484be7ffb1e0865ff840090a73036567a1f4f5d2 )
Alfredo Deza [Tue, 2 Jul 2019 12:34:01 +0000 (08:34 -0400)]
ceph-volume tests add a sleep in tox for slow OSDs after booting
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
b398f99f810d97c94af6d943aed4c11a5fd69c19 )
Alfredo Deza [Wed, 29 May 2019 12:56:37 +0000 (08:56 -0400)]
tests: pass --ssh-config to pytest to resolve hosts when connecting
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
ed708e520999c145c3cf8a0c51e4605f275a1771 )
Yuri Weinstein [Mon, 8 Jul 2019 15:03:48 +0000 (08:03 -0700)]
Merge pull request #28922 from cbodley/wip-qa-rgw-swift-server-nautilus
nautilus: qa/rgw: more fixes for swift task
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Casey Bodley [Mon, 1 Jul 2019 16:09:14 +0000 (12:09 -0400)]
qa/rgw: clean up arguments for swift task
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
89fa4e71de3cdbe13cd7a5bc6162babe3016cba4 )
Casey Bodley [Mon, 1 Jul 2019 16:08:11 +0000 (12:08 -0400)]
qa/rgw: swift task filters out config for skipped clients
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
ba3c17c4fad8672d95af0f3cb9e0fb4802d712e6 )
Casey Bodley [Mon, 1 Jul 2019 16:07:16 +0000 (12:07 -0400)]
qa/rgw: swift task looks for rgw_server endpoint
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
5e667c4f73b1f064cc324bcaff9fe35ca9a4abc6 )
Yuri Weinstein [Fri, 5 Jul 2019 15:17:16 +0000 (08:17 -0700)]
Merge pull request #28872 from badone/wip-40670-nautilus
nautilus: qa/ceph-ansible: cephfs_pools variable pgs should be pg_num
Yuri Weinstein [Fri, 5 Jul 2019 15:16:58 +0000 (08:16 -0700)]
Merge pull request #28871 from badone/wip-40669-nautilus
nautilus: qa/ceph-ansible: ceph-ansible requires ansible 2.8
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Brad Hubbard [Mon, 1 Jul 2019 02:31:10 +0000 (12:31 +1000)]
qa/ceph-ansible: Move to ansible 2.8
Fixes: http://tracker.ceph.com/issues/40602
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
cb9bc299df3ff5d022ccdbab0e7421d561e02c7f )
Brad Hubbard [Mon, 1 Jul 2019 06:10:54 +0000 (16:10 +1000)]
qa/ceph-ansible: Replace pgs with pg_num
ceph-ansible expects the variable pg_num, not pgs.
Fixes: http://tracker.ceph.com/issues/40605
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Patrick Donnelly [Fri, 28 Jun 2019 06:09:33 +0000 (23:09 -0700)]
Merge PR #28767 into nautilus
* refs/pull/28767/head:
mgr/volumes: fix incorrect VolumeException arguments
mgr/volumes: allow setting mode
mgr/volumes: allow setting data pool layout
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Ramana Raja [Sun, 23 Jun 2019 16:23:16 +0000 (21:53 +0530)]
mgr/volumes: fix incorrect VolumeException arguments
Fixes: http://tracker.ceph.com/issues/40429
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
695c493257c7e9ae4c2229926393f6487a622616 )
Ramana Raja [Sun, 23 Jun 2019 12:09:36 +0000 (17:39 +0530)]
mgr/volumes: allow setting mode
... of fs subvolumes and subvolume groups during their creation.
Fixes: https://tracker.ceph.com/issues/40299
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
5c00cc30a1ad49b01e4ab84a17b62def88fc83c4 )
Ramana Raja [Thu, 20 Jun 2019 12:15:14 +0000 (17:45 +0530)]
mgr/volumes: allow setting data pool layout
... of fs subvolumes and subvolume groups during their creation.
Fixes: https://tracker.ceph.com/issues/40431
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
22ed8915281033c39df5e6ecceb5eebdc4e1c594 )
Yuri Weinstein [Tue, 25 Jun 2019 14:29:40 +0000 (07:29 -0700)]
Merge pull request #27043 from sebastian-philipp/wip-38808-nautilus
nautilus: mgr/orchestrator: Remove "(add|test|remove)_stateful_service_rule"
Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Yuri Weinstein [Tue, 25 Jun 2019 14:28:04 +0000 (07:28 -0700)]
Merge pull request #28444 from pdvian/wip-39735-nautilus
nautilus: rgw: multisite: mismatch of bucket creation times from List Buckets
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 25 Jun 2019 14:27:21 +0000 (07:27 -0700)]
Merge pull request #28537 from smithfarm/wip-39740-nautilus
nautilus: rgw: swift object expiry fails when a bucket reshards
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Tue, 25 Jun 2019 14:26:11 +0000 (07:26 -0700)]
Merge pull request #28538 from smithfarm/wip-39745-nautilus
nautilus: rgw: fix default_placement containing "/" when storage_class is standard
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 24 Jun 2019 18:58:35 +0000 (11:58 -0700)]
Merge pull request #28723 from yuriw/wip-yuriw-40452-nautilus
qa/tests: added `bluestore_warn_on_legacy_statfs: false` setting
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 24 Jun 2019 15:11:49 +0000 (08:11 -0700)]
qa/tests: added `bluestore_warn_on_legacy_statfs: false` setting
Fixes: http://tracker.ceph.com/issues/40467
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Fri, 21 Jun 2019 22:35:52 +0000 (15:35 -0700)]
Merge pull request #28584 from rhcs-dashboard/nautilus-object-chart
nautilus: mgr/dashboard: show degraded/misplaced/unfound objects.
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Fri, 21 Jun 2019 22:35:13 +0000 (15:35 -0700)]
Merge pull request #28635 from b-ranto/wip-nautilus-dashboard-push
nautilus: mgr/dashboard: Push Grafana dashboards on startup
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Fri, 21 Jun 2019 19:57:23 +0000 (12:57 -0700)]
Merge pull request #28698 from cbodley/wip-qa-rgw-swift-skip-client-nautilus
nautilus: qa/rgw: fix swift warning message
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Fri, 21 Jun 2019 19:33:15 +0000 (12:33 -0700)]
Merge pull request #28661 from yuriw/wip-yuriw-40452-nautilus
qa/tests: added ragweed coverage to stress-split* upgrade suites
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Casey Bodley [Fri, 21 Jun 2019 19:18:55 +0000 (15:18 -0400)]
qa/rgw: fix swift warning message
File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/swift.py", line 245, in task
log.warning('Swift tests cannot run on rhel 7.6+, skipping client {client}'.format(client))
KeyError: 'client'
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
9b8be0584dee616af9df01b9622bf53dfde00fad )
Yuri Weinstein [Fri, 21 Jun 2019 18:43:50 +0000 (11:43 -0700)]
Merge pull request #28681 from batrick/shell-py3-fixes
nautilus: cephfs-shell: misc. cephfs-shell backports
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Patrick Donnelly [Wed, 19 Jun 2019 19:46:26 +0000 (12:46 -0700)]
cephfs-shell: use consistent naming for paths
And some small changes to make some commands take variable arguments and fix
defaults.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
b2e8a02f5953fac5722a25f24783b33de502c013 )
Patrick Donnelly [Wed, 19 Jun 2019 04:12:33 +0000 (21:12 -0700)]
cephfs-shell: remove unnecessary instances of to_bytes
cephfs binding already automatically converts paths and some arguments to
bytes.
Fixes: http://tracker.ceph.com/issues/40455
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ba9f0eefa5466fd0e4bcac03582e8a538a897c26 )
Patrick Donnelly [Wed, 19 Jun 2019 03:57:29 +0000 (20:57 -0700)]
cephfs-shell: refactor list_items
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
2a32752981235989bd3ef7158664fb7e77d7f093 )
Patrick Donnelly [Wed, 19 Jun 2019 03:50:28 +0000 (20:50 -0700)]
pybind/cephfs: improve user-friendliness of DirResult
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
dff5b1a5d09bf8481cb4e2a0cd0bbbd44b8f20cf )
Patrick Donnelly [Wed, 19 Jun 2019 03:38:26 +0000 (20:38 -0700)]
pybind/cephfs: avoid unicode check
py3 does not have the unicode built-in. Instead, simply try to do the encoding
and catch failures appropriately. If it quacks like a duck...
(Note that cython apparently cheats and allows the unicode check but this is
simpler.)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
9bc49fefcd81fbb1c0ce62b1b81f3be420e81663 )
Varsha Rao [Thu, 6 Jun 2019 15:47:19 +0000 (21:17 +0530)]
cephfs-shell: Remove unnecessary empty line
This patch fixes flake8 too many blank lines error.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
d141adac9ae8b704884d160b5458a431321a0b2a )
Varsha Rao [Thu, 6 Jun 2019 15:44:02 +0000 (21:14 +0530)]
cephfs-shell: Fix flake8 bare 'except' warnings
Instead of bare 'except', catch OSError and libcephfs exceptions.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
d063e8b1e05a23f3f15fe2080ec57fe6242e64f4 )
Varsha Rao [Thu, 6 Jun 2019 15:24:21 +0000 (20:54 +0530)]
cephfs-shell: Remove unused variable 'e'
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
6a0a5ed83d6d3e2bb9977bda2c773d5d5b6accf7 )
Varsha Rao [Thu, 6 Jun 2019 15:21:31 +0000 (20:51 +0530)]
cephfs-shell: Fix flake8 use != to compare str literals warning
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
db7b9306fb94efbe0c12283c614554727fbf6f1e )
Varsha Rao [Thu, 6 Jun 2019 15:08:15 +0000 (20:38 +0530)]
cephfs-shell: Fixe flake8 line too long error
Break the line into multiple lines and add new variable wherever necessary, to
fix the line too long error.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e41d467d4f482665fb09bb00edde7c03d6376b82 )
Varsha Rao [Mon, 13 May 2019 12:15:35 +0000 (17:45 +0530)]
cephfs-shell: Remove whitespace after '('
This patch fixes flake8 whitespace error.
Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
2136530dab1d8894c10ec63bb84752604cf6065f )
Varsha Rao [Mon, 13 May 2019 12:11:06 +0000 (17:41 +0530)]
cephfs-shell: Remove unused 'flag' variable
This patch fixes flake8 unused local variable error.
Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
20c31ea2397545790154140822cc2668d85b913f )
Varsha Rao [Mon, 13 May 2019 12:00:01 +0000 (17:30 +0530)]
cephfs-shell: Fix flake8 invalid escape sequence warning
Backslash-character pair is not a valid escape sequence, since Python 3.6
version. Prefixing character 'r' to the escape sequence, fixes the warning.
Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
c7d217c2afcb9cdc64356f6a6b1f8f701c7814d9 )
Varsha Rao [Mon, 13 May 2019 11:52:07 +0000 (17:22 +0530)]
cephfs-shell: Remove unnecessary empty lines
This patch fixes flake8 too many blank lines error.
Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
f322affda07e41996189b43ec227856076d39d26 )
Varsha Rao [Mon, 13 May 2019 11:43:39 +0000 (17:13 +0530)]
cephfs-shell: Fix flake8 bare 'except' warnings
Instead of bare 'except', catch just libcephfs exceptions.
Fixes: https://tracker.ceph.com/issues/39717
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e6b6cf4ba5814e80da22b3b95b3686831202e483 )
Patrick Donnelly [Tue, 18 Jun 2019 22:14:22 +0000 (15:14 -0700)]
qa: elide python version config
This test doesn't actually use the config and cephfs-shell is py3 only.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ff1f04f4d538d3c713d34fa4a77c4ff3eb58e01d )
Patrick Donnelly [Tue, 18 Jun 2019 22:11:58 +0000 (15:11 -0700)]
cephfs-shell: assert python3
There's little reason to support this new tool with python2.
Fixes: http://tracker.ceph.com/issues/40418
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
de429c48c45add1fcf16b1e019e9598af48bb8f5 )
Varsha Rao [Mon, 10 Jun 2019 11:12:58 +0000 (16:42 +0530)]
cephfs-shell: Catch OSError exceptions in lcd
This patch adds try-except statement to catch the OSError exceptions.
Fixes: http://tracker.ceph.com/issues/40243
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
4b958532e6c9648b73bdd78e0758ca6ddc4cf344 )
Varsha Rao [Mon, 10 Jun 2019 13:33:53 +0000 (19:03 +0530)]
cephfs-shell: Fix 'lls' command errors
This patch fixes following:
* Not printing complete path when '..' is passed as argument.
* Printing of path for current working directory.
* No need to set default value for add_argument. As it returns empty list with
nargs='*'.
* No need to check for absolute path. os.listdir takes both relative and
absolute path.
* Use try-catch instead of if-else statement to catch exceptions.
Fixes: http://tracker.ceph.com/issues/40244
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
d1ddd4c50f56331c7036964f78d4e399e10431b8 )
Varsha Rao [Wed, 24 Apr 2019 14:18:09 +0000 (19:48 +0530)]
cephfs-shell: Add stat command
This patch adds stat command to cephfs-shell.
Fixes: https://tracker.ceph.com/issues/38829
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
07263fe0f2dbefc936a987eb0379221a28eb42e7 )
Milind Changire [Thu, 9 May 2019 06:25:05 +0000 (11:55 +0530)]
cephfs-shell: add quota management
Quotas can be managed by:
$ quota get dir
$ quota set {--max_files MAX_FILES} {--max_bytes MAX_BYTES} dir
Fixes: http://tracker.ceph.com/issues/39165
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
d187e9b0a917b828530bda89866d6a4867e9f9ff )
Milind Changire [Mon, 29 Apr 2019 10:59:27 +0000 (16:29 +0530)]
cephfs-shell: fix string decoding for ls command
* fix string decoding for ls command
* fix string decoding for is_dir_exists() and is_file_exists()
* fix minor flake8-3.7 warnings about indentation and line length
Fixes: http://tracker.ceph.com/issues/39404
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
b9445a496782db73a6ee21d95100dc16069dd986 )
Yuri Weinstein [Wed, 19 Jun 2019 19:31:44 +0000 (12:31 -0700)]
qa/tests: added ragweed coverage to stress-split* upgrade suites
added ceph config set global bluestore_warn_on_legacy_statfs fals
chnaged user "foo" to "ragweed" in ragweed.py
Fixes: http://tracker.ceph.com/issues/40452
Fices: http://tracker.ceph.com/issues/40467
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:39:06 +0000 (09:39 -0700)]
Merge pull request #28580 from ukernel/nautilus-40344
nautilus: mds: fix corner case of replaying open sessions
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:38:37 +0000 (09:38 -0700)]
Merge pull request #28582 from pdvian/wip-40040-nautilus
nautilus: mds: avoid sending too many osd requests at once after mds restarts
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:37:54 +0000 (09:37 -0700)]
Merge pull request #28611 from batrick/i40223
nautilus: mds: reset heartbeat during long-running loops in recovery
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:37:19 +0000 (09:37 -0700)]
Merge pull request #28618 from ukernel/nautilus-40236
nautilus: mds: fix 'is session in blacklist' check in Server::apply_blacklist()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:36:59 +0000 (09:36 -0700)]
Merge pull request #28641 from batrick/i39260-2
nautilus: cephfs-shell: Revert "cephfs.pyx: add py3 compatibility"
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Thu, 20 Jun 2019 16:36:28 +0000 (09:36 -0700)]
Merge pull request #28555 from s0nea/wip-40059-nautilus
nautilus: mgr/dashboard: Add custom dialogue for configuring PG scrub parameters
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Yuri Weinstein [Wed, 19 Jun 2019 16:21:46 +0000 (09:21 -0700)]
Merge pull request #28552 from sebastian-philipp/wip-40037-nautilus
nautilus: dashboard: orchestrator mgr modules assert failure on iscsi service request
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Wed, 19 Jun 2019 16:09:58 +0000 (09:09 -0700)]
Merge pull request #28516 from smithfarm/wip-40301-nautilus
nautilus: build/ops: cmake: set empty-string RPATH for ceph-osd
Reviewed-by: Kefu Chai <kchai@redhat.com>
Varsha Rao [Thu, 11 Apr 2019 07:03:12 +0000 (12:33 +0530)]
cephfs-shell: Revert "cephfs.pyx: add py3 compatibility"
This reverts commit
5106582fc7edae7f39161cf89e566c020fcfa0ce .
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
417836de308a8b642fec5f03d819800142155b34 )
This revert was missing from #27531
Yuri Weinstein [Wed, 19 Jun 2019 00:42:53 +0000 (17:42 -0700)]
Merge pull request #28233 from pdvian/wip-39670-nautilus
nautilus: mds: output lock state in format dump
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:42:31 +0000 (17:42 -0700)]
Merge pull request #28595 from ajarr/wip-nautilus-refactor-volume-module
nautilus: mgr/volumes: refactor volume module
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:42:03 +0000 (17:42 -0700)]
Merge pull request #28610 from batrick/i40164
nautilus: cephfs: mount: key parsing fail when doing a remount
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:41:12 +0000 (17:41 -0700)]
Merge pull request #28612 from batrick/i40161
nautilus: cephfs: FSAL_CEPH assertion failed in Client::_lookup_name: "parent->is_dir()"
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:40:52 +0000 (17:40 -0700)]
Merge pull request #28613 from batrick/i40220
nautilus: tests: cephfs: TestMisc.test_evict_client fails
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:39:47 +0000 (17:39 -0700)]
Merge pull request #28614 from batrick/i39935
nautilus: tests: cephfs-shell: teuthology tests
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 19 Jun 2019 00:39:01 +0000 (17:39 -0700)]
Merge pull request #28616 from batrick/i39960
nautilus: cephfs-shell: mkdir error for relative path
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 16:18:58 +0000 (09:18 -0700)]
Merge pull request #28383 from xiaoxichen/wip-40145-nautilus
nautilus: rgw: fix Multisite sync corruption
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 16:18:28 +0000 (09:18 -0700)]
Merge pull request #28410 from cbodley/wip-40148
nautilus: rgw: fix bucket may redundantly list keys after BI_PREFIX_CHAR
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 16:17:14 +0000 (09:17 -0700)]
Merge pull request #28476 from smithfarm/wip-40192-nautilus
nautilus: Rados.get_fsid() returning bytes in python3
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 16:16:47 +0000 (09:16 -0700)]
Merge pull request #28511 from b-ranto/wip-selinux-rhel8-nautilus
nautilus: selinux: Update the policy for RHEL8
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 15:25:55 +0000 (08:25 -0700)]
Merge pull request #28541 from pdvian/wip-39746-nautilus
nautilus: rgw: beast: multiple v4 and v6 endpoints with the same port will cause failure
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 18 Jun 2019 15:16:32 +0000 (08:16 -0700)]
Merge pull request #28577 from dillaman/wip-40379-nautilus
nautilus: librbd: avoid dereferencing an empty container during deep-copy
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 18 Jun 2019 15:15:41 +0000 (08:15 -0700)]
Merge pull request #28598 from cbodley/wip-40346-nautilus
nautilus: qa: use curl in wait_for_radosgw() in util/rgw.py
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Zack Cerza [Tue, 22 Jan 2019 00:30:44 +0000 (17:30 -0700)]
mgr/dashboard: Push Grafana dashboards on startup
Because we didn't have viable way to populate Grafana dashboards in a
fully containerized context, we needed a different method. This will
work in packaged and containerized deployments.
We provide three methods to push the dashboard JSON files to the Grafana
instance: a command (ceph dashboard update-grafana-dashboards); an API
endpoint (/api/grafana/update_dashboards); and an automatic on-startup
feature that is disabled by default (ceph dashboard
set-grafana-update-dashboards true). The on-startup method will also
retry periodically to avoid racing with the startup of Grafana itself.
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
c0bc7dafa777cfb349f372237ec91c5285dd4df2 )
Yan, Zheng [Wed, 29 May 2019 12:59:17 +0000 (20:59 +0800)]
mds: avoid passing null to SessionmMap::hit_session()
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
e3c6a9bba4264963e985b9f8e3371c2757e7803c )
Yan, Zheng [Wed, 29 May 2019 11:58:46 +0000 (19:58 +0800)]
qa/cephfs: add test for blacklisted client eviction
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
89759654c1efc0a2913286872dca41b2bbffe7ff )
Conflicts:
qa/tasks/cephfs/cephfs_test_case.py
qa/tasks/cephfs/test_exports.py
Yan, Zheng [Wed, 29 May 2019 08:25:28 +0000 (16:25 +0800)]
mds: fix 'is session in blacklist' check in Server::apply_blacklist()
Blacklist entries are always TYPE_ANY for nautilus+, but client's
entity addr type can be legacy.
Fixes: http://tracker.ceph.com/issues/40061
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
0d51266c45f4b2a9b0ab6b34b622dc76fbfd4bd2 )
Conflicts:
src/mds/Server.cc
Yuri Weinstein [Mon, 17 Jun 2019 20:27:54 +0000 (13:27 -0700)]
Merge pull request #28604 from cbodley/wip-40402-nautilus
nautilus: qa/rgw: skip swift tests on rhel 7.6+
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Casey Bodley [Mon, 17 Jun 2019 15:54:36 +0000 (11:54 -0400)]
qa/rgw: fix import error in tasks/swift.py
> ImportError: No module named packaging
replaces packaging.version.Version with distutils.version.LooseVersion
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
2dd5574cf9a5a80cc40a365675bb1e33a32c9f41 )
Varsha Rao [Fri, 26 Apr 2019 17:50:51 +0000 (23:20 +0530)]
cephfs-shell: Fix mkdir relative path error
Directory is not created for relative path. This patch fixes it.
Fixes: https://tracker.ceph.com/issues/39507
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e89287673c3470b00125682b1d0bdab6e0e08ef4 )
Milind Changire [Thu, 9 May 2019 06:07:31 +0000 (11:37 +0530)]
cephfs-shell: teuthology tests
* mkdir
* get
* put
Fixes: http://tracker.ceph.com/issues/39526
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
73ada8d1d92ed2cc8b48d07f05d1dabb6710452e )
Yan, Zheng [Wed, 5 Jun 2019 14:04:22 +0000 (22:04 +0800)]
qa/cephfs: fix test_evict_client
explictly kill stale session, otherwise session count check is racy.
Fixes: https://tracker.ceph.com/issues/40173
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
4fd0202fdf0410d788402f6eefda44b79cf0a643 )
Jeff Layton [Thu, 30 May 2019 19:56:53 +0000 (15:56 -0400)]
client: clean up error checking and return of _lookup_parent
ll_lookup_inode can end up getting back 0 from _lookup_parent,
without zeroing out the parent pointer, which ends up remaining
uninitialized.
Fix this by moving most of the sanity checks in _lookup_parent
into ll_lookup_inode, and only have it issue the call to the MDS.
This also allows us to do the checks in a more sane order.
Fixes: http://tracker.ceph.com/issues/40085
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
3ade7c046c6c5eaf20517d0713a805a681128831 )
Jeff Layton [Thu, 30 May 2019 19:52:11 +0000 (15:52 -0400)]
client: drop Client::lookup_parent
Nothing calls this method.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
5c419b64755c200d43b60d1b435f09a4e5b17f7e )
Yan, Zheng [Wed, 5 Jun 2019 10:05:15 +0000 (18:05 +0800)]
mds: reset heartbeat inside big loop
Fixes: https://tracker.ceph.com/issues/40171
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
d90403c8df90ed06564c84bb2dd38c16861cf34e )
Conflicts:
src/mds/MDCache.cc
Luis Henriques [Thu, 16 May 2019 10:50:56 +0000 (11:50 +0100)]
common/secret.c: fix key parsing when doing a remount
When doing a CephFS remount (-o remount) the secret is parsed from procfs
and we get '<hidden>' as a result and the mount will fail with:
secret is not valid base64: Invalid argument.
adding ceph secret key to kernel failed: Invalid argument.
As the kernel already have the key, we simply need to use it.
Fixes: https://tracker.ceph.com/issues/39951
Signed-off-by: Luis Henriques <lhenriques@suse.com>
(cherry picked from commit
f44516bcde8d48ef5dca4f92017d1e241eb8e26e )
Yuri Weinstein [Mon, 17 Jun 2019 19:01:45 +0000 (12:01 -0700)]
Merge pull request #28562 from batrick/i40373
nautilus: qa: stop testing simple messenger in fs qa
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 17 Jun 2019 19:00:27 +0000 (12:00 -0700)]
Merge pull request #28563 from batrick/i40374
nautilus: qa: ignore legacy bluestore stats errors
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>