]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocommon/options: bluefs_buffered_io=true by default 40391/head
Dan van der Ster [Thu, 12 Nov 2020 16:14:37 +0000 (17:14 +0100)]
common/options: bluefs_buffered_io=true by default

Enable bluefs_buffered_io again because it makes a huge user-visible
improvement in metadata intensive scenarios, such as but not limited to
PG deletion.

In our environment, deleting PGs from 4 hybrid OSDs (sharing one SATA SSD block.db) saturates
the block.db at 350MB/s reads and causes slow reqs and flapping on the OSDs.
Those OSDs have 3GB osd_target_memory.
Enabling bluefs_buffered_io drops the SSD IO down to <1MBps and the OSDs
are performant again. (The underlying PG deletion inefficiency is being
solved separately, but the page cache is so much more effective than
the bluestore cache in this scenario).

Lastly, remove the comment about swap. We should separately advise
operators to disable swap on OSD machines, as it is much better in
our experience to OOM and restart than to chug along swapping.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Related-to: https://tracker.ceph.com/issues/45765
Related-to: https://tracker.ceph.com/issues/47044
(cherry picked from commit 5ec8e8e63d409860c35e24a192090ac2b70af8f6)

4 years agoMerge PR #40317 into pacific
Patrick Donnelly [Wed, 24 Mar 2021 23:11:03 +0000 (16:11 -0700)]
Merge PR #40317 into pacific

* refs/pull/40317/head:
cephsqlite: add julian day offset in milliseconds
doc: add libcephsqlite
ceph.spec,debian: package libcephsqlite
test/libcephsqlite,qa: add tests for libcephsqlite
libcephsqlite: rework architecture and backend
SimpleRADOSStriper: wait for finished aios after write
SimpleRADOSStriper: add new minimal async striper
mon: define simple-rados-client-with-blocklist profile
librados: define must renew lock flag
common: add timeval conversion for durations
Revert "libradosstriper: add function to read into char*"
test_libcephsqlite: test random inserts
cephsqlite: fix compiler errors
cmake: improve build inst for cephsqlite
libcephsqlite: sqlite interface to RADOS
libradosstriper: add function to read into char*

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39999 from rhcs-dashboard/wip-49708-pacific
Ernesto Puerta [Wed, 24 Mar 2021 16:11:18 +0000 (17:11 +0100)]
Merge pull request #39999 from rhcs-dashboard/wip-49708-pacific

pacific: mgr/dashboard: cluster > hosts: replace inventory->devices table title

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge PR #39988 into pacific
Patrick Donnelly [Wed, 24 Mar 2021 15:52:55 +0000 (08:52 -0700)]
Merge PR #39988 into pacific

* refs/pull/39988/head:
doc: fix broken links multimds and kcephfs

Reviewed-by: Jos Collin <jcollin@redhat.com>
4 years agoMerge PR #40250 into pacific
Patrick Donnelly [Wed, 24 Mar 2021 15:49:18 +0000 (08:49 -0700)]
Merge PR #40250 into pacific

* refs/pull/40250/head:
doc: mds cap acquisition readdir throttle documentation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40306 into pacific
Patrick Donnelly [Wed, 24 Mar 2021 15:48:51 +0000 (08:48 -0700)]
Merge PR #40306 into pacific

* refs/pull/40306/head:
doc/cephfs/nfs: Add rook pod restart note, export and log block example

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40255 from singuliere/wip-49743-pacific
Casey Bodley [Wed, 24 Mar 2021 15:47:46 +0000 (11:47 -0400)]
Merge pull request #40255 from singuliere/wip-49743-pacific

pacific: rgw: limit rgw_gc_max_objs to RGW_SHARDS_PRIME_1

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40261 from singuliere/wip-49310-pacific
Casey Bodley [Wed, 24 Mar 2021 15:47:38 +0000 (11:47 -0400)]
Merge pull request #40261 from singuliere/wip-49310-pacific

WIP: pacific: rgw: add support for SSL encrypted AMQP connections

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40338 from cbodley/wip-rgw-lc-lock-pacific
Casey Bodley [Wed, 24 Mar 2021 15:47:22 +0000 (11:47 -0400)]
Merge pull request #40338 from cbodley/wip-rgw-lc-lock-pacific

pacific: rgw/lc: Fix use-after-free in RGWLC::process

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge PR #40362 into pacific
Patrick Donnelly [Wed, 24 Mar 2021 15:45:12 +0000 (08:45 -0700)]
Merge PR #40362 into pacific

* refs/pull/40362/head:
doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #40094 into pacific
Sage Weil [Wed, 24 Mar 2021 15:34:03 +0000 (10:34 -0500)]
Merge PR #40094 into pacific

