]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agocephfs-shell: use consistent naming for paths 28681/head
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)

6 years agocephfs-shell: remove unnecessary instances of to_bytes
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)

6 years agocephfs-shell: refactor list_items
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)

6 years agopybind/cephfs: improve user-friendliness of DirResult
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)

6 years agopybind/cephfs: avoid unicode check
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)

6 years agocephfs-shell: Remove unnecessary empty line
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)

6 years agocephfs-shell: Fix flake8 bare 'except' warnings
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)

6 years agocephfs-shell: Remove unused variable 'e'
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)

6 years agocephfs-shell: Fix flake8 use != to compare str literals warning
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)

6 years agocephfs-shell: Fixe flake8 line too long error
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)

6 years agocephfs-shell: Remove whitespace after '('
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)

6 years agocephfs-shell: Remove unused 'flag' variable
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)

6 years agocephfs-shell: Fix flake8 invalid escape sequence warning
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)

6 years agocephfs-shell: Remove unnecessary empty lines
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)

6 years agocephfs-shell: Fix flake8 bare 'except' warnings
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)

6 years agoqa: elide python version config
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)

6 years agocephfs-shell: assert python3
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)

6 years agocephfs-shell: Catch OSError exceptions in lcd
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)

6 years agocephfs-shell: Fix 'lls' command errors
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)

6 years agocephfs-shell: Add stat command
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)

6 years agocephfs-shell: add quota management
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)

6 years agocephfs-shell: fix string decoding for ls command
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)

6 years agoMerge pull request #28580 from ukernel/nautilus-40344
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>
6 years agoMerge pull request #28582 from pdvian/wip-40040-nautilus
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>
6 years agoMerge pull request #28611 from batrick/i40223
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>
6 years agoMerge pull request #28618 from ukernel/nautilus-40236
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>
6 years agoMerge pull request #28641 from batrick/i39260-2
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>
6 years agoMerge pull request #28555 from s0nea/wip-40059-nautilus
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>
6 years agoMerge pull request #28552 from sebastian-philipp/wip-40037-nautilus
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>
6 years agoMerge pull request #28516 from smithfarm/wip-40301-nautilus
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>
6 years agocephfs-shell: Revert "cephfs.pyx: add py3 compatibility" 28641/head
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

6 years agoMerge pull request #28233 from pdvian/wip-39670-nautilus
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>
6 years agoMerge pull request #28595 from ajarr/wip-nautilus-refactor-volume-module
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>
6 years agoMerge pull request #28610 from batrick/i40164
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>
6 years agoMerge pull request #28612 from batrick/i40161
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>
6 years agoMerge pull request #28613 from batrick/i40220
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>
6 years agoMerge pull request #28614 from batrick/i39935
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>
6 years agoMerge pull request #28616 from batrick/i39960
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>
6 years agoMerge pull request #28383 from xiaoxichen/wip-40145-nautilus
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>
6 years agoMerge pull request #28410 from cbodley/wip-40148
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>
6 years agoMerge pull request #28476 from smithfarm/wip-40192-nautilus
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>
6 years agoMerge pull request #28511 from b-ranto/wip-selinux-rhel8-nautilus
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>
6 years agoMerge pull request #28541 from pdvian/wip-39746-nautilus
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>
6 years agoMerge pull request #28577 from dillaman/wip-40379-nautilus
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>
6 years agoMerge pull request #28598 from cbodley/wip-40346-nautilus
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>
6 years agomds: avoid passing null to SessionmMap::hit_session() 28618/head
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)

6 years agoqa/cephfs: add test for blacklisted client eviction
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

6 years agomds: fix 'is session in blacklist' check in Server::apply_blacklist()
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

6 years agoMerge pull request #28604 from cbodley/wip-40402-nautilus
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>
6 years agoqa/rgw: fix import error in tasks/swift.py 28604/head
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)

6 years agocephfs-shell: Fix mkdir relative path error 28616/head
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)

6 years agocephfs-shell: teuthology tests 28614/head
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)

6 years agoqa/cephfs: fix test_evict_client 28613/head
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)

6 years agoclient: clean up error checking and return of _lookup_parent 28612/head
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)

6 years agoclient: drop Client::lookup_parent
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)

6 years agomds: reset heartbeat inside big loop 28611/head
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

6 years agocommon/secret.c: fix key parsing when doing a remount 28610/head
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)

6 years agoMerge pull request #28562 from batrick/i40373
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>
6 years agoMerge pull request #28563 from batrick/i40374
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>
6 years agoqa/rgw: skip swift tests on rhel 7.6+
Casey Bodley [Thu, 13 Jun 2019 13:45:29 +0000 (09:45 -0400)]
qa/rgw: skip swift tests on rhel 7.6+

