]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoMerge pull request #37817 from smithfarm/wip-47987-octopus
Yuri Weinstein [Thu, 5 Nov 2020 16:21:55 +0000 (08:21 -0800)]
Merge pull request #37817 from smithfarm/wip-47987-octopus

octopus: mon/MonMap: fix unconditional failure for init_with_hosts

Reviewed-by: Wido den Hollander <wido@widodh.nl>
4 years agoMerge pull request #37784 from bk201/wip-47657-octopus
Lenz Grimmer [Thu, 5 Nov 2020 10:52:54 +0000 (11:52 +0100)]
Merge pull request #37784 from bk201/wip-47657-octopus

octopus: mgr/dashboard: display devices' health information within a tabset

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
4 years agoMerge pull request #37239 from rhcs-dashboard/read_only_backport
Lenz Grimmer [Tue, 3 Nov 2020 12:59:36 +0000 (13:59 +0100)]
Merge pull request #37239 from rhcs-dashboard/read_only_backport

octopus: mgr/dashboard: Disabling the form inputs for the read_only modals

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #37530 from batrick/i47734-octopus
Yuri Weinstein [Thu, 29 Oct 2020 20:08:37 +0000 (13:08 -0700)]
Merge pull request #37530 from batrick/i47734-octopus

octopus: osdc: add timeout configs for mons/osds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37256 from batrick/i47249
Yuri Weinstein [Thu, 29 Oct 2020 20:05:53 +0000 (13:05 -0700)]
Merge pull request #37256 from batrick/i47249

octopus: mon: deleting a CephFS and its pools causes MONs to crash

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37852 from smithfarm/wip-47889-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:50:05 +0000 (11:50 -0700)]
Merge pull request #37852 from smithfarm/wip-47889-octopus

octopus: rbd: librbd: ignore -ENOENT error when disabling object-map

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37851 from smithfarm/wip-47888-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:49:42 +0000 (11:49 -0700)]
Merge pull request #37851 from smithfarm/wip-47888-octopus

octopus: rbd: librbd: update AioCompletion return value before evaluating pending count

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37850 from smithfarm/wip-47886-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:49:13 +0000 (11:49 -0700)]
Merge pull request #37850 from smithfarm/wip-47886-octopus

octopus: rbd: journal: possible race condition between flush and append callback

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37849 from smithfarm/wip-48003-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:48:31 +0000 (11:48 -0700)]
Merge pull request #37849 from smithfarm/wip-48003-octopus

octopus: rgw: fix: S3 API KeyCount incorrect return.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37847 from smithfarm/wip-47956-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:48:02 +0000 (11:48 -0700)]
Merge pull request #37847 from smithfarm/wip-47956-octopus

octopus: rgw/gc: fix for incrementing the perf counter 'gc_retire_object'

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37846 from smithfarm/wip-47955-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:47:19 +0000 (11:47 -0700)]
Merge pull request #37846 from smithfarm/wip-47955-octopus

octopus: rgw/gc: fixing the condition when marker for a queue is

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37845 from smithfarm/wip-47896-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:46:49 +0000 (11:46 -0700)]
Merge pull request #37845 from smithfarm/wip-47896-octopus

octopus: rgw: use yum rather than dnf for teuthology testing of rgw-orphan-list

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #37812 from smithfarm/wip-48007-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:46:11 +0000 (11:46 -0700)]
Merge pull request #37812 from smithfarm/wip-48007-octopus

octopus: rbd: rbd-nbd: don't ignore namespace when unmapping by image spec

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #37809 from smithfarm/wip-47962-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:45:23 +0000 (11:45 -0700)]
Merge pull request #37809 from smithfarm/wip-47962-octopus

octopus: rgw: Add request timeout to beast

Reviewed-by: Friedmann <ofriedma@redhat.com>
4 years agoMerge pull request #37807 from smithfarm/wip-47960-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:44:45 +0000 (11:44 -0700)]
Merge pull request #37807 from smithfarm/wip-47960-octopus

octopus: rgw: fix expiration header returned even if there is only one tag in the object the same as the rule

Reviewed-by: Friedmann <ofriedma@redhat.com>
4 years agoMerge pull request #37803 from smithfarm/wip-47819-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:43:55 +0000 (11:43 -0700)]
Merge pull request #37803 from smithfarm/wip-47819-octopus

octopus: rgw: radosgw-admin should paginate internally when listing bucket

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37800 from smithfarm/wip-47817-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:42:22 +0000 (11:42 -0700)]
Merge pull request #37800 from smithfarm/wip-47817-octopus

octopus: rgw: allow rgw-orphan-list to note when rados objects are in namespace

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #37779 from smithfarm/wip-47037-octopus
Yuri Weinstein [Thu, 29 Oct 2020 18:40:50 +0000 (11:40 -0700)]
Merge pull request #37779 from smithfarm/wip-47037-octopus

octopus: rgw: fix user stats iterative increment

Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37551 from Vicente-Cheng/wip-47736-octopus
Yuri Weinstein [Wed, 28 Oct 2020 19:41:53 +0000 (12:41 -0700)]
Merge pull request #37551 from Vicente-Cheng/wip-47736-octopus