* refs/pull/40094/head:
rgw/kms/vault - PendingReleaseNotes pointer
rgw/kms/vault - s3tests for both old and new test logic.
rgw/kms/vault - rework unit test logic for new transit logic.
rgw/kms/vault - 0 terminate before rapidjson
rgw/kms/vault - document configuration for new transit logic
rgw/kms/vault - new transit logic - fix compat logic
rgw/kms/vault - define attribute for new transit logic
rgw/kms/vault - "compat" option
rgw/kms/vault - encryption context - first part
rgw/kms/vault - define attribute to store encryption context
rgw/kms/vault - share get/set attr between rgw_crypt.cc and rgw_kms.cc
rgw/kms/vault - relax configuration parsing for rgw_crypt_vault_secret_engine
rgw/kms/vault - need libicu to make canonical json for encryption contexts.
rgw/kms/kmip - document configuration for a new feature: kmip kms
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - rgw / kmip test integration.
rgw/kms/kmip - correct documentation.
rgw/kms/kmip - pykmip.py needs to make keys too.
rgw/kms/kmip - pykmip.py should actually run pykmip.
rgw/kms/kmip - python3 changes for testing.
rgw/kms/kmip - string handling cleanup.
teuthology/rgw: pykmip task
kmip: first pass at implementation logic.
kmip: configuration options.
Including cmake build logic inside of libkmip.
cmake glue to build libkmip.
Added libkmip as a submodule.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agocephsqlite: add julian day offset in milliseconds 40317/head
Patrick Donnelly [Wed, 24 Mar 2021 00:34:45 +0000 (17:34 -0700)]
cephsqlite: add julian day offset in milliseconds

This magic number was copied from another VFS but was not adjusted for
the xCurrentTimeInt64 interface.

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

4 years agoMerge pull request #40262 from singuliere/wip-49176-pacific
Casey Bodley [Wed, 24 Mar 2021 14:11:51 +0000 (10:11 -0400)]
Merge pull request #40262 from singuliere/wip-49176-pacific

pacific: rgw: Fix spurious error on empty datalog shard

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40256 from singuliere/wip-49722-pacific
Casey Bodley [Wed, 24 Mar 2021 14:11:31 +0000 (10:11 -0400)]
Merge pull request #40256 from singuliere/wip-49722-pacific

pacific: qa/rgw: add librgw_file unit tests to rgw/verify task

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40257 from singuliere/wip-49601-pacific
Casey Bodley [Wed, 24 Mar 2021 14:11:23 +0000 (10:11 -0400)]
Merge pull request #40257 from singuliere/wip-49601-pacific

pacific: rgw/sts: fix for encoding/decoding user namespace

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40258 from singuliere/wip-49587-pacific
Casey Bodley [Wed, 24 Mar 2021 14:11:15 +0000 (10:11 -0400)]
Merge pull request #40258 from singuliere/wip-49587-pacific

pacific: rgw: added missing documentation on "pubsub" in rgw_enable_apis

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40259 from singuliere/wip-49381-pacific
Casey Bodley [Wed, 24 Mar 2021 14:11:07 +0000 (10:11 -0400)]
Merge pull request #40259 from singuliere/wip-49381-pacific

pacific: rgw: multisite: fix single-part-MPU object etag misidentify problem

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40260 from singuliere/wip-49362-pacific
Casey Bodley [Wed, 24 Mar 2021 14:10:57 +0000 (10:10 -0400)]
Merge pull request #40260 from singuliere/wip-49362-pacific

pacific: rgw: fix sts get_session_token duration check failed

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #40339 from dillaman/wip-librbd-backports-pacific-10
Jason Dillaman [Wed, 24 Mar 2021 14:07:20 +0000 (10:07 -0400)]
Merge pull request #40339 from dillaman/wip-librbd-backports-pacific-10

pacific: librbd: miscellaneous backports

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #40340 from rhcs-dashboard/wip-49941-pacific
Ernesto Puerta [Wed, 24 Mar 2021 11:58:18 +0000 (12:58 +0100)]
Merge pull request #40340 from rhcs-dashboard/wip-49941-pacific

pacific: mgr/dashboard: fix error shown when no rgw daemons are running.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40360 from rhcs-dashboard/wip-49944-pacific
Ernesto Puerta [Wed, 24 Mar 2021 11:32:04 +0000 (12:32 +0100)]
Merge pull request #40360 from rhcs-dashboard/wip-49944-pacific

pacific: mgr/dashboard: Display users current quota usage

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agodoc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port 40362/head
Varsha Rao [Mon, 22 Mar 2021 11:51:53 +0000 (17:21 +0530)]
doc/cephfs/nfs: Add note about cephadm NFS-Ganesha daemon port

Fixes: https://tracker.ceph.com/issues/49921
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit fec8bbf5cd3e3dd72d05c4eb23209c84f056edda)

4 years agomgr/dashboard: Display users current quota usage 40360/head
Avan Thakkar [Sat, 1 Aug 2020 10:36:13 +0000 (16:06 +0530)]
mgr/dashboard: Display users current quota usage

Fixes: https://tracker.ceph.com/issues/45965
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 9456884c2996d31ce9c39e39011d295c5e62bcf7)

4 years agoMerge pull request #40310 from neha-ojha/wip-49908-pacific
Yuri Weinstein [Tue, 23 Mar 2021 19:12:50 +0000 (12:12 -0700)]
Merge pull request #40310 from neha-ojha/wip-49908-pacific

pacific: mon/MgrStatMonitor: ignore MMgrReport from non-active mgr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40309 from neha-ojha/wip-49920-pacific
Yuri Weinstein [Tue, 23 Mar 2021 19:12:19 +0000 (12:12 -0700)]
Merge pull request #40309 from neha-ojha/wip-49920-pacific

pacific: common/options: turn off bluestore_fsck_quick_fix_on_mount by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #40289 from liewegas/bug-49427-pacific
Yuri Weinstein [Tue, 23 Mar 2021 19:11:56 +0000 (12:11 -0700)]
Merge pull request #40289 from liewegas/bug-49427-pacific