swift bootstrap fails because libev-devel is not available

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

6 years agoMerge pull request #27532 from dillaman/wip-rbd-ncurses-nautilus
Yuri Weinstein [Mon, 17 Jun 2019 15:02:31 +0000 (08:02 -0700)]
Merge pull request #27532 from dillaman/wip-rbd-ncurses-nautilus

nautilus: cmake: Fix build against ncurses with separate libtinfo

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #27915 from pdvian/wip-39241-nautilus
Yuri Weinstein [Mon, 17 Jun 2019 15:00:46 +0000 (08:00 -0700)]
Merge pull request #27915 from pdvian/wip-39241-nautilus

nautilus: msg/async: connection race + winner fault can leave connection stuck at replacing foreve

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #28127 from dillaman/wip-39739-nautilus
Yuri Weinstein [Mon, 17 Jun 2019 14:59:35 +0000 (07:59 -0700)]
Merge pull request #28127 from dillaman/wip-39739-nautilus

nautilus: librbd: fix issues with object-map/fast-diff feature interlock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28131 from dillaman/wip-39573-nautilus
Yuri Weinstein [Mon, 17 Jun 2019 14:58:41 +0000 (07:58 -0700)]
Merge pull request #28131 from dillaman/wip-39573-nautilus

nautilus: common: Clang requires a default constructor, but it can be empty

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #28485 from trociny/wip-40122-nautilus
Yuri Weinstein [Mon, 17 Jun 2019 14:57:56 +0000 (07:57 -0700)]
Merge pull request #28485 from trociny/wip-40122-nautilus

nautilus: pybind/mgr: fix format for rbd-mirror prometheus metrics

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoqa: use curl in wait_for_radosgw() in util/rgw.py 28598/head
Ali Maredia [Wed, 12 Jun 2019 20:12:47 +0000 (16:12 -0400)]
qa: use curl in wait_for_radosgw() in util/rgw.py

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit 9c6afa3fb570629a57612f250a6a4890a65cbc6e)

6 years agomgr / volumes: improve error handling 28595/head
Venky Shankar [Sun, 19 May 2019 17:34:57 +0000 (13:34 -0400)]
mgr / volumes: improve error handling

This cleans up lots of return-fu statements and make the source
look much more pythonic. Functions should raise an instance of
VolumeException() class wherever necessary (error handling).

Fixes: http://tracker.ceph.com/issues/39969
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 241c9cea7c1e489461c17fc43eb77ba28a4fd2c0)

6 years agopy / cephfs: invoke base class Error::__init__() from OSError::__init__()
Venky Shankar [Sun, 19 May 2019 17:20:51 +0000 (13:20 -0400)]
py / cephfs: invoke base class Error::__init__() from OSError::__init__()

This will allow access to `args` when catching `Error`.

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

6 years agomgr / volumes: carve out subvolume operations as a separate class
Venky Shankar [Fri, 17 May 2019 05:40:37 +0000 (01:40 -0400)]
mgr / volumes: carve out subvolume operations as a separate class

Move (and refactor) subvolume specific operations from main module
source to SubVolume class in a new subvolume source. Also, provide
hooks in VolumeClient to forward subvolume specific opertaions to
this class.

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

6 years agomgr / volumes: introduce subvolume specification class
Venky Shankar [Thu, 16 May 2019 05:54:12 +0000 (01:54 -0400)]
mgr / volumes: introduce subvolume specification class

Specifications class that represents a unique subvolume
identified by (subvolume-id, group-id) tuple. Provide
heleper functions for fetching  various subvolume specific
attributes such as subvolume path, group path etc.

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

6 years agomgr / volumes: carve of volume as a separate class
Venky Shankar [Mon, 13 May 2019 12:15:35 +0000 (17:45 +0530)]
mgr / volumes: carve of volume as a separate class

Move volume operations (create/delete) from main module source
to VolumeClient class in new volume source.

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

6 years agomds: avoid sending too many osd requests at once after mds restarts 28582/head
simon gao [Tue, 28 May 2019 02:36:32 +0000 (22:36 -0400)]
mds: avoid sending too many osd requests at once after mds restarts
Fixes: http://tracker.ceph.com/issues/40028
Signed-off-by: simon gao <simon29rock@gmail.com>
(cherry picked from commit 78484352f553d6b67f7d5c82384a186455f05537)

6 years agomds: ignore sessionmap version mismatch if mds_wipe_sessions is set 28580/head
Yan, Zheng [Sat, 8 Jun 2019 09:33:14 +0000 (17:33 +0800)]
mds: ignore sessionmap version mismatch if mds_wipe_sessions is set

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

6 years agomds: fix corner case of replaying open sessions
Yan, Zheng [Sat, 8 Jun 2019 05:08:21 +0000 (13:08 +0800)]
mds: fix corner case of replaying open sessions