octopus: rgw: rgw_file: avoid long-ish delay on shutdown

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37688 from bk201/wip-47822-octopus
Lenz Grimmer [Wed, 28 Oct 2020 14:56:50 +0000 (15:56 +0100)]
Merge pull request #37688 from bk201/wip-47822-octopus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #37597 from rhcs-dashboard/wip-47792-octopus
Lenz Grimmer [Wed, 28 Oct 2020 14:54:22 +0000 (15:54 +0100)]
Merge pull request #37597 from rhcs-dashboard/wip-47792-octopus

octopus: mgr/dashboard: Add short descriptions to the telemetry report preview

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agodoc/PendingReleaseNotes: clean up for 15.2.6 37817/head
Nathan Cutler [Tue, 27 Oct 2020 20:40:38 +0000 (21:40 +0100)]
doc/PendingReleaseNotes: clean up for 15.2.6

This commit drops release notes that have already been published and
organizes the remaining release notes under a heading so it is clear
they are targeting the 15.2.6 release.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agomon/MonMap: fix unconditional failure for init_with_hosts
Patrick Donnelly [Thu, 22 Oct 2020 17:08:26 +0000 (10:08 -0700)]
mon/MonMap: fix unconditional failure for init_with_hosts

This bug prevents setting mon_host to a DNS name.

Fixes: https://tracker.ceph.com/issues/47951
Fixes: 7a1f02acfe6b5d8a760efd16bb594a0656b39eac
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 21d9f8333b8c76979bbe90d60a8ad6ebb5e36c76)

4 years agotest/mon: add tests for mon_host build by hostname
Patrick Donnelly [Fri, 23 Oct 2020 23:33:23 +0000 (16:33 -0700)]
test/mon: add tests for mon_host build by hostname

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

Conflicts:
    src/test/mon/MonMap.cc
- do not attempt to introduce boost::intrusive_ptr into Nautilus
- monmap.build_initial takes bare cct in nautilus (master: cct.get())

4 years agotest/mon: fix compiler errors in MonMap unittest
Patrick Donnelly [Fri, 23 Oct 2020 23:28:08 +0000 (16:28 -0700)]
test/mon: fix compiler errors in MonMap unittest

The code atrophied. Clean this up.

The tests are disabled because they SIGSEGV during SetUp.

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

Conflicts:
    src/test/mon/MonMap.cc
- do not attempt to introduce boost::intrusive_ptr into nautilus
- monmap.build_initial takes bare cct in nautilus (master: cct.get())

4 years agoMerge pull request #37691 from smithfarm/wip-47877-octopus
Nathan Cutler [Tue, 27 Oct 2020 16:58:32 +0000 (17:58 +0100)]
Merge pull request #37691 from smithfarm/wip-47877-octopus

octopus: doc: cephfs: improve documentation of "ceph nfs cluster create" and "ceph fs volume create" commands

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agostrtol: Add parse/consume for string_view friendly interface 37809/head
Adam C. Emerson [Fri, 6 Mar 2020 04:13:47 +0000 (23:13 -0500)]
strtol: Add parse/consume for string_view friendly interface

Also these don't have the stringstream overhead.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit a29695e82ec8a93b000322773949f30694abf3d3)

4 years agolibrbd: ignore -ENOENT error when disabling object-map 37852/head
Jason Dillaman [Mon, 12 Oct 2020 19:28:52 +0000 (15:28 -0400)]
librbd: ignore -ENOENT error when disabling object-map

Fixes: https://tracker.ceph.com/issues/47840
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8e88224d8d1e7602392a81ed4da8139a79600d8f)

4 years agolibrbd: update AioCompletion return value before evaluating pending count 37851/head
Jason Dillaman [Tue, 13 Oct 2020 01:34:25 +0000 (21:34 -0400)]
librbd: update AioCompletion return value before evaluating pending count

If the pending count is decremented before the return value is updated,
there is a possibility of two ASIO threads concurrently decrementing the
pending count down from 2 -> 1 -> 0. In the second thread (the one that
performs the final decrement from 1 -> 0), it can finalize the completion
before the first thread has had a chance to update the return value.

Fixes: https://tracker.ceph.com/issues/47847
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 94f3bce53c39017028ce44a80697f55af2a82e68)

4 years agojournal: possible race condition between flush and append callback 37850/head
Jason Dillaman [Fri, 16 Oct 2020 15:25:39 +0000 (11:25 -0400)]
journal: possible race condition between flush and append callback

When notifying the journal recorder of an overflow or if the object
close request has completed due to no more in-flight IO, it was
possible for a race between a flush request and the processing of
an append completion to attempt to kick off duplicate notifications.
Since the overflowed and closed callbacks are properly protected from
duplicates, use a counter instead of a boolean to track possible
in-flight handler callbacks.

Fixes: https://tracker.ceph.com/issues/47880
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 458ab997fe77ea78803a34c6c9715225aa3413ba)

4 years agorgw: fix: S3 API KeyCount incorrect return. 37849/head
胡玮文 [Thu, 24 Sep 2020 15:34:43 +0000 (23:34 +0800)]
rgw: fix: S3 API KeyCount incorrect return.

KeyCount should return object count + common prefix count.
see S3 example: https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html#API_ListObjectsV2_Example_5

Related: https://github.com/docker/distribution/issues/3200

Signed-off-by: 胡玮文 <huww98@outlook.com>
(cherry picked from commit f96a6fdad16da2a7093f538ee577248dfbc65ca1)