pacific: osd: fix missing adjacent snaps when handling manifest object

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40000 from rhcs-dashboard/wip-49702-pacific
Ernesto Puerta [Tue, 23 Mar 2021 17:23:17 +0000 (18:23 +0100)]
Merge pull request #40000 from rhcs-dashboard/wip-49702-pacific

pacific: mgr/dashboard: fix dashboard instance ssl certificate functionality

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #40086 from batrick/i49564
Yuri Weinstein [Tue, 23 Mar 2021 15:00:32 +0000 (08:00 -0700)]
Merge pull request #40086 from batrick/i49564

pacific: mon/MonCap: `fs authorize` generates unparseable cap for file system name containing '-'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40082 from batrick/i49569
Yuri Weinstein [Tue, 23 Mar 2021 14:58:50 +0000 (07:58 -0700)]
Merge pull request #40082 from batrick/i49569

pacific: qa: rank_freeze prevents failover on some tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40093 from batrick/i49474
Yuri Weinstein [Tue, 23 Mar 2021 14:56:36 +0000 (07:56 -0700)]
Merge pull request #40093 from batrick/i49474

pacific: nautilus: qa: "Assertion `cb_done' failed."

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40092 from batrick/i49512
Yuri Weinstein [Tue, 23 Mar 2021 14:55:51 +0000 (07:55 -0700)]
Merge pull request #40092 from batrick/i49512

pacific: client: allow looking up snapped inodes by inode number+snapid tuple

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40090 from batrick/i49751
Yuri Weinstein [Tue, 23 Mar 2021 14:55:09 +0000 (07:55 -0700)]
Merge pull request #40090 from batrick/i49751

pacific: snap-schedule doc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40089 from batrick/i49561
Yuri Weinstein [Tue, 23 Mar 2021 14:53:46 +0000 (07:53 -0700)]
Merge pull request #40089 from batrick/i49561

pacific: qa: file system deletion not complete because starter fs already destroyed

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40087 from batrick/i49470
Yuri Weinstein [Tue, 23 Mar 2021 14:52:49 +0000 (07:52 -0700)]
Merge pull request #40087 from batrick/i49470

pacific: qa: ffsb workload: PG_AVAILABILITY|PG_DEGRADED warnings

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40085 from batrick/i49517
Yuri Weinstein [Tue, 23 Mar 2021 14:51:27 +0000 (07:51 -0700)]
Merge pull request #40085 from batrick/i49517

pacific: pybind/cephfs: DT_REG and DT_LNK values are wrong

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40083 from batrick/i49608
Yuri Weinstein [Tue, 23 Mar 2021 14:50:36 +0000 (07:50 -0700)]
Merge pull request #40083 from batrick/i49608

pacific: mds: define CephFS errors that replace standard errno values

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40081 from batrick/i49612
Yuri Weinstein [Tue, 23 Mar 2021 14:48:49 +0000 (07:48 -0700)]
Merge pull request #40081 from batrick/i49612

pacific: qa: racy session evicted check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40080 from batrick/i49630
Yuri Weinstein [Tue, 23 Mar 2021 14:48:02 +0000 (07:48 -0700)]
Merge pull request #40080 from batrick/i49630

pacific: qa: slow metadata ops during scrubbing

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #40079 from batrick/i49631
Yuri Weinstein [Tue, 23 Mar 2021 14:47:13 +0000 (07:47 -0700)]
Merge pull request #40079 from batrick/i49631

pacific: mds: don't start purging inodes in the middle of recovery

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agolibrbd/cache/pwl: fix bug of flush request blocked by deferd IO 40339/head
Yin Congmin [Thu, 18 Mar 2021 13:33:07 +0000 (21:33 +0800)]
librbd/cache/pwl: fix bug of flush request blocked by deferd IO

Flush requests do not need to be queued behind the defer_io queue,
should be issued immediately. Otherwise, there will be a deadlock
scenario in which dirty data is waiting for flush req, flush req is
waiting for defer_io empty, and defer_io is waiting for dirty data
persistence to release space. So this sometimes occur when the cache
is small but the IO is large or the queue depth is large.

Signed-off-by: Yin Congmin <congmin.yin@intel.com>
(cherry picked from commit 6583182f624386bfbb7375fb227dfb77b0a3209d)

4 years agomgr/dashboard: fix error notification shown when no rgw daemons are running. 40340/head
Alfonso Martínez [Tue, 23 Mar 2021 10:14:11 +0000 (11:14 +0100)]
mgr/dashboard: fix error notification shown when no rgw daemons are running.

- Adapted code to changes introduced in: https://github.com/ceph/ceph/pull/40220
- Improved error handling.
- Increased test coverage.
- Some refactoring.
- Simplified documentation about setting default daemon host and port.

Fixes: https://tracker.ceph.com/issues/49655
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 58253a0002f8722abecaaf58161f6494fbe0eaa0)

4 years agoceph.spec: build with system libpmem on fedora and el8
Kefu Chai [Fri, 12 Mar 2021 04:02:22 +0000 (12:02 +0800)]
ceph.spec: build with system libpmem on fedora and el8

* build with WITH_SYSTEM_PMDK=ON on fedora, as f32 and f33 ship
  libpmem1.8 and libpmem1.9 respectively. and we need libpmem v1.7
* build with WITH_SYSTEM_PMDK=ON on el8, as el8 and CentOS8 AppStream
  ships libpmem v1.6,

quote from nvml.spec:

> By design, PMDK does not support any 32-bit architecture.
> Due to dependency on some inline assembly, PMDK can be compiled only
> on these architectures:
> - x86_64
> - ppc64le (experimental)
> - aarch64 (unmaintained, supporting hardware doesn't exist?)

so far, only x86_64 and ppc64le packages are built.

see also,
https://src.fedoraproject.org/rpms/nvml/blob/rawhide/f/nvml.spec

this change addresses a regression introduced by
a49d1dbb32e2436ff2836a85b2fa84418f0a5fff

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 75b58115ead7a42495b60cccf43e7a433fcc4a5f)

Conflicts:
ceph.spec.in: trivial resolution

4 years agorgw/lc: Fix use-after-free in RGWLC::process 40338/head
Soumya Koduri [Tue, 22 Dec 2020 17:27:52 +0000 (22:57 +0530)]
rgw/lc: Fix use-after-free in RGWLC::process

Fixed use-after-free issue with 'rgw::sal::LCSerializer lock'
in RGWLC::process.

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit e54e68ad3c88766ac370dfe2bbb5b123e18a7392)

4 years agoMerge pull request #40315 from guits/wip-49924-pacific
Guillaume Abrioux [Tue, 23 Mar 2021 08:09:24 +0000 (09:09 +0100)]
Merge pull request #40315 from guits/wip-49924-pacific

pacific: ceph-volume: show devices with GPT headers as not available

4 years agoMerge PR #40184 into pacific
Sage Weil [Tue, 23 Mar 2021 00:20:48 +0000 (19:20 -0500)]
Merge PR #40184 into pacific

* refs/pull/40184/head:
qa/suites/rados/cephadm/orchestrator_cli: random-distro$ -> 0-random-distro$
qa/suites/rados/cephadm/smoke-roleless: distro -> 0-distro
qa/distros/podman: install kubic once per host, in parallel
qa/suites/fs/multiclient: use clients: not all: for pexec

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #40202 into pacific
Sage Weil [Tue, 23 Mar 2021 00:20:39 +0000 (19:20 -0500)]
Merge PR #40202 into pacific

* refs/pull/40202/head:
qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh
mgr/cephadm: identify iscsi service by the pool
qa/distros/podman: install containernetworking-plugins along with podman
python-common: Validate characters in service_id for container names
qa/suites/rados/cephadm/smoke-roleless: deploy additional daemon types
cephadm: fix a minor typo in logging message
qa/suites/rados/cephadm/dashboard: test on centos
cephadm: use debug verbosity during container exec
mgr/cephadm/upgrade: do not repeat crash message
mgr/cephadm/upgrade: a little less verbose
mgr/cephadm: don't log not-ok-to-stop at ERR level
mgr/cephadm: is presumed -> appears
mgr/cephadm: don't double-log ok-to-stop results
mgr/cephadm/upgrade: include upgrade progress in ceph -s
mgr/cephadm: clean up misc messages
mgr/cephadm/configcheck: do not spam info every minute
mgr/cephadm: stop conflicting daemon when deploying to a specific port
mgr/cephadm: make DaemonPlacement print nicer
mgr/cephadm: fix --force remove comment
mgr/cephadm/schedule: choose an IP from a subnet list
mgr/cephadm: rgw: clean up config and config-key values on removal
mgr/cephadm: rgw: drop .crt extension when storing cert in config-key
mgr/cephadm/services: allow beast/civetweb to bind to a particular IP
python-common: add 'networks' property to ServiceSpec
mgr/cephadm/schedule: match placement ip only combination with port
mgr/cephadm: less noise about refreshing hosts
mgr/cephadm: fall back to service spec port if none on DaemonDescription
mgr/cephadm: fix redeploy when daemons have ip:port
mgr/cephadm/schedule: add test case
qa/suites/rados/cephadm/smoke-roleless: add rgw test on many ports
doc/cephadm/rgw: update docs to show count-per-host
mgr/cephadm: add support for rgw_frontend_type (beast or civetweb)
mgr/cephadm: remove ssl_frontend_ssl_key from RGWSpec
mgr/cephadm: fix beast private key config option
mgr/cephadm: fix rgw ssl cert/key config-key path
mgr/cephadm/schedule: dynamically assign ports for rgw
mgr/cephadm/schedule: only 1 port in DaemonPlacement
mgr/cephadm: move rgw frontend logic into RgwService
mgr/cephadm/schedule: return DaemonPlacement instead of HostPlacementSpec
mgr/cephadm/schedule: remove unused methods
mgr/cephadm: propagate ip:port from CephadmDaemoNDeploySpec to deployment
cephadm: populate ports if known and not included in unit.meta
mgr/cephadm: gather and report ports in 'orch ps' output
qa/suites/rados/cephadm/orchestrator_cli: random-distro$ -> 0-random-distro$
qa/suites/rados/cephadm/smoke-roleless: distro -> 0-distro
qa/distros/podman: install kubic once per host, in parallel
qa/suites/fs/multiclient: use clients: not all: for pexec
mgr/cephadm: add info to 'ceph orch upgrade status' in cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge PR #40279 into pacific
Sage Weil [Tue, 23 Mar 2021 00:20:30 +0000 (19:20 -0500)]
Merge PR #40279 into pacific

* refs/pull/40279/head:
mgr/cephadm: identify rgw, cepfs-mirror in servicemap
mgr/ServiceMap: adjust 'ceph -s' summary
rgw: register daemons in servicemap by gid; include id
cephadm: fix rbd-mirror auth name

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoqa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh 40202/head
Sage Weil [Sun, 21 Mar 2021 14:07:49 +0000 (09:07 -0500)]
qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh

rgw changed the way it registered in the service map.  Wait a bit for
the old entries to be flushed out.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 3f3d955b19a1dcadbe8137b32eb695e8be6b496a)

4 years agomgr/cephadm: identify iscsi service by the pool
Sage Weil [Fri, 19 Mar 2021 15:59:46 +0000 (10:59 -0500)]
mgr/cephadm: identify iscsi service by the pool

Since we deploy one of these per pool, name the service by the pool.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d8fff6e522d91a56f93c613710e45c232f4450fd)

4 years agoqa/distros/podman: install containernetworking-plugins along with podman
Kefu Chai [Mon, 22 Mar 2021 06:49:13 +0000 (14:49 +0800)]
qa/distros/podman: install containernetworking-plugins along with podman

/etc/cni/net.d/87-podman-bridge.conflist tries to load "bridge",
"firewall", "tuning" and "portmap" plugins, which are provided by
containernetworking-plugins package.

Fixes: https://tracker.ceph.com/issues/49909
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 325c8fce46bee0b5046b2c5ae732678aeeec6629)

4 years agodoc: add libcephsqlite
Patrick Donnelly [Thu, 28 Jan 2021 23:03:33 +0000 (15:03 -0800)]
doc: add libcephsqlite

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

4 years agoceph.spec,debian: package libcephsqlite
Patrick Donnelly [Sat, 30 Jan 2021 19:45:42 +0000 (11:45 -0800)]
ceph.spec,debian: package libcephsqlite

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

4 years agotest/libcephsqlite,qa: add tests for libcephsqlite
Patrick Donnelly [Thu, 28 Jan 2021 23:12:19 +0000 (15:12 -0800)]
test/libcephsqlite,qa: add tests for libcephsqlite

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

4 years agolibcephsqlite: rework architecture and backend
Patrick Donnelly [Thu, 28 Jan 2021 23:11:50 +0000 (15:11 -0800)]
libcephsqlite: rework architecture and backend

This is a complete rewrite on top of SimpleRADOSStriper as well as the
API. The VFS is now a loadable extension as well.

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

4 years agoSimpleRADOSStriper: wait for finished aios after write
Patrick Donnelly [Sat, 13 Mar 2021 21:39:50 +0000 (13:39 -0800)]
SimpleRADOSStriper: wait for finished aios after write

So the "aios" (better named) vector doesn't grow infinitely.

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

4 years agoSimpleRADOSStriper: add new minimal async striper
Patrick Donnelly [Thu, 28 Jan 2021 23:04:01 +0000 (15:04 -0800)]
SimpleRADOSStriper: add new minimal async striper

This was developed because the two other striper implementations were
unsuitable for libcephsqlite:

- libradosstriper: while the async APIs exist, its current protocol
  requires synchronously locking an object for every write/read whether
  that operation is async or not. For this reason, it's too far too slow
  for latency sensitive applications.

- osdc/Filer: this requires the object name to be an inode number. It
  also comes with other overhead burden which is not necessary for
  libcephsqlite including caching/buffering.

SimpleRADOSStriper aims to be a minimalistic heavily asynchronous
striper. One way it achieves this is through the use of exclusive locks
to protect access to the striped objects. Most metadata updates are
deferred until the striped file is unlocked, flushed, (or closed). All
reads/writes are asynchronous (but a read implicitly gathers async
striped reads for each op).  Writes are not buffered. Reads are not
cached. There is no readahead.

SimpleRADOSStriper aims to be compatible with the rados binary --striper
option for extracting files out of RADOS but it should not be used
otherwise.

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

4 years agomon: define simple-rados-client-with-blocklist profile
Patrick Donnelly [Sat, 13 Mar 2021 17:41:34 +0000 (09:41 -0800)]
mon: define simple-rados-client-with-blocklist profile

A mon profile that grants the ability for rados clients to blocklist
others (similar to rbd).

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

4 years agolibrados: define must renew lock flag
Patrick Donnelly [Mon, 22 Feb 2021 03:19:25 +0000 (19:19 -0800)]
librados: define must renew lock flag

This flag already exists in cls_lock but was not made externally
available via librados. Additionally, internally cls_lock refers to the
_RENEW flag as _MAY_RENEW, add an alias for librados to match.

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

4 years agocommon: add timeval conversion for durations
Patrick Donnelly [Sat, 20 Feb 2021 03:18:25 +0000 (19:18 -0800)]
common: add timeval conversion for durations

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

4 years agoRevert "libradosstriper: add function to read into char*"
Patrick Donnelly [Sat, 13 Mar 2021 20:53:50 +0000 (12:53 -0800)]
Revert "libradosstriper: add function to read into char*"

This reverts commit f7494cc1288dd4ba075975c110170e485c3e211b.

This change is no longer needed.

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

4 years agotest_libcephsqlite: test random inserts
Patrick Donnelly [Tue, 23 Jul 2019 21:46:03 +0000 (14:46 -0700)]
test_libcephsqlite: test random inserts

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

4 years agocephsqlite: fix compiler errors
Patrick Donnelly [Tue, 23 Jul 2019 21:45:07 +0000 (14:45 -0700)]
cephsqlite: fix compiler errors

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

4 years agocmake: improve build inst for cephsqlite
Patrick Donnelly [Tue, 23 Jul 2019 21:43:50 +0000 (14:43 -0700)]
cmake: improve build inst for cephsqlite

Notably, find SQLite and build the test code.

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