Marking a session dirty may flush all existing dirty sessions. MDS
calls Server::finish_force_open_sessions() for log event that opens
multiple sessions. The function marks sessions dirty one by one. So
sessions opened by a log event may get flushed partially.

When replaying a log event that opens multiple sessions, mds need to
check if some of these sessions have already been flushed.

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

6 years agolibrbd: avoid dereferencing an empty container during deep-copy 28577/head
Jason Dillaman [Fri, 14 Jun 2019 17:34:24 +0000 (13:34 -0400)]
librbd: avoid dereferencing an empty container during deep-copy

While updating the image copy progress, a 'while' loop will pop the
last item from the queue and then deference the empty queue.

Fixes: http://tracker.ceph.com/issues/40368
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0f491cbb96ec55c68a627de71ed6ccd781a46dcc)

6 years agoMerge pull request #28429 from ajarr/wip-fs-subvolumes-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:42:07 +0000 (12:42 -0700)]
Merge pull request #28429 from ajarr/wip-fs-subvolumes-nautilus

nautilus: mgr/volumes: add CephFS subvolumes library

6 years agoMerge pull request #28333 from pdvian/wip-39680-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:30:42 +0000 (12:30 -0700)]
Merge pull request #28333 from pdvian/wip-39680-nautilus

nautilus: cephfs: pybind: added lseek()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28499 from smithfarm/wip-40169-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:29:58 +0000 (12:29 -0700)]
Merge pull request #28499 from smithfarm/wip-40169-nautilus

nautilus: cephfs: client: fix "ceph.snap.btime" vxattr value

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
6 years agoMerge pull request #28500 from smithfarm/wip-40167-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:29:20 +0000 (12:29 -0700)]
Merge pull request #28500 from smithfarm/wip-40167-nautilus

nautilus: cephfs: client: ceph.dir.rctime xattr value incorrectly prefixes 09 to the nanoseconds component

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
6 years agoMerge pull request #28375 from pdvian/wip-39686-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:26:36 +0000 (12:26 -0700)]
Merge pull request #28375 from pdvian/wip-39686-nautilus

nautilus: client: fix fuse client hang because its bad session PipeConnection

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28394 from pdvian/wip-39690-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 19:26:13 +0000 (12:26 -0700)]
Merge pull request #28394 from pdvian/wip-39690-nautilus

nautilus: mds: check dir fragment to split dir if mkdir makes it oversized.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: ignore legacy bluestore stats errors 28563/head
Patrick Donnelly [Fri, 14 Jun 2019 18:37:35 +0000 (11:37 -0700)]
qa: ignore legacy bluestore stats errors

Partial-backport: 66f18ecd09973ceab4ff9ff177e69d9c61a30bf2
Fixes: http://tracker.ceph.com/issues/40374
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: stop testing simple messenger in fs qa 28562/head
Patrick Donnelly [Fri, 14 Jun 2019 18:27:01 +0000 (11:27 -0700)]
qa: stop testing simple messenger in fs qa

897a1f738566263fde42832dc23f34a99a554b62 was incomplete.

Fixes: http://tracker.ceph.com/issues/40373
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27439 from liewegas/wip-centos-latest-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 17:23:58 +0000 (10:23 -0700)]
Merge pull request #27439 from liewegas/wip-centos-latest-nautilus

nautilus: qa: centos 7.6 etc

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #28279 from xiexingguo/wip-balancer-new-osd-weight-for-n
Yuri Weinstein [Fri, 14 Jun 2019 17:22:36 +0000 (10:22 -0700)]
Merge pull request #28279 from xiexingguo/wip-balancer-new-osd-weight-for-n

nautilus: mgr/balancer: various compat weight-set fixes

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agoMerge pull request #28291 from b-ranto/wip-nautilus-restful
Yuri Weinstein [Fri, 14 Jun 2019 17:22:14 +0000 (10:22 -0700)]
Merge pull request #28291 from b-ranto/wip-nautilus-restful

nautilus: mgr: Update the restful module in nautilus

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28392 from smithfarm/wip-grafana-suse-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 17:21:46 +0000 (10:21 -0700)]
Merge pull request #28392 from smithfarm/wip-grafana-suse-nautilus

nautilus: ceph.spec.in: install grafana dashboards world readable

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agoMerge pull request #28469 from smithfarm/wip-40232-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 17:21:06 +0000 (10:21 -0700)]
Merge pull request #28469 from smithfarm/wip-40232-nautilus

nautilus: build/ops: python3 pybind RPMs do not replace their python2 counterparts on upgrade even though they should

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #28504 from pdvian/wip-39738-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 16:55:25 +0000 (09:55 -0700)]
Merge pull request #28504 from pdvian/wip-39738-nautilus