4 years agorgw/gc: fix for incrementing the perf counter 'gc_retire_object' 37847/head
Pritha Srivastava [Fri, 25 Sep 2020 07:51:18 +0000 (13:21 +0530)]
rgw/gc: fix for incrementing the perf counter 'gc_retire_object'
in the new gc queue code for omap offload, when gc objects from queue
are deleted. This was missed out initially.

Fixes: https://tracker.ceph.com/issues/47908
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit bde4c5bf9123bfa03189accd064b813a0d3179b9)

4 years agorgw/gc: fixing the condition when marker for a queue is 37846/head
Pritha Srivastava [Wed, 14 Oct 2020 11:05:50 +0000 (16:35 +0530)]
rgw/gc: fixing the condition when marker for a queue is
always reset to empty which causes RGWGC::list to get stuck in
a loop, which ultimately is broken out of when the queue's truncated
flag is false.

1. Check for entries size also while evaluating whether objects cache for
a gc object should be marked as 'transitioned' in case of cls_rgw_gc_list.
When there are no entries, we get back a return value of 0, and the
object cache is not marked as 'transitioned'.

2. Also for the last gc object, we need to check whether the queue is still
under process and set the correct flag.

Missing the two conditions above causes the GC::list to loop continously
over the same gc object.

Fixes: https://tracker.ceph.com/issues/47909
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit bf3f3ba675d092f48e403826fc0813e23c07045d)

4 years agorgw: use yum rather than dnf for testing rgw-orphan-list 37845/head
J. Eric Ivancich [Thu, 15 Oct 2020 18:14:04 +0000 (14:14 -0400)]
rgw: use yum rather than dnf for testing rgw-orphan-list

The teuthology testing for rgw-orphan-list needs to install
`s3cmd`. Switch from using dnf to yum to work on a wider variety of
platforms.

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

4 years agotest/mon: build MonMap unittest
Patrick Donnelly [Fri, 23 Oct 2020 23:27:39 +0000 (16:27 -0700)]
test/mon: build MonMap unittest

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

4 years agorbd-nbd: don't ignore namespace when unmapping by image spec 37812/head
Mykola Golub [Sun, 27 Sep 2020 16:59:49 +0000 (17:59 +0100)]
rbd-nbd: don't ignore namespace when unmapping by image spec

Fixes: https://tracker.ceph.com/issues/47665
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit b360186eb6463811ce19f21e8d24ab7c44dc7279)

4 years agoqa/workunits/rbd: yet another attempt to improve rbd-nbd unmap
Mykola Golub [Thu, 10 Sep 2020 13:08:42 +0000 (14:08 +0100)]
qa/workunits/rbd: yet another attempt to improve rbd-nbd unmap

Previously it still could race when unmap_device returned success
because the device was not found in `rbd-nbd list-mapped` (the nbd
device was removed) but the test failed because the process was still
found in the ps table.

Fixes: https://tracker.ceph.com/issues/47394
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit f0c69761c8036a57319ead5cdf97cebb0f0fb5d7)

Conflicts:
qa/workunits/rbd/rbd-nbd.sh
- omit changes in tests that are not in octopus

4 years agorgw: Add request timeout beast
Or Friedmann [Wed, 27 May 2020 15:57:44 +0000 (18:57 +0300)]
rgw: Add request timeout beast

Add request timeout beast

The beast frontend will use the same parameter as the civetweb one, request_timeout_ms and will be configured to 65 seconds by default

Fixes: https://tracker.ceph.com/issues/45431
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 5d5f9a0d41721f08b19f8425149fd13f4ef13696)

4 years agorgw: radosgw-admin should paginate internally when listing bucket 37803/head
J. Eric Ivancich [Thu, 1 Oct 2020 17:33:01 +0000 (13:33 -0400)]
rgw: radosgw-admin should paginate internally when listing bucket

Currently `radosgw-admin bucket list ...`, when listing a bucket, asks
for the value of "--max-entries" internally. To list a large bucket
entirely the user would have to set "--max-entries" to a large value
(e.g., 10000000). Internally this doesn't paginate, so it will try to
produce the entire list at once. This can consume a lot of memory, and
there are known cases where this induces an out-of-memory crash.

So now we'll set a maximum pagination size of 10,000. So even with
large values of "--max-entries" it will still be able to produce the
full listing without stressing memory, because it will ask for at most
10,000 entries at a time.

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

Conflicts:
src/rgw/rgw_admin.cc
- formatter does not have get() method in octopus

4 years agorgw: fix expiration header returned even if there is only one tag in the object the... 37807/head
Or Friedmann [Thu, 23 Jul 2020 15:36:07 +0000 (18:36 +0300)]
rgw: fix expiration header returned even if there is only one tag in the object the same as the rule

Expiration header returned even if there is only one tag in the object the same as the rule

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
Reported-by: Avi Mor <avmor@redhat.com>
Fixes: https://tracker.ceph.com/issues/46614
(cherry picked from commit bf7c7e59f390afb53cb1e30a440ab26bb093c11c)

4 years agorgw: rgw-orphan-list should use "plain" formatted `rados ls` output 37800/head
J. Eric Ivancich [Fri, 9 Oct 2020 20:06:55 +0000 (16:06 -0400)]
rgw: rgw-orphan-list should use "plain" formatted `rados ls` output

The previous version that used "json-pretty" output for `rados ls`
added complications due to json's escaping of special characters. So
this version returns to the "plain" output for `rados ls` but deals
with entries (oids) that might have namespaces and/or locators as
well.

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