4 years agolibcephsqlite: sqlite interface to RADOS
Milind Changire [Tue, 16 Jul 2019 06:11:25 +0000 (11:41 +0530)]
libcephsqlite: sqlite interface to RADOS

This library provides a SQLite front-end to the RADOS objects.
This effort will help alleviate the restriction on number of key-value pairs
that can be stored in an object.
This interface is a generic one without any constraint on the database
schema either. Library clients can enforce any schema and use SQLite API
to store data in the database backed by RADOS Objects.

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit 1bc229381af97d684c86a0625d5ab9699889ada4)

4 years agolibradosstriper: add function to read into char*
Milind Changire [Thu, 27 Jun 2019 13:35:26 +0000 (19:05 +0530)]
libradosstriper: add function to read into char*

Signed-off-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 02f5543c8df9e2a175ce5d9a96773b641e212c1c)

4 years agoceph-volume: show devices with GPT headers as not available 40315/head
Andrew Schoen [Wed, 17 Mar 2021 20:19:08 +0000 (15:19 -0500)]
ceph-volume: show devices with GPT headers as not available

This patch ensures that if a device has GPT headers it will
not show up in `ceph-volume inventory` as available.

Fixes: https://tracker.ceph.com/issues/48697
Resolves: rhbz#1908065

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

4 years agoMerge pull request #40254 from singuliere/wip-49767-pacific
Yuri Weinstein [Mon, 22 Mar 2021 15:22:43 +0000 (08:22 -0700)]
Merge pull request #40254 from singuliere/wip-49767-pacific

pacific: librbd: allow interrupted trash move request to be restarted

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #40253 from singuliere/wip-49773-pacific
Yuri Weinstein [Mon, 22 Mar 2021 15:22:13 +0000 (08:22 -0700)]
Merge pull request #40253 from singuliere/wip-49773-pacific

pacific: librbd/io: send alloc_hint when compression hint is set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agomon/MgrStatMonitor: ignore MMgrReport from non-active mgr 40310/head
Sage Weil [Thu, 18 Mar 2021 16:45:48 +0000 (11:45 -0500)]
mon/MgrStatMonitor: ignore MMgrReport from non-active mgr

If it's not the active mgr, we should ignore it.

Since the mgr instance is best identified by the gid, add that to the
message.  (We can't use the source_addrs for the message since that is
the MgrStandby monc addr, not the active mgr addrs in the MgrMap.)

This fixes a problem where a just-demoted mgr report gets processed and a
new mgr gets a ServiceMap with an epoch >= its pending map.  (At least,
that is my theory!)

Fixes: https://tracker.ceph.com/issues/48022
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 4d447092c3542bf57dfb4942db766adf2923c069)

4 years agomgr: tell monc when we get new servicemap, fsmap
Sage Weil [Thu, 18 Mar 2021 15:40:42 +0000 (10:40 -0500)]
mgr: tell monc when we get new servicemap, fsmap

Otherwise, when we re-subscribe we'll request an old map again.  In the
case of the servicemap, that can lead to a failed assertion.

Fixes: https://tracker.ceph.com/issues/48022
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 3dbc1f0578d944217ad2bacb58ef561e678abb6c)

4 years agocommon/options: turn off bluestore_fsck_quick_fix_on_mount by default 40309/head
Josh Durgin [Wed, 17 Mar 2021 18:51:27 +0000 (14:51 -0400)]
common/options: turn off bluestore_fsck_quick_fix_on_mount by default

This option enables 3 conversions:

1) pool stats, added in nautilus
2) per-pool omap, added in octopus
3) per-pg omap (replacing (2)) in pacific

Upgrading the long running cluster in sepia from octopus to pacific
resulted in conversion (3). This conversion isn't particularly useful
yet since the follow-on optimization of pg removal aren't in pacific
yet.

This took 25 minutes for the SSD-based osds with <10GB of omap. That's
a lot of disruption, and some clusters have 10x that much omap data.

Upgrades going from nautilus to pacific will miss the finer-grained
stats granularity, but isn't such an important feature it's worth
causing potential availability problems.

In the future we can orchestrate these format changes via cephadm/rook
to minimize the impact on the whole cluster, e.g. going an osd at a
time or doing it during an off-peak period, and not necessarily at the
same time as an upgrade.

Fixes: https://tracker.ceph.com/issues/45265
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit c3e7acb3acd4b099c12062aadf7d413d80ab0cab)

4 years agodoc/cephfs/nfs: Add rook pod restart note, export and log block example 40306/head
Varsha Rao [Mon, 18 Jan 2021 16:24:32 +0000 (21:54 +0530)]
doc/cephfs/nfs: Add rook pod restart note, export and log block example

Fixes: https://tracker.ceph.com/issues/48914
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 01db81e2bc8bae908bcd3600dc9b54fb80c2a554)

4 years agoMerge PR #40247 into pacific
Sage Weil [Sun, 21 Mar 2021 18:25:06 +0000 (13:25 -0500)]
Merge PR #40247 into pacific

* refs/pull/40247/head:
common: reset last_log_sent when clog_to_monitors is updated
logclient: move LogChannel::set_log_to_monitors(bool v) to LogClient.cc

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40246 into pacific
Sage Weil [Sun, 21 Mar 2021 18:24:25 +0000 (13:24 -0500)]
Merge PR #40246 into pacific

* refs/pull/40246/head:
osd: fix potential null pointer dereference when sending ping

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40126 into pacific
Sage Weil [Sun, 21 Mar 2021 18:23:41 +0000 (13:23 -0500)]
Merge PR #40126 into pacific