nautilus: osd: Output Base64 encoding of CRC header if binary data present

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28309 from pdvian/wip-39676-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 16:54:42 +0000 (09:54 -0700)]
Merge pull request #28309 from pdvian/wip-39676-nautilus

nautilus: rgw: crypto: throw DigestException from Digest and HMAC

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28482 from pdvian/wip-39736-nautilus
Yuri Weinstein [Fri, 14 Jun 2019 16:54:04 +0000 (09:54 -0700)]
Merge pull request #28482 from pdvian/wip-39736-nautilus

nautilus: Add 'RBD_FEATURE_MIGRATING' to rbd.pyx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr/dashboard: Consider user permissions 28555/head
Tatjana Dehler [Wed, 3 Apr 2019 14:24:11 +0000 (16:24 +0200)]
mgr/dashboard: Consider user permissions

Consider user permissions when showing advanced table actions and hide
all buttons requiring missing permissions from the user.
Also consider user permissions when showing submit buttons.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit aa68aca006bc084e6300b55123b82d780e428405)

6 years agomgr/dashboard: Add config filter and delete routes
Tatjana Dehler [Wed, 13 Mar 2019 13:51:43 +0000 (14:51 +0100)]
mgr/dashboard: Add config filter and delete routes

Add a filter route to the configurations endpoint to get a subset of
config options in one request.
Add a delete route to the configurations endpoint to delete a
specific config option value.

The commit contains the frontend and backend related changes.

It also adds the missing '/' to `ConfigurationService.bulkCreate` and
unit test.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit cede2d4590429abacee66537e406f2ed2ff4ac0f)

6 years agomgr/dashboard: Add config option component
Tatjana Dehler [Wed, 6 Mar 2019 15:42:28 +0000 (16:42 +0100)]
mgr/dashboard: Add config option component

This commit adds an initial config option component in order to move
the HTML template and the config option types related code to an own
centralized place to be re-usable by other components

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 1834c68f843726107e57827754087fbd48bf9a13)

6 years agomgr/dashboard: Add PG scrub configuration form
Tatjana Dehler [Fri, 1 Mar 2019 15:11:53 +0000 (16:11 +0100)]
mgr/dashboard: Add PG scrub configuration form

The commit adapts two different parts:

1. It adds all frontend related changes around the PG scrub
   configuration form
2. It also adds an API test case to check the existence of
   all hard-coded config options in the frontend

Fixes: https://tracker.ceph.com/issues/38211
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 808d7cb39ea9c1093c2d6cdd11f22920a05381a8)

6 years agomgr/rook: Raise proper exception in `describe_service` 28552/head
Sebastian Wagner [Mon, 13 May 2019 09:46:57 +0000 (11:46 +0200)]
mgr/rook: Raise proper exception in `describe_service`

`describe_service` is called often and raising
  assertions will pollute the log file with tracebacks.

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

6 years agomgr/dashboard: Load iSCSI config from local store and orchestrator
Sebastian Wagner [Mon, 13 May 2019 09:44:46 +0000 (11:44 +0200)]
mgr/dashboard: Load iSCSI config from local store and orchestrator

As iSCSI is not supported by Rook, users need a way to manage
  ceph-iscsi without Rook knowledge

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

6 years agomgr/dashboard: Merge OrchClient with OrchestratorClientMixin
Sebastian Wagner [Fri, 8 Feb 2019 17:45:22 +0000 (18:45 +0100)]
mgr/dashboard: Merge OrchClient with OrchestratorClientMixin

Fixed missing error propagation from
  the orchestrator to the dashboard

Adapted orchestrator integration in NFS

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

Conflicts:
src/pybind/mgr/dashboard/tools.py

Conflct was: Nautilus doesn't use `ipaddress.IPv6Address()` yet

6 years agodoc: rgw: document v6 endpoint options 28541/head
Abhishek Lekshmanan [Fri, 29 Mar 2019 17:13:52 +0000 (18:13 +0100)]
doc: rgw: document v6 endpoint options

document that v6 endpoints only binds to ipv6

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

6 years agorgw: beast: bind both v4 and v6 ports when using a port argument
Abhishek Lekshmanan [Fri, 29 Mar 2019 16:37:44 +0000 (17:37 +0100)]
rgw: beast: bind both v4 and v6 ports when using a port argument

This commit adds binding to both v4 and v6 port when specifying a port argument,
endpoint *only* binds to v4 or v6 depending on the address specified. Failure to
bind when the protocol is not supported is not treated as an error and we warn
and continue then.

Fixes: http://tracker.ceph.com/issues/39038
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 3a57fcdd11ad8ad3cb903d48a5245e7f9d965f34)