4 years agorgw: allow rgw-orphan-list to note when rados objects are in namespace
J. Eric Ivancich [Tue, 6 Oct 2020 19:21:02 +0000 (15:21 -0400)]
rgw: allow rgw-orphan-list to note when rados objects are in namespace

Currently namespaces and locators are ignored when `rados ls` is run
by rgw-orphan-list to record RADOS's known objects.

However there have been cases where RADOS objects have a locator, and
when one is included in the listing, the script does not handle it
correctly. Now when objects have locators, we will prevent their
output from entering the .intermediate file.

Additionally we do not expect RGW data objects to be in RADOS
namespaces, so when a namespaced object is detected, we'll error out
with a message.

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

4 years agomgr/dashboard: display devices' health information within a tabset 37784/head
Kiefer Chang [Thu, 17 Sep 2020 12:58:47 +0000 (20:58 +0800)]
mgr/dashboard: display devices' health information within a tabset

Wrap all devices' health information within a tabset
instead of displaying them from top to bottom.

Add more guard in the HTML template to prevent referencing undefined
variables.

Fixes: https://tracker.ceph.com/issues/47494
Fixes: https://tracker.ceph.com/issues/43177
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit ba3350c7e8c755d5c84c1a027a3a173191cb898d)

Conflicts:
      src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.html
      src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.ts
      - Use ngx-bootstrap tabset for tabs.

4 years agorgw: fix user stats iterative increment 37779/head
Mark Kogan [Mon, 10 Aug 2020 10:19:19 +0000 (13:19 +0300)]
rgw: fix user stats iterative increment

The RGWBucketCtl::sync_user_stats() function can increment or reset the
stats [1][2]

[1]https://github.com/ceph/ceph/blob/master/src/rgw/rgw_bucket.cc#L3745
[2]https://github.com/ceph/ceph/blob/master/src/rgw/services/svc_bi_rados.cc#L379-L381

fixes: https://tracker.ceph.com/issues/46400

Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 21e877ca67db7840026b1768751b167e2c0a53da)

Conflicts:
src/rgw/rgw_sal.cc
- master's owner->get_id() becomes user.info.user_id in octopus

4 years agoMerge pull request #37722 from rishabh-d-dave/wip-47845-octopus
Yuri Weinstein [Fri, 23 Oct 2020 18:51:21 +0000 (11:51 -0700)]
Merge pull request #37722 from rishabh-d-dave/wip-47845-octopus

octopus: ceph-volume: add no-systemd argument to zap

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #37705 from smithfarm/wip-47898-octopus
Yuri Weinstein [Fri, 23 Oct 2020 14:03:21 +0000 (07:03 -0700)]
Merge pull request #37705 from smithfarm/wip-47898-octopus

octopus: mon: have 'mon stat' output json as well

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #37697 from s0nea/wip-47602-octopus
Yuri Weinstein [Fri, 23 Oct 2020 14:02:49 +0000 (07:02 -0700)]
Merge pull request #37697 from s0nea/wip-47602-octopus

octopus: Enable per-RBD image monitoring

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #37674 from Vicente-Cheng/wip-47706-octopus
Yuri Weinstein [Fri, 23 Oct 2020 14:00:22 +0000 (07:00 -0700)]
Merge pull request #37674 from Vicente-Cheng/wip-47706-octopus

octopus: osdc/ObjectCacher: overwrite might cause stray read request callbacks

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #37686 from bk201/wip-47832-octopus
Lenz Grimmer [Fri, 23 Oct 2020 11:55:16 +0000 (13:55 +0200)]
Merge pull request #37686 from bk201/wip-47832-octopus

octopus: mgr/dashboard: fix the error when exporting CephFS path "/" in NFS exports

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agooctopus: qa: detect timed out failure indicating mount still active 37530/head
Patrick Donnelly [Mon, 5 Oct 2020 17:56:52 +0000 (10:56 -0700)]
octopus: qa: detect timed out failure indicating mount still active

Otherwise, the umount process will fail because the mount still exists
when the mountpoint cleanup (rmdir) is started.