* refs/pull/40126/head:
pybind/mgr/balancer/module.py: assign weight-sets to all buckets before balancing

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40249 into pacific
Sage Weil [Sun, 21 Mar 2021 18:22:56 +0000 (13:22 -0500)]
Merge PR #40249 into pacific

* refs/pull/40249/head:
osd: ignore already dumped osd in dump_item()

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge PR #40248 into pacific
Sage Weil [Sun, 21 Mar 2021 18:22:08 +0000 (13:22 -0500)]
Merge PR #40248 into pacific

* refs/pull/40248/head:
debian/ceph-common.postinst: do not chown cephadm log dirs

Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #40285 from tchaikov/pacific-pr-40272
Kefu Chai [Sun, 21 Mar 2021 17:19:49 +0000 (01:19 +0800)]
Merge pull request #40285 from tchaikov/pacific-pr-40272

pacific: install-deps.sh: remove existing ceph-libboost of different version

Reviewed-by: David Galloway <dgallowa@redhat.com>
4 years agoMerge PR #40231 into pacific
Sage Weil [Sun, 21 Mar 2021 14:39:20 +0000 (09:39 -0500)]
Merge PR #40231 into pacific

* refs/pull/40231/head:
mgr/dashboard: check .badge instead of text for expected label
mgr/dashboard: Add badge to the Label column in Host List

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge PR #40209 into pacific
Sage Weil [Sun, 21 Mar 2021 14:38:58 +0000 (09:38 -0500)]
Merge PR #40209 into pacific

* refs/pull/40209/head:
mgr/dashboard: select any object gateway on local cluster.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge PR #40129 into pacific
Sage Weil [Sun, 21 Mar 2021 14:38:49 +0000 (09:38 -0500)]
Merge PR #40129 into pacific

* refs/pull/40129/head:
osd: PeeringState: implement an acting_set_writeable() function
osd: PeeringState: fix a boolean conditional direction
osd: PeeringState: fix stretch peering so PGs can go peered but not active
osd: PeeringState: don't add acting-set OSDs to candidate set in stretch mode
osd: PeeringState: fix calc_replicated_acting_stretch() syntax/logic
osd: PeeringState: respect stretch peering constraints for async recovery
osd: PeeringState: add a comment about using size as a proxy for activateable
osd: check for is_stretch_pool() in stretch_set_can_peer()
scripts: some additions to help with local testing
script: set_up_stretch_mode: include OSDs in root=default so pg creation works

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoosd: recover unreadable snapshots when handling manifest object 40289/head
myoungwon oh [Wed, 24 Feb 2021 14:16:39 +0000 (23:16 +0900)]
osd: recover unreadable snapshots when handling manifest object

The manifest object needs adjacent clones to increment/decrement
refcount when modifying the object. So, recovering the clones is needed
if the adjacent clones are unreadable.

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsumg.com>
(cherry picked from commit b242a2c061182b724fa8016d1175f2b23e570d4b)

4 years agoosd: return -EINVAL if op is for existing cache tier
myoungwon oh [Wed, 24 Feb 2021 14:39:50 +0000 (23:39 +0900)]
osd: return -EINVAL if op is for existing cache tier

At the end of unit test, flush and evict are called.
But, those ops affect manifest object because
cache_mode is not set to NONE sometime.

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsumg.com>
(cherry picked from commit 61b43e93bbb636c4852a304da031497a4c3671e3)

4 years agoinstall-deps.sh: remove existing ceph-libboost of different version 40269/head 40285/head
Kefu Chai [Sat, 20 Mar 2021 05:00:01 +0000 (13:00 +0800)]
install-deps.sh: remove existing ceph-libboost of different version

we install different versions of precompiled ceph-libboost packages
for different branches when building and testing them on ubuntu test
nodes. for instance,

- nautilus: v1.72
- octopus, pacific: v1.73

they share the same set of test nodes. and these ceph-libboost packages
conflict with each other, because they install files to the same places.

in order to avoid the confliction, we should uninstall existing packages
before installing a different version of ceph-libboost packages.

ceph-libboost${version}-dev is a package providing the shared headers of
boost library, so, in this change we check if it is installed before
returning or removing the existing packages.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 939b147a55192c21e98d21cb380d0ec0b2ca84d5)

Conflicts:
install-deps.sh: trivial resolution

4 years agoMerge pull request #40273 from singuliere/wip-49907-pacific
Kefu Chai [Sun, 21 Mar 2021 05:45:47 +0000 (13:45 +0800)]
Merge pull request #40273 from singuliere/wip-49907-pacific

pacific: pybind/mgr/dashboard: bump flake8 to 3.9.0

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agopython-common: Validate characters in service_id for container names
Melissa Li [Tue, 16 Mar 2021 05:07:31 +0000 (01:07 -0400)]
python-common: Validate characters in service_id for container names

Service_ids need to be valid docker and podman container names.

Fixes: https://tracker.ceph.com/issues/46497
Signed-off-by: Melissa Li <li.melissa.kun@gmail.com>
(cherry picked from commit 8dd2bf85e759072b4af6546e93ef3768ef9b2db8)

4 years agoqa/suites/rados/cephadm/smoke-roleless: deploy additional daemon types
Sage Weil [Fri, 19 Mar 2021 15:57:58 +0000 (10:57 -0500)]
qa/suites/rados/cephadm/smoke-roleless: deploy additional daemon types

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit e48d80671a876ee1fae6b1ddb9f542987e3ce215)

