]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Daniel-Pivonka [Fri, 18 Dec 2020 15:51:31 +0000 (10:51 -0500)]
mgr/cephadm: fix bug in orch apply osd --dry-run where empty table printed
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit
459fa5777d400d5aa9eb7d4fe520369d47c775b9 )
Dan Mick [Thu, 17 Dec 2020 02:06:31 +0000 (02:06 +0000)]
qa/distros: configure podman to pull from docker-mirror
This also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present
Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit
f30c55a242f381f0d191b55c76d3fc5d027e602e )
Paul Cuzner [Mon, 14 Dec 2020 20:12:36 +0000 (09:12 +1300)]
cephadm: update permissions on newly created dirs
Use 755 instead of 700 on new directories created during
bootstrap
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
9ef60e9111691c6511baa93ca1d080250588d6c0 )
Paul Cuzner [Sun, 13 Dec 2020 22:15:38 +0000 (11:15 +1300)]
cephadm: create default output dir during bootstrap
If the output dir doesn't exist the old behaviour was to
abort bootstrap. Since we're running with UID=0, this
patch will create the missing dirs for the user to keep the
bootstrap process going
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
27b5eada81189ad01b31ff34bf0e362353cfbd92 )
Paul Cuzner [Fri, 18 Dec 2020 01:45:07 +0000 (14:45 +1300)]
mgr/cephadm: correct connection failure message
When add host fails with py3 missing, wasn't used in
the output returned to the admin - instead they saw
the generic failure message which "points them in the
wrong direction". This patch shows the py3 missing
message
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
9e27995bb0a7de0072742e5f18926343acf80e05 )
Patrick Donnelly [Mon, 14 Dec 2020 17:21:59 +0000 (09:21 -0800)]
pybind/mgr/cephadm: limit rgw osd caps
Using tagged pools ensures RGW only can access pools used for RGW.
Fixes: https://tracker.ceph.com/issues/48594
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
373cc847cf0f8b4ec7aefbfe64c01c3f18a4e021 )
Sebastian Wagner [Tue, 8 Sep 2020 12:44:43 +0000 (14:44 +0200)]
doc/cephadm: Add remove host to operations
Co-authored-by: Alexandra Settle <asettle@suse.com>
Co-authored-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
453000af19b25082aef1b473bd9284311ac98204 )
Adam King [Thu, 19 Nov 2020 23:49:25 +0000 (18:49 -0500)]
mgr/cephadm: improve iscsi dashboard config
updating iscsi config dashboard to match what was done with ceph ansible.
This includes:
- set iscsi api ssl verification to false when api_secure is set
- using https rather than http in gateway url when spi_secure is set
- default api_user and api_password to "admin"
- convert hostname to ip address when creating gateway url
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
ba6d22b492400588de22b93189eee8818f647807 )
Sebastian Wagner [Thu, 10 Dec 2020 14:53:00 +0000 (15:53 +0100)]
mgr/cephadm: disallow_untyped_defs=True
simplifies mypy.ini
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a823ee6b1f5a8eb2030c1edf0a7014f86eb719ab )
Conflicts:
src/mypy.ini
Paul Cuzner [Fri, 11 Dec 2020 04:25:08 +0000 (17:25 +1300)]
orchestrator: drop redundant try/except
YAML is validated up front, so the additional try/except
clause is not needed.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
a8690f1b50f0952155e327ffb17952d7cecfbe98 )
Paul Cuzner [Thu, 3 Dec 2020 03:00:27 +0000 (16:00 +1300)]
orchestrator: validate osd yaml
Validate the yaml document ahead of usage, to catch
any basic errors in the yaml doc. If errors are found the
exception is shown in the mgr log, and the user gets a
more friendly error message, without the traceback.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
0f236c7911bdcc4b0266833e1b7da01a3c7e4eac )
Sebastian Wagner [Mon, 7 Dec 2020 11:05:40 +0000 (12:05 +0100)]
cephadm: command_unit: call systemctl with verbose=True
Otherwise `cephadm unit ... status` won't print anything
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
35fcd04fc65a7f7dc491fd0cb2619a9572f0b4f5 )
Sebastian Wagner [Fri, 20 Nov 2020 12:04:50 +0000 (13:04 +0100)]
mgr/cephadm: make type annotations for module.py mandatory
Fixing bogus json representation for registry-login
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
7bbc77cd48bf48da2c120220ad31678f650c05b1 )
Conflicts:
src/mypy.ini
src/pybind/mgr/cephadm/module.py
Paul Cuzner [Fri, 4 Dec 2020 00:58:06 +0000 (13:58 +1300)]
doc/dev/cephadm: Add link to the index
Adds a link to the index for the compliance-check doc
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
f2791c0e26a81b8d0f1a7d070f67dd79cd6ed25c )
Conflicts:
doc/dev/cephadm/index.rst
Paul Cuzner [Fri, 4 Dec 2020 00:48:46 +0000 (13:48 +1300)]
doc/dev/cephadm: Updates following feedback
Minor grammatical and formatting changes
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
1facc5e9a725d33e57370c65d3086e952f13b05c )
Paul Cuzner [Sun, 11 Oct 2020 22:59:32 +0000 (11:59 +1300)]
doc: moved design doc under doc/dev
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
7168cbf0521aa29701f0133b4e38b858888e46b4 )
Paul Cuzner [Fri, 2 Oct 2020 00:24:55 +0000 (13:24 +1300)]
docs: high level design for a compliance check feature
Document defining the high level goals of a compliance check
feature that could be added to mgr/cephadm.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
2407a7bf996fced3b053727db5c1dc17ffbc9624 )
Sebastian Wagner [Fri, 20 Nov 2020 11:06:59 +0000 (12:06 +0100)]
mgr/cephadm: make annotations for schedule.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ba3189b13882ff919ad39a2e377fa6b29c04c79a )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 11:04:53 +0000 (12:04 +0100)]
mgr/cephadm: make annotations for inventory.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
77791a21db6597bc17a33411e02b12c03bd857a8 )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 10:56:26 +0000 (11:56 +0100)]
mgr/cephadm: make annotations for serve.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
95bf93a9e4f214cfd3bba2b4358174d9ddc8f0ea )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 10:51:07 +0000 (11:51 +0100)]
mgr/cephadm: make annotations for upgrade.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
3f9bf2b3f35566ec5537fd36a5163a17ab7778c6 )
Varsha Rao [Mon, 30 Nov 2020 12:19:50 +0000 (17:49 +0530)]
mgr/orchestrator: Remove 'CONTAINER ID' col from orch ps if unknown
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9c241e946a9808b23e5f923ab9283666355883fd )
Michael Fritch [Wed, 4 Nov 2020 18:48:09 +0000 (11:48 -0700)]
mgr/cephadm: improve logging during JSONDecodeError
improve logging around JSONDecodeErrors that can occur during a
cephadm image pull, load of the extra_ceph_conf, and parsing the cluster
health status
Fixes: https://tracker.ceph.com/issues/48120
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
d4c9d5e680cb17379940a1ceaa038c6224b9b039 )
Michael Fritch [Wed, 4 Nov 2020 18:28:52 +0000 (11:28 -0700)]
mgr/cephadm: handle JSONDecodeError in OSD service
avoid exceptions when attempting an osd deployment etc.
Fixes: https://tracker.ceph.com/issues/48119
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
46692e26c12ed169a9f3569857a13304d09b41c1 )
Michael Fritch [Wed, 4 Nov 2020 18:12:34 +0000 (11:12 -0700)]
mgr/cephadm: handle JSONDecodeError in the serve loop
avoid exceptions when attempting to parse invalid JSON output as this
will later cause the cephadm module to fail with a MGR_MODULE_ERROR err
Fixes: https://tracker.ceph.com/issues/48118
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
6d759fb5deac0c52b3c738a2e695738228749420 )
Michael Fritch [Wed, 18 Nov 2020 02:36:29 +0000 (19:36 -0700)]
cephadm: reference the last local image by digest
use the image digest rather than repo/tag combo when inferring the last
used local ceph image
Fixes: https://tracker.ceph.com/issues/48205
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
4cf49997c3af7428d2767e72f62f6b875e55c51d )
Michael Fritch [Fri, 13 Nov 2020 17:06:48 +0000 (10:06 -0700)]
mgr/cephadm: verify the `host` key exists during refresh
various parts of the host cache might not have a key for the desired
host due to ssh communication issues during host add/remove
Fixes: https://tracker.ceph.com/issues/48223
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
218d00c8ed8e3d1df2f08ce5d89ec9ddd4f07630 )
Sebastian Wagner [Tue, 17 Nov 2020 12:08:44 +0000 (13:08 +0100)]
mgr/cephadm: upgrade: fail gracefully, if daemon redeploy fails
Current behaviour kills the `serve()` loop of mgr/cephadm
Fixes: https://tracker.ceph.com/issues/47684
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1ceb6dfb15781569ece627fc53bbd1eb294bf2b7 )
Sebastian Wagner [Fri, 27 Nov 2020 10:58:41 +0000 (11:58 +0100)]
mgr/cephadm: OSD service: reduce log noise
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f0ee6284a7ab0ea85ae486d236e072e13b658a78 )
Juan Miguel Olmo Martínez [Wed, 25 Nov 2020 14:40:57 +0000 (15:40 +0100)]
mgr/cephadm: Get host facts data in host cache
Include cephadm gather-facts information in host cache
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
ab43d6d0c6e696fb365694102e2a26d7ae8cba68 )
Paul Cuzner [Wed, 9 Dec 2020 20:37:13 +0000 (09:37 +1300)]
doc/dev/cephadm: update index links
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
ba485f2472fa0549a8cad8b9be5aad6535c1af33 )
Paul Cuzner [Thu, 3 Dec 2020 03:23:26 +0000 (16:23 +1300)]
doc: Update drivegroup spec examples
The examples currently miss the document separator, so a
copy/paste will result in only a single doc being parsed (the
last one!)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
92fa97347c41955692031858103ea0728a596152 )
Sebastian Wagner [Thu, 26 Nov 2020 10:03:00 +0000 (11:03 +0100)]
mgr/cephadm: add docstring describing the HostCache
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
0cc58de5c79fd65c490276449731400bf037abec )
Volker Theile [Wed, 25 Nov 2020 09:57:45 +0000 (10:57 +0100)]
mgr: Fix various typos
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
d3e09b6e04c6a9990807ac1b6ff340a8004fa8f9 )
Ricardo Marques [Fri, 20 Nov 2020 11:52:02 +0000 (11:52 +0000)]
mgr/orchestrator: Sort 'ceph orch device ls' by host
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
c6e6eb5ef53278b9d0cc0198bc32a441ab8f9a81 )
Patrick Seidensal [Fri, 25 Sep 2020 13:39:32 +0000 (15:39 +0200)]
doc/cephadm: document setting custom monitoring templates
Fixes: https://tracker.ceph.com/issues/47651
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
7f5b1d8bfed931bd035ebf40218aa1ba249089e9 )
Patrick Seidensal [Fri, 16 Oct 2020 12:19:53 +0000 (14:19 +0200)]
doc/cepham: instructions for custom Grafana TLS certs
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
344c0a69b34013a92b4224325af1e4e71a9c8564 )
Ken Dreyer [Wed, 18 Nov 2020 16:18:56 +0000 (09:18 -0700)]
rpm: cephadm package is noarch
The cephadm package contains an architecture-independent Python script,
empty directories, and an empty authorized_keys file. There are no
architecture-dependent files here, so we can use a single noarch RPM
across all host architectures.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
d73134660e9a0c5dbda996fc91e2939c4c0bf687 )
Paul Cuzner [Fri, 23 Oct 2020 05:31:50 +0000 (18:31 +1300)]
doc/dev/cephadm: Updates following PR feedback
Minor update adding an idea for future development as
per suggestion from @anthonyeleven
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
df1afd6b127d215cbd6dbd254ff5e8c5090aca78 )
Paul Cuzner [Fri, 23 Oct 2020 02:35:06 +0000 (15:35 +1300)]
doc/dev/cephadm: add link for feature designs
Add a link from the main cephadm page to the index
within /dev/dev/cephadm
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
10f382c359226070a0eceafcc9f74be26cb943b9 )
Paul Cuzner [Fri, 9 Oct 2020 00:20:28 +0000 (13:20 +1300)]
doc/dev/cephadm: Doc defining the design for host maintenance
Initial PR to define/agree the scope and goals of providing
a host maintenance feature.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
8f3ed063a7c7a58d430e0c9a2ac43a7214fe86e4 )
Yuri Weinstein [Wed, 6 Jan 2021 16:30:01 +0000 (08:30 -0800)]
Merge pull request #38620 from smithfarm/wip-48615-octopus
octopus: Do not add sensitive information in Ceph log files
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 6 Jan 2021 16:27:23 +0000 (08:27 -0800)]
Merge pull request #38477 from ifed01/wip-ifed-fast-rm-p1-oct
octopus: osd: optimize PG removal (part1)
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Wed, 6 Jan 2021 16:26:21 +0000 (08:26 -0800)]
Merge pull request #38353 from ifed01/wip-ifed-fix-statfs-out-oct
octopus: mgr: don't update osd stat which is already out
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 6 Jan 2021 16:25:51 +0000 (08:25 -0800)]
Merge pull request #38267 from idryomov/wip-relax-preauth-asserts-again-octopus
octopus: msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing, again
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Yuri Weinstein [Wed, 6 Jan 2021 16:24:48 +0000 (08:24 -0800)]
Merge pull request #38165 from rishabh-d-dave/wip-48279-octopus
octopus: qa/mgr: mgr_test_case: raise SkipTest instead of calling skipTest()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 6 Jan 2021 16:23:58 +0000 (08:23 -0800)]
Merge pull request #38098 from trociny/wip-48243-octopus
octopus: bluestore: fix "end reached" check in collection_list_legacy
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:26:39 +0000 (08:26 -0800)]
Merge pull request #38596 from callithea/wip-48551-octopus
octopus: mgr: Fix for dashboard/prometheus failure due to laggy pg state
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:25:53 +0000 (08:25 -0800)]
Merge pull request #38526 from s0nea/wip-48538-octopus
octopus: mgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:25:23 +0000 (08:25 -0800)]
Merge pull request #38508 from rhcs-dashboard/wip-48515-octopus
octopus: mgr/dashboard: Updating the inbuilt ssl providers error
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:23:49 +0000 (08:23 -0800)]
Merge pull request #38489 from s0nea/wip-47975-octopus
octopus: mgr/dashboard: Add clay plugin support
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:22:55 +0000 (08:22 -0800)]
Merge pull request #38469 from s0nea/wip-48474-octopus
octopus: mgr/dashboard: assign flags to single OSDs
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Mon, 4 Jan 2021 16:21:31 +0000 (08:21 -0800)]
Merge pull request #37960 from callithea/wip-47996-octopus
octopus: monitoring: Use null yaxes min for OSD read latency
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 17:44:57 +0000 (09:44 -0800)]
Merge pull request #37362 from smithfarm/wip-47085-octopus
octopus: mds: dump granular cap info in mds_sessions
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:47:40 +0000 (08:47 -0800)]
Merge pull request #38553 from batrick/i47095
octopus: mds: provide altrenatives to increase the total cephfs subvolume snapshot counts to greater than the current 400 across a Cephfs volume
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:46:39 +0000 (08:46 -0800)]
Merge pull request #38551 from batrick/i48372
octopus: client: dump which fs is used by client for multiple-fs
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:45:38 +0000 (08:45 -0800)]
Merge pull request #38550 from batrick/i48524
octopus: qa: accept timeout argument in run_shell
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:44:49 +0000 (08:44 -0800)]
Merge pull request #38202 from Vicente-Cheng/wip-48111-octopus
octopus: doc: document MDS cache configuration
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:44:10 +0000 (08:44 -0800)]
Merge pull request #38095 from kotreshhr/wip-48191-octopus
octopus: mds: throttle cap acquisition via readdir
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:43:37 +0000 (08:43 -0800)]
Merge pull request #37989 from Vicente-Cheng/wip-48109-octopus
octopus: cephfs: client: increment file position on _read_sync near eof
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:43:08 +0000 (08:43 -0800)]
Merge pull request #37987 from Vicente-Cheng/wip-48098-octopus
octopus: cephfs: osdc: restart read on truncate/discard
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:42:33 +0000 (08:42 -0800)]
Merge pull request #37985 from Vicente-Cheng/wip-48096-octopus
octopus: cephfs: mds: move start_files_to_recover() to recovery_done
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 22 Dec 2020 16:41:49 +0000 (08:41 -0800)]
Merge pull request #37690 from smithfarm/wip-47659-octopus
octopus: qa: ignore logrotate state rename error
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 23:32:28 +0000 (15:32 -0800)]
Merge pull request #37794 from ifed01/wip-ifed-fix-alloc-multi-reg-octopus
octopus: bluestore: provide a different name for fallback allocator
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 20:53:07 +0000 (12:53 -0800)]
Merge pull request #37860 from smithfarm/wip-47708-octopus
octopus: bluestore: Support flock retry
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Mykola Golub [Mon, 9 Nov 2020 20:19:48 +0000 (20:19 +0000)]
os/bluestore: fix "end reached" check in collection_list_legacy
To preserve the old bluestore behavior it should compare the
current object with the end using bluestore keys, not oids.
Fixes: https://tracker.ceph.com/issues/48153
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
e63489f249f9ba3bc9cb1806568f860effd8a0b6 )
Yuri Weinstein [Thu, 17 Dec 2020 18:18:55 +0000 (10:18 -0800)]
Merge pull request #38338 from smithfarm/wip-48127-octopus
octopus: rgw: keep syncstopped flag when copying bucket shard headers
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 18:14:44 +0000 (10:14 -0800)]
Merge pull request #37766 from smithfarm/wip-47963-octopus
octopus: cephadm: Revert "spec: Podman (temporarily) requires apparmor-abstractions on suse"
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Neha Ojha [Sat, 5 Dec 2020 01:22:11 +0000 (01:22 +0000)]
mon, messages: use TOPNSPC::common for crimson compatibility
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
9f80520670e72f9b34f362db74acade464766e5a )
Conflicts:
src/messages/MMonCommand.h
- in master, class declaration has "final" qualifier which is missing in octopus
src/messages/MMonCommandAck.h
- in master, class declaration has "final" qualifier which is missing in octopus
Yuri Weinstein [Thu, 17 Dec 2020 17:27:47 +0000 (09:27 -0800)]
Merge pull request #38344 from smithfarm/wip-48341-octopus
octopus: pybind/mgr/rbd_support: delay creation of progress module events
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:25:40 +0000 (09:25 -0800)]
Merge pull request #38343 from smithfarm/wip-48225-octopus
octopus: librbd: update hidden global config when removing pool config override
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:25:04 +0000 (09:25 -0800)]
Merge pull request #38342 from smithfarm/wip-48086-octopus
octopus: mgr/rbd_support: store global schedule without localized prefix
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:24:29 +0000 (09:24 -0800)]
Merge pull request #38341 from smithfarm/wip-48085-octopus
octopus: qa/workunits/rbd: fix permission issue when removing mirror peer
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:23:51 +0000 (09:23 -0800)]
Merge pull request #38340 from smithfarm/wip-48084-octopus
octopus: global: reexpand conf meta in child process
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:22:23 +0000 (09:22 -0800)]
Merge pull request #37861 from smithfarm/wip-47892-octopus
octopus: bluestore: attach csum for compressed blobs
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Thu, 17 Dec 2020 17:21:17 +0000 (09:21 -0800)]
Merge pull request #37859 from smithfarm/wip-47749-octopus
octopus: build/ops: doc: pass --use-feature=2020-resolver to pip
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Thu, 17 Dec 2020 16:58:46 +0000 (08:58 -0800)]
Merge branch 'octopus' into wip-47963-octopus
Alexander Sushko [Fri, 27 Nov 2020 11:04:13 +0000 (14:04 +0300)]
pybind/mgr/prometheus/module.py: defaultdict for num_by_state
num_by_state[state] += count in get_pg_status method raises KeyError
if pg state is not in PG_STATES list. PG_STATES should be synced with
osd_types.cc:pg_state_string(). But sometimes it is not. After the
KeyError raise mgr metrics are not available at all.
Fixes: https://tracker.ceph.com/issues/46142
Signed-off-by: Alexander Sushko <alexandrsushko@gmail.com>
(cherry picked from commit
3f7ee9cbd335e4b8686688b79ec6110d73a7390e )
Conflicts:
src/pybind/mgr/prometheus/module.py
- Resolved import conflict
Seena Fallah [Sun, 6 Sep 2020 00:33:48 +0000 (05:03 +0430)]
monitoring: Use null yaxes min for OSD read latency
According to seriesOverrides that negative-Y for read param there shouldn't be a minimum for yaxes
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit
0fd28f646c50e97d36bac2359c4529438fbb0d9f )
Neha Ojha [Thu, 3 Dec 2020 21:54:23 +0000 (21:54 +0000)]
mgr/ActivePyModules.cc: don't log config value in get_typed_config
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
f4b3d6b7692332c329b567d91460b8ada96741e2 )
Neha Ojha [Thu, 3 Dec 2020 21:00:51 +0000 (21:00 +0000)]
mon/ConfigMonitor.cc: don't log config values in refresh_config
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
77932ae49bffd03f905f1039ae4add303738eec6 )
Neha Ojha [Thu, 3 Dec 2020 20:34:53 +0000 (20:34 +0000)]
mgr: don't add config values to mgr log in config_callback and module_config
The original code has been commented out and left for future debugging
purposes.
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
19000fad573138b2b0576c093237c4a708b76020 )
Neha Ojha [Thu, 3 Dec 2020 20:33:20 +0000 (20:33 +0000)]
mon/ConfigMonitor.cc: don't dump all keys and values in config map
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
a68b4597785f92a0cb98440030be61f8004e3151 )
Neha Ojha [Thu, 3 Dec 2020 19:24:39 +0000 (19:24 +0000)]
mon: don't log "config set" and "config-key set" dispatch and finished messages
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
4b83dfb1f74e8a59c802ff3c0eb4595f7e763762 )
Conflicts:
src/mon/Monitor.h
- replace one instance of "std::ostringstream ds;" with "stringstream ds;"
Neha Ojha [Thu, 3 Dec 2020 19:18:04 +0000 (19:18 +0000)]
messages/MMonCommand, MMonCommandAck: don't log values for "config set" and "config-key set"
This acts like a big hammer to avoid adding sensitive information, like passwords
into mon/mgr/cluster logs when using "config set" and "config-key set" to set keys
whose values should be secure.
Fixes: https://tracker.ceph.com/issues/37503
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
3d54660ca1a9a7ae54e884c3181fca17a40d8cd3 )
Conflicts:
src/messages/MMonCommand.h
- change "std::ostringstream ss" to "stringstream ss"
src/messages/MMonCommandAck.h
- change "std::ostringstream ss" to "stringstream ss"
Jenkins Build Slave User [Wed, 16 Dec 2020 17:29:50 +0000 (17:29 +0000)]
15.2.8
Patrick Donnelly [Wed, 16 Dec 2020 16:21:26 +0000 (08:21 -0800)]
Merge branch 'CVE-2020-27781-octopus' into octopus
* CVE-2020-27781-octopus:
tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
pybind/ceph_volume_client: Optionally authorize existing auth-ids
pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
pybind/ceph_volume_client: Disallow authorize auth_id
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Kotresh HR [Tue, 1 Dec 2020 10:44:17 +0000 (16:14 +0530)]
tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
1. Add testcase for authorizing auth_id which is not added by
ceph_volume_client
2. Add testcase to test 'allow_existing_id' option
3. Add testcase for deauthorizing auth_id which has got it's caps
updated out of band
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
aa4beb3d993649a696af95cf27150cc460baaf70 )
Conflicts:
qa/tasks/cephfs/test_volume_client.py
Kotresh HR [Sun, 6 Dec 2020 07:10:20 +0000 (12:40 +0530)]
pybind/ceph_volume_client: Optionally authorize existing auth-ids
Optionally allow authorizing auth-ids not created by ceph_volume_client
via the option 'allow_existing_id'. This can help existing deployers
of manila to disallow/allow authorization of pre-created auth IDs
via a manila driver config that sets 'allow_existing_id' to False/True.
Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
77b42496e25cbd4af2e80a064ddf26221b53733f )
Kotresh HR [Thu, 26 Nov 2020 09:18:16 +0000 (14:48 +0530)]
pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
Authorize/Deauthorize used to overwrite the caps of auth-id which would
end up deleting existing caps. This patch fixes the same by retaining
the existing caps by appending or deleting the new caps as needed.
Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
47100e528ef77e7e82dc9877424243dc6a7e7533 )
Ramana Raja [Wed, 25 Nov 2020 11:14:35 +0000 (16:44 +0530)]
pybind/ceph_volume_client: Disallow authorize auth_id
This patch disallow the ceph_volume_client to authorize the auth_id
which is not created by ceph_volume_client. Those auth_ids could be
created by other means for other use cases which should not be modified
by ceph_volume_client.
Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
3a85d2d04028a323952a31d18cdbefb710be2e2b )
Ernesto Puerta [Mon, 14 Dec 2020 13:37:20 +0000 (14:37 +0100)]
Merge pull request #37973 from callithea/wip-47607-octopus
octopus: mgr/dashboard/api: move/create OSD histogram in separate endpoint
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Mon, 14 Dec 2020 13:36:45 +0000 (14:36 +0100)]
Merge pull request #38405 from callithea/wip-48343-octopus
octopus: mgr/dashboard: Disable sso without python3-saml
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Ernesto Puerta [Mon, 14 Dec 2020 13:35:43 +0000 (14:35 +0100)]
Merge pull request #38331 from votdev/wip-48396-octopus
octopus: mgr/dashboard: Disable TLS 1.0 and 1.1
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Ernesto Puerta [Mon, 14 Dec 2020 13:34:56 +0000 (14:34 +0100)]
Merge pull request #38094 from bk201/wip-48226-octopus
octopus: mgr/dashboard: Use pipe instead of calling function within template
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Yan, Zheng [Wed, 5 Aug 2020 15:31:03 +0000 (23:31 +0800)]
qa/workunits/fs: add test for subvolume
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
df7e9aa42b97f3203e92387d2ceea5636f5230ad )
Yan, Zheng [Wed, 5 Aug 2020 09:31:57 +0000 (17:31 +0800)]
mds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume
Fixes: https://tracker.ceph.com/issues/46074
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
63da28d6a8be20183a294744892a41f47e8ba24b )
Conflicts: resolution similar to nautilus backport
src/mds/Server.cc
Yan, Zheng [Wed, 5 Aug 2020 08:04:30 +0000 (16:04 +0800)]
mds: disallow hardlink across subvolume
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
55cc3f7d7d27837bfe64ee46444358c0e45d16f6 )
Yan, Zheng [Wed, 5 Aug 2020 07:37:20 +0000 (15:37 +0800)]
mds: disallow across subvolume rename
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
53348ab67f0f3e691cfeb6b02d80b868fdb98d89 )
Yan, Zheng [Wed, 5 Aug 2020 07:33:10 +0000 (15:33 +0800)]
mds: disallow creating snapshot on descendent directory of subvolume
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
34c6b4437a2e8a49bb76e86d07cd86b740e3f581 )