See:

    2020-10-04T22:08:24.448 INFO:teuthology.nuke.actions:Clearing teuthology firewall rules...
    2020-10-04T22:08:24.449 INFO:teuthology.orchestra.run.smithi063:> sudo sh -c 'iptables-save | grep -v teuthology | iptables-restore'
    2020-10-04T22:08:24.464 INFO:teuthology.orchestra.run.smithi189:> sudo sh -c 'iptables-save | grep -v teuthology | iptables-restore'
    2020-10-04T22:08:24.482 INFO:teuthology.nuke.actions:Cleared teuthology firewall rules.
    2020-10-04T22:08:24.483 INFO:teuthology.orchestra.run:Running command with timeout 900
    2020-10-04T22:08:24.483 INFO:teuthology.orchestra.run.smithi063:> (cd /home/ubuntu/cephtest && exec stat --file-system '--printf=%T
    2020-10-04T22:08:24.483 INFO:teuthology.orchestra.run.smithi063:> ' -- /home/ubuntu/cephtest/mnt.0)
    2020-10-04T22:08:34.550 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:08:34.553 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:09:04.592 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:09:04.596 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:09:34.727 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:09:34.730 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:10:04.815 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:10:04.818 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:10:34.876 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:10:34.880 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:11:04.923 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:11:04.926 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:11:34.996 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:11:35.000 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:12:05.064 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:12:05.067 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:12:35.202 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:12:35.205 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:13:05.316 INFO:teuthology.orchestra.run.smithi063:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:13:05.318 INFO:teuthology.orchestra.run.smithi189:> sudo logrotate /etc/logrotate.d/ceph-test.conf
    2020-10-04T22:13:24.520 INFO:teuthology.orchestra.run.smithi063.stderr:stat: cannot read file system information for '/home/ubuntu/cephtest/mnt.0': Connection timed out
    2020-10-04T22:13:24.521 DEBUG:teuthology.orchestra.run:got remote process result: 1
    2020-10-04T22:13:24.522 INFO:tasks.cephfs.fuse_mount:mount point does not exist: /home/ubuntu/cephtest/mnt.0
    2020-10-04T22:13:24.640 INFO:teuthology.orchestra.run:Running command with timeout 300
    2020-10-04T22:13:24.641 INFO:teuthology.orchestra.run.smithi063:> (cd /home/ubuntu/cephtest && exec rm -rf /home/ubuntu/cephtest/mnt.0)
    2020-10-04T22:13:24.688 INFO:teuthology.orchestra.run.smithi063.stderr:rm: cannot remove '/home/ubuntu/cephtest/mnt.0': Is a directory
    2020-10-04T22:13:24.688 DEBUG:teuthology.orchestra.run:got remote process result: 1

From: /ceph/teuthology-archive/pdonnell-2020-10-04_21:51:57-fs-wip-pdonnell-testing-20201004.051319-octopus-distro-basic-smithi/5494771/teuthology.log

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: set rados op timeouts for mds/ceph-fuse
Patrick Donnelly [Tue, 13 Oct 2020 17:09:41 +0000 (10:09 -0700)]
qa: set rados op timeouts for mds/ceph-fuse

Now that the osdc Objecter obeys updates to these configs, let's use
them to avoid having them block forever on operations that may never
complete (or should complete in a timely manner).

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

4 years agoqa: print debug info on mount cleanup
Patrick Donnelly [Wed, 7 Oct 2020 00:19:08 +0000 (17:19 -0700)]
qa: print debug info on mount cleanup

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

Conflicts:
qa/tasks/cephfs/mount.py

        Notes: skip as cleanup is abstract.

4 years agoqa: remove redundant rmr
Patrick Donnelly [Tue, 6 Oct 2020 16:37:21 +0000 (09:37 -0700)]
qa: remove redundant rmr

The mount.cleanup method will remove the mount point. This `rm -rf` will
always fail (with exit status 0).

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

Conflicts:
qa/tasks/cephfs/fuse_mount.py

        Notes: convert to cleanup call.

4 years agoqa: use null mode to prevent undesired changes to mountpoint
Patrick Donnelly [Mon, 5 Oct 2020 17:40:42 +0000 (10:40 -0700)]
qa: use null mode to prevent undesired changes to mountpoint

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

Conflicts:
qa/tasks/cephfs/fuse_mount.py

4 years agoqa: unmount all clients before deleting the file system
Patrick Donnelly [Mon, 5 Oct 2020 17:31:23 +0000 (10:31 -0700)]
qa: unmount all clients before deleting the file system

Otherwise we have unnecessary timeout waits.

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

Conflicts:
qa/tasks/cephfs/test_admin.py

        Notes: delete_all_filesystems method moved

4 years agoosdc: add timeout configs for mons/osds
Patrick Donnelly [Sat, 3 Oct 2020 00:11:54 +0000 (17:11 -0700)]
osdc: add timeout configs for mons/osds

Have the Objecter track the rados_(mon|osd)_op_timeout configs so that
it can be configured at runtime/startup. This is useful for the
MDS/ceph-fuse so that we can avoid waiting forever for a response from
the Monitors that will never come (statfs on a deleted file system's
pools).

Also: make these configs take a time value rather than double. This is
simpler to deal with in the code and allows time units to be used (e.g.
"5m" for 5 minutes).

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

Conflicts:
src/client/Client.cc
src/librados/RadosClient.cc
src/mds/MDSRank.cc
src/mgr/MgrStandby.cc
src/mon/MonClient.h
src/neorados/RADOSImpl.cc
src/osd/OSD.cc
src/osdc/Objecter.cc
src/osdc/Objecter.h
src/test/mon/test_mon_workloadgen.cc
src/tools/cephfs/MDSUtility.cc

        Notes: different Objecter cons arguments. Added conf obs for
        RadosClient.

4 years agocommon: accept timespan for SaferCond.wait_for
Patrick Donnelly [Tue, 13 Oct 2020 17:08:21 +0000 (10:08 -0700)]
common: accept timespan for SaferCond.wait_for

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

4 years agoMerge pull request #37673 from Vicente-Cheng/wip-47815-octopus
Yuri Weinstein [Wed, 21 Oct 2020 16:36:30 +0000 (09:36 -0700)]
Merge pull request #37673 from Vicente-Cheng/wip-47815-octopus

octopus: rgw: fix setting of namespace in ordered and unordered bucket listing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37672 from Vicente-Cheng/wip-47850-octopus
Yuri Weinstein [Wed, 21 Oct 2020 16:35:58 +0000 (09:35 -0700)]
Merge pull request #37672 from Vicente-Cheng/wip-47850-octopus

octopus: rgw/rgw_file: Fix the incorrect lru object eviction

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37640 from pritha-srivastava/wip-47836-octopus
Yuri Weinstein [Wed, 21 Oct 2020 16:35:30 +0000 (09:35 -0700)]
Merge pull request #37640 from pritha-srivastava/wip-47836-octopus

octopus: rgw: adds code for creating and managing oidc provider entities in rgw and for offline validation of OpenID Connect Access and ID Token.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37434 from rhcs-dashboard/wip-47675-octopus
Tatjana Dehler [Wed, 21 Oct 2020 16:28:31 +0000 (18:28 +0200)]
Merge pull request #37434 from rhcs-dashboard/wip-47675-octopus

octopus: mgr/dashboard: cluster > manager modules

4 years agoMerge pull request #37365 from smithfarm/wip-47147-octopus
Yuri Weinstein [Wed, 21 Oct 2020 16:25:38 +0000 (09:25 -0700)]
Merge pull request #37365 from smithfarm/wip-47147-octopus

octopus: qa/tasks/nfs: Test mounting of export created with nfs command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37578 from callithea/wip-47770-octopus
Lenz Grimmer [Wed, 21 Oct 2020 10:56:04 +0000 (12:56 +0200)]
Merge pull request #37578 from callithea/wip-47770-octopus

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
4 years agoMerge pull request #37331 from callithea/wip-47461-octopus
Lenz Grimmer [Wed, 21 Oct 2020 09:57:26 +0000 (11:57 +0200)]
Merge pull request #37331 from callithea/wip-47461-octopus

octopus: mgr/dashboard: Update datatable only when necessary

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #37367 from smithfarm/wip-47247-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:35:01 +0000 (08:35 -0700)]
Merge pull request #37367 from smithfarm/wip-47247-octopus

octopus: qa: ignore expected mds failover message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37366 from smithfarm/wip-47151-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:34:34 +0000 (08:34 -0700)]
Merge pull request #37366 from smithfarm/wip-47151-octopus