4 years agomgr/cephadm: identify rgw, cepfs-mirror in servicemap 40279/head
Sage Weil [Thu, 18 Mar 2021 21:27:08 +0000 (17:27 -0400)]
mgr/cephadm: identify rgw, cepfs-mirror in servicemap

Like rbd-mirror, cephfs-mirror and rgw daemons register under their gid.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2bd11c4ceb156a398423e4f7ee3131624a86f810)

4 years agomgr/ServiceMap: adjust 'ceph -s' summary
Sage Weil [Fri, 19 Mar 2021 12:21:18 +0000 (08:21 -0400)]
mgr/ServiceMap: adjust 'ceph -s' summary

- Do not list individual daemon ids as this won't scale for larger
  clusters
- Do not contemplate multile daemons of the same type that register with
  different "daemon_type" -- not until we actually have any that do that.
- Present counts by various groupings: distinct hosts and rgw zones to
  start.

  services:
    mon:           1 daemons, quorum a (age 4m)
    mgr:           x(active, since 3m)
    osd:           1 osds: 1 up (since 3m), 1 in (since 3m)
    cephfs-mirror: 1 daemon active (1 hosts)
    rbd-mirror:    2 daemons active (1 hosts)
    rgw:           2 daemons active (1 hosts, 1 zones)

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit ab0d8f2ae9f551e15a4c7bacbf69161e91263785)

4 years agorgw: register daemons in servicemap by gid; include id
Sage Weil [Fri, 19 Mar 2021 12:25:23 +0000 (08:25 -0400)]
rgw: register daemons in servicemap by gid; include id

Registering by gid allows multiple radosgw instances to share an auth
key/identity.  Including the id in the metadata allows them to still be
identified by name (even if not uniquely).

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit afc33758e076761b8d4ec004c8f9c49b80a48770)

4 years agocephadm: fix rbd-mirror auth name
Sage Weil [Thu, 18 Mar 2021 20:30:52 +0000 (16:30 -0400)]
cephadm: fix rbd-mirror auth name

Broken by 8fa941b35d89db6a40f7d2912b69eadf40c5004c

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit aa13b25c80aec42fbe8e56107c813123907e218c)

4 years agocephadm: fix a minor typo in logging message
Matthew Cengia [Sun, 14 Mar 2021 23:58:21 +0000 (10:58 +1100)]
cephadm: fix a minor typo in logging message

remove duplicated "to"

Signed-off-by: Matthew Cengia <mattcen@mattcen.com>
(cherry picked from commit bd500e88e225135d24d3aec78cfb0b6db7481dae)

4 years agoqa/suites/rados/cephadm/dashboard: test on centos
Sage Weil [Fri, 19 Mar 2021 13:16:55 +0000 (08:16 -0500)]
qa/suites/rados/cephadm/dashboard: test on centos

Fixes: https://tracker.ceph.com/issues/49638
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 04e89d57e73dc240f9c5de438ec63b2b0b4d35a5)

4 years agocephadm: use debug verbosity during container exec
Michael Fritch [Thu, 18 Mar 2021 21:41:06 +0000 (15:41 -0600)]
cephadm: use debug verbosity during container exec

avoid failures from appearing on the consle when exec'ing within the
container during the `ls` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 46f00a7bd7f38a1e2f3b301cd94c5d22b60bcc5a)

4 years agomgr/cephadm/upgrade: do not repeat crash message
Sage Weil [Fri, 19 Mar 2021 14:46:09 +0000 (10:46 -0400)]
mgr/cephadm/upgrade: do not repeat crash message

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 217ddfeb22ad52f1443bc585c044140d9bf07328)

4 years agomgr/cephadm/upgrade: a little less verbose
Sage Weil [Fri, 19 Mar 2021 14:44:19 +0000 (10:44 -0400)]
mgr/cephadm/upgrade: a little less verbose

The _do_upgrade() method runs a zillion times; try to report fewer
repetitive messages on every iteration.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit e03fffe6489278892b35fc6ae7d2a1d5e8e42844)

4 years agomgr/cephadm: don't log not-ok-to-stop at ERR level
Sage Weil [Fri, 19 Mar 2021 14:38:06 +0000 (10:38 -0400)]
mgr/cephadm: don't log not-ok-to-stop at ERR level

This is normal during the upgrade; INF is fine.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 0d5787c0d1eb16fdbc50ecbb19096d531f9ae0f8)

4 years agomgr/cephadm: is presumed -> appears
Sage Weil [Fri, 19 Mar 2021 14:37:37 +0000 (10:37 -0400)]
mgr/cephadm: is presumed -> appears

The old wording was weird.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 3ea3ee5c09d107b3b51c1a92f1733829b7dd4d1f)

4 years agomgr/cephadm: don't double-log ok-to-stop results
Sage Weil [Fri, 19 Mar 2021 14:37:16 +0000 (10:37 -0400)]
mgr/cephadm: don't double-log ok-to-stop results

The calling upgrade code also reports this.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit df7af90b89359a0ef0df4eeeec00ce5758d2b738)

4 years agomgr/cephadm/upgrade: include upgrade progress in ceph -s
Sage Weil [Fri, 19 Mar 2021 14:31:24 +0000 (10:31 -0400)]
mgr/cephadm/upgrade: include upgrade progress in ceph -s

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit efb7ab22a426d648aea0562701c2d77b0df0d119)