octopus: pybind/mgr/volumes: add global lock debug

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37363 from smithfarm/wip-47089-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:33:54 +0000 (08:33 -0700)]
Merge pull request #37363 from smithfarm/wip-47089-octopus

octopus: mds: standy-replay mds remained in the "resolve" state after resta…

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37360 from smithfarm/wip-47083-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:33:20 +0000 (08:33 -0700)]
Merge pull request #37360 from smithfarm/wip-47083-octopus

octopus: mds: fix 'forward loop' when forward_all_requests_to_auth is set

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37354 from smithfarm/wip-46940-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:32:47 +0000 (08:32 -0700)]
Merge pull request #37354 from smithfarm/wip-46940-octopus

octopus: mds: place MDSGatherBuilder on the stack

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37358 from smithfarm/wip-47021-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:27:27 +0000 (08:27 -0700)]
Merge pull request #37358 from smithfarm/wip-47021-octopus

octopus: cephfs: libcephfs: ignore restoring the open files limit

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37357 from smithfarm/wip-47018-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:27:01 +0000 (08:27 -0700)]
Merge pull request #37357 from smithfarm/wip-47018-octopus

octopus: mds: fix kcephfs parse dirfrag's ndist is always 0

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37356 from smithfarm/wip-47016-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:26:29 +0000 (08:26 -0700)]
Merge pull request #37356 from smithfarm/wip-47016-octopus

octopus: mds: revert the decode version

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge pull request #37355 from smithfarm/wip-46942-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:25:24 +0000 (08:25 -0700)]
Merge pull request #37355 from smithfarm/wip-46942-octopus

octopus: mds: resolve SIGSEGV in waiting for uncommitted fragments

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37353 from smithfarm/wip-46859-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:24:52 +0000 (08:24 -0700)]
Merge pull request #37353 from smithfarm/wip-46859-octopus

octopus: mds: do not raise "client failing to respond to cap release" when client working set is reasonable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37352 from smithfarm/wip-46857-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:24:16 +0000 (08:24 -0700)]
Merge pull request #37352 from smithfarm/wip-46857-octopus

octopus: qa: add debugging for volumes plugin use of libcephfs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37351 from smithfarm/wip-46855-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:23:46 +0000 (08:23 -0700)]
Merge pull request #37351 from smithfarm/wip-46855-octopus

octopus: cephfs: client: use non-static dirent for thread-safety

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37350 from smithfarm/wip-46463-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:22:19 +0000 (08:22 -0700)]
Merge pull request #37350 from smithfarm/wip-46463-octopus

octopus: pybind/cephfs: fix custom exception raised by cephfs.pyx

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37334 from smithfarm/wip-47087-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:21:51 +0000 (08:21 -0700)]
Merge pull request #37334 from smithfarm/wip-47087-octopus

octopus: mds: don't recover files after normal session close

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37249 from Vicente-Cheng/wip-46786-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:21:19 +0000 (08:21 -0700)]
Merge pull request #37249 from Vicente-Cheng/wip-46786-octopus

octopus: cephfs: client: fix extra open ref decrease

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37248 from Vicente-Cheng/wip-46783-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:20:46 +0000 (08:20 -0700)]
Merge pull request #37248 from Vicente-Cheng/wip-46783-octopus

octopus: mds/CInode: Optimize only pinned by subtrees check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37247 from Vicente-Cheng/wip-46637-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:20:19 +0000 (08:20 -0700)]
Merge pull request #37247 from Vicente-Cheng/wip-46637-octopus

octopus: mds: optimize random threshold lookup for dentry load

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37243 from Vicente-Cheng/wip-46636-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:19:52 +0000 (08:19 -0700)]
Merge pull request #37243 from Vicente-Cheng/wip-46636-octopus

octopus: mds: fix nullptr dereference in MDCache::finish_rollback

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37240 from Vicente-Cheng/wip-46634-octopus
Yuri Weinstein [Tue, 20 Oct 2020 15:19:22 +0000 (08:19 -0700)]
Merge pull request #37240 from Vicente-Cheng/wip-46634-octopus

octopus: mds: fix mds forwarding request 'no_available_op_found'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37520 into octopus
Jan Fajerski [Tue, 20 Oct 2020 13:05:50 +0000 (15:05 +0200)]
Merge PR #37520 into octopus

* refs/pull/37520/head:
ceph-volume: don't exit before empty report can be printed
PendingReleaseNotes: add note about batch refactor
pybind/mgr/orchestrator: fix preview for new c-v batch output
ceph-volume batch: return valid empty json reports
python-common: do not skip unavailable devices
ceph-volume: pass filter_for_batch as keyword argument
ceph-volume batch: fix very_fast_allocation plan and add tests
ceph-volume: batch: call the right prepare method
python-common drive-groups: allow strings for wal and db size
ceph-volume inventory: add option to filter unwanted devices
ceph-volume: address review comments
ceph-volume: batch: fix size retrieval for lvs
ceph-volume: include encryption in batch report
ceph-volume lvm batch: use namedtuple instead of tuple
ceph-volume: address review comments, mostly tidying, clarification
idempotency must result in the same outcome
ceph-volume: batch test should pass --journal-devices with filestore
ceph-volume: make --journal optional, add --journal-slots
doc: update ceph-volume lvm batch docs
py-common/deployment: drop workarounds for old batch
ceph-volume batch: add deprecation warning for auto behaviour
ceph-volume batch: add ceph.conf mocking to pass tests
ceph-volume batch: use disk.Size for size args
ceph-volume batch: Fix osd_ids passing and improve plan formatting
ceph-volume batch: track rel_size in percent, more tests
ceph-volume batch: improve backwards compatibility
ceph-volume: batch - enable legacy auto behaviour
ceph-volume: batch - major refactor
ceph-volume: Device - available_lvm if 10 extents are free.
ceph-volume: Device - add vg_free property
ceph-volume: prepare/create - size args as Size class
ceph-volume: disk.Size - add cast to bool
ceph-volume: api/lvm - add VolumeGroup.free_percent property
ceph-volume: util.device -  add vg_free_percent property
ceph-volume: api/lvm - query LV units in bytes
ceph-volume: lvm/common - refactor common arg specification
ceph-volume: batch: fix argument help message

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoceph-volume: add no-systemd argument to zap 37722/head
wanghongxu [Fri, 18 Sep 2020 03:28:23 +0000 (11:28 +0800)]
ceph-volume: add no-systemd argument to zap

In some container deployment scenarios, systemd services are not
used, so the no-systemd parameter is useful.

Fixes: https://tracker.ceph.com/issues/47541
Signed-off-by: wanghongxu <wanghongxu@t2cloud.net>
(cherry picked from commit 54c011b3d44fd29000918bef8de389bc1784bb07)

4 years agomgr/dashboard: Show warning when replicated size is 1 37578/head
Sebastian Krah [Fri, 2 Oct 2020 09:07:40 +0000 (11:07 +0200)]
mgr/dashboard: Show warning when replicated size is 1

Issues a warning when creating a replicated pool and the replicated size
is 1. It won't stop the user from creating the pool, but will give the
user a hint that no replication will be created.

Fixes: https://tracker.ceph.com/issues/42404
Signed-off-by: Sebastian Krah <skrah@suse.com>
(cherry picked from commit af1a7dbfe2b0e2e40650d64d4c3247f4961743c2)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/styles/defaults/_bootstrap-defaults.scss
- The file does not exist in octopus, moving a slightly changed version of the diff
  to src/pybind/mgr/dashboard/frontend/src/styles.scss instead

4 years agomgr/dashboard: Fix issue in test: delay lower than expected 37697/head
Patrick Seidensal [Mon, 14 Sep 2020 12:32:10 +0000 (14:32 +0200)]
mgr/dashboard: Fix issue in test: delay lower than expected

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 746bac29afd915bb85279234c665d38c807ef2b7)

4 years agomgr/dashboard: update dashboard docs with RBD image monitoring paragraph
Patrick Seidensal [Mon, 14 Sep 2020 10:41:56 +0000 (12:41 +0200)]
mgr/dashboard: update dashboard docs with RBD image monitoring paragraph

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 0c0e6ee496520145782d82a250c0d0f59378222f)

Conflicts:
doc/mgr/dashboard.rst
Fixed conflict because https://github.com/ceph/ceph/commit/d6369ac159a759b00769c0af34131ecba422e8d5
has not been backported to octopus.

4 years agoqa/cephtool: test 'mon stat' commands 37705/head
Joao Eduardo Luis [Tue, 13 Oct 2020 08:24:34 +0000 (08:24 +0000)]
qa/cephtool: test 'mon stat' commands

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit 122388429d01ef2f294dc2846d16d88aa0bdba68)

Conflicts:
qa/workunits/cephtool/test.sh
- drop unrelated "# test elector" comment (elector test not backported)

4 years agomon: have 'mon stat' output json as well
Joao Eduardo Luis [Mon, 12 Oct 2020 11:29:16 +0000 (11:29 +0000)]
mon: have 'mon stat' output json as well

Fixes: https://tracker.ceph.com/issues/46816
Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit c148a3cde5c256576d0a67a40321e543fdf891bf)

4 years agomgr/dashboard: Enable per RBD graphs in details of RBD
Patrick Seidensal [Fri, 11 Sep 2020 09:47:34 +0000 (11:47 +0200)]
mgr/dashboard: Enable per RBD graphs in details of RBD

Fixes: https://tracker.ceph.com/issues/47433
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 3d3230b99bf075020256bdc7cf082fd54fc61992)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.ts
Fixed conflicts because https://github.com/ceph/ceph/pull/35290,
https://github.com/ceph/ceph/pull/35311 and https://github.com/ceph/ceph/pull/35574
have not been backported to octopus.

4 years agodoc: cephfs/fs-nfs-exports: more cleanups 37691/head
Nathan Cutler [Tue, 8 Sep 2020 11:37:23 +0000 (13:37 +0200)]
doc: cephfs/fs-nfs-exports: more cleanups

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ab447c888babcc96b01003f162ea66785eecc3b4)

4 years agodoc: cephfs/fs-nfs-exports: command requires enabled orch module
Nathan Cutler [Tue, 8 Sep 2020 08:23:08 +0000 (10:23 +0200)]
doc: cephfs/fs-nfs-exports: command requires enabled orch module

Clarify that the "ceph nfs cluster create" command requires an
enabled ceph-mgr orchestrator module.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 42a1194872a5bf003a1c80a7df952dacde82cbec)

4 years agodoc: cephfs/fs-nfs-exports.rst: write "RADOS" in ALL-CAPS
Nathan Cutler [Tue, 8 Sep 2020 06:32:50 +0000 (08:32 +0200)]
doc: cephfs/fs-nfs-exports.rst: write "RADOS" in ALL-CAPS

Since RADOS is an acronym, albeit a somewhat difficult-to-remember one,
it is customary to write it ALL-CAPS.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0dc9820f511a441f1369c5d5e2d4a30ab133fce1)

4 years agodoc: cephfs/fs-nfs-exports: use "NFS Ganesha" everywhere
Nathan Cutler [Tue, 8 Sep 2020 06:30:48 +0000 (08:30 +0200)]
doc: cephfs/fs-nfs-exports: use "NFS Ganesha" everywhere

The document seemed to be wanting to refer to the software as "NFS
Ganesha", but was failing to do so in some places.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bc8b2c3823138c68fb4057a335d500f724b02b99)

4 years agodoc: cephfs: clarify that pseudo root path must be absolute
Nathan Cutler [Thu, 16 Jul 2020 12:26:05 +0000 (14:26 +0200)]
doc: cephfs: clarify that pseudo root path must be absolute

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ccc13cbff4d2b43d88e24b63f27225b8ec6e20a3)

4 years agodoc: cephfs: fix misleading "ceph fs volume create" command
Nathan Cutler [Thu, 16 Jul 2020 12:19:29 +0000 (14:19 +0200)]
doc: cephfs: fix misleading "ceph fs volume create" command

The "ceph fs volume create" command takes a placement string,
just like "ceph nfs cluster create" does. Align the documentation
so the placement string is explained in the same manner in both
places.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6f0c2496d6a40505164161acbb835b306ee8914f)

4 years agodoc: cephfs: fix misleading "ceph nfs create" command
Nathan Cutler [Wed, 15 Jul 2020 19:14:25 +0000 (21:14 +0200)]
doc: cephfs: fix misleading "ceph nfs create" command

When a reader sees "ceph nfs create <type=cephfs>" it's not
clear that this means they should type "ceph nfs create cephfs".

I also took this opportunity to clarify the command description
based on my testing and discussions with the CephFS developers.

Fixes: https://tracker.ceph.com/issues/46559
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 865001247b971138342aaaf020d388e9e1ebe948)

4 years agomgr/dashboard: fix error when typing existing paths in the Ganesha form 37688/head
Kiefer Chang [Wed, 9 Sep 2020 08:20:32 +0000 (16:20 +0800)]
mgr/dashboard: fix error when typing existing paths in the Ganesha form

- The `CephFS.ls_dir()` implementation in the backend had changed, the code in the
  UI endpoint `/ui-api/nfs-ganesha/lsdir` needs to adapt.
- Add fs_name as resource_id in `/ui-api/nfs-ganesha/lsdir/<fs_name>` to distinguish FS.
- Add more checks and unit tests.

Fixes: https://tracker.ceph.com/issues/47372
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit ee14ef7c6095d0572e90b29580f2d8d6982dcbda)

Conflicts:
src/pybind/mgr/dashboard/controllers/nfsganesha.py
src/pybind/mgr/dashboard/tests/test_ganesha.py
        - Conflict due to import order changed in the master

4 years agomgr/dashboard: fix the error when exporting CephFS path "/" in NFS exports 37686/head
Kiefer Chang [Tue, 15 Sep 2020 08:27:44 +0000 (16:27 +0800)]
mgr/dashboard: fix the error when exporting CephFS path "/" in NFS exports

Fixes: https://tracker.ceph.com/issues/47397
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 5d0d7f89285c43d70d0918a0ae71e77f602809cd)