Commit Graph

128309 Commits

Author SHA1 Message Date
Sebastian Wagner
9e3f9751c1
Merge pull request #44118 from sebastian-philipp/cephadm-inventory-changed-while-iterated
mgr/cephadm: Inventory: Fix `dictionary changed size during iteration `

Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-11-30 17:50:15 +01:00
Sage Weil
b430fd538f qa/suites/rados/thrash-old-clients: use better-support cephadm distro/podman
Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-30 10:47:53 -06:00
Ernesto Puerta
f4647f3390
Merge pull request #44115 from rhcs-dashboard/fix-tooltip-fast-diff
mgr/dashboard: avoid tooltip if disk_usage=null and fast-diff enabled

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-11-30 14:54:20 +01:00
Ernesto Puerta
5b7230355c
Merge pull request #44083 from wangbo-yw/wangbo-yw
mgr/dashboard: add some test for controllers/pool.py

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-11-30 14:53:59 +01:00
Ernesto Puerta
b9b7c04eec
Merge pull request #43855 from zhangmengqianyw/zmq-unittest
mgr/dashboard:add unittest in test_osd.py

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2021-11-30 14:52:44 +01:00
Sebastian Wagner
4841b7f67b
Merge pull request #44082 from pcuzner/fix-prometheus-timings
mgr/prometheus: Fix the per method stats exported

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-11-30 10:48:48 +01:00
Kyle
dfba515c86
doc/mgr/diskprediction: fix a typo.
doc: remove extra comma.

This commit remove extra comma of "To disable prediction,:".

Fixes: https://tracker.ceph.com/issues/53433

Signed-off-by: devlikai <likai_lc@inspur.com>
2021-11-30 15:27:26 +08:00
Yuval Lifshitz
174ad996c1
Merge pull request #43529 from curtbruns/rgw-lua-storageclass
rgw/lua: allow read/write of StorageClass field
2021-11-30 08:57:23 +02:00
Yuval Lifshitz
d985324cdf
Merge pull request #42504 from arjune123/rgw-bug-fixes
rgw/notification: assigning the value of zonegroup to awsRegion
2021-11-30 08:56:26 +02:00
Venky Shankar
52ad9fbcfe doc, man: document new device syntax for kclient mount
Fxies: http://tracker.ceph.com/issues/47277
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
065301a458 qa: use v1 mount-syntax for upgrade tests
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
f8b939e128 test: mount kclient using new-style (v2) syntax
But, do not throw away the old style mount syntax since we would
want to continue testing it since users (scripts) might still be
using it.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
9663f8aaec mount: use mds_mode=prefer-crc with new-style mount syntax if possible
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
d5ae180976 mount: optionally do not fall-back to old-style mount syntax
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
8606f5839d mount: introduce new mount syntax
Old mount device (source) have the following problems:

- mounts to the same cluster but with different fsnames
  and/or creds have identical device string which can
  confuse xfstests.

- device shown in /proc/mounts is different that what
  is used to mount.

New proposed syntax is as follows:

  # mount -t ceph cephuser@<cluster-fsid>.mycephfs2=/path

The cluster-id is optional but is always passed to the kernel
via mount() syscall (by fetching it from cluster configuration
file if available).

The mount helper tries the mounting the file system with
the new device syntax, falling back to using the old
syntax if required.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
63ac4f9e48 mount: record cluster fsid when reading ceph config file
This will be required when switching to new mount device
syntax when cluster fsid will be passed to kernel as mount
option.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Venky Shankar
f47b7bcbf8 mount: accept monitor host (mon_host) mount option
With new mount device syntax monitor host(s) can be passed
during mount as option parameter. This option is not mandatory
as it can be fetched from the cluster configuration file if
available.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2021-11-30 01:13:34 -05:00
Sage Weil
7e51fe6227 python-common/ceph/deployment/drive_group: fix 'orch ls --format yaml'
In f76c02a658 we may leave out the placement
key when it is empty.  If we take that path, we need to tolerate specs
that are missing that key.

Fixes: f76c02a658
Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 23:25:43 -05:00
Josh Durgin
7dee504a41
Merge pull request #43760 from yaarith/release-checklists
doc/dev/release-checklist: add manual review of telemetry reports

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-11-29 18:18:43 -08:00
Sage Weil
1bbac481f3 mgr/cephadm: avoid repeated calls to get_module_option
We already stash these as MgrModule members.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 16:34:48 -05:00
Sage Weil
4f3a33af02 Merge PR #44018 into master
* refs/pull/44018/head:
	mon: fix quorum_age() regression

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-11-29 14:18:33 -05:00
Sage Weil
1f34b8319a Merge PR #44030 into master
* refs/pull/44030/head:
	mgr/cephadm: add some debug output for serve loop
	ceph-volume: adjust arguments for 'ceph-volume raw activate'
	ceph-volume: add raw support for db/wal for list and activate

Reviewed-by: Sébastien Han <seb@redhat.com>
2021-11-29 13:56:43 -05:00
Sage Weil
9260265bf1 Merge PR #44107 into master
* refs/pull/44107/head:
	qa/tasks/cephadm_cases/test_cli: fix test_daemon_restart

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 13:56:28 -05:00
Sage Weil
f10f94478f mgr/cephadm: add some debug output for serve loop
Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 11:58:38 -05:00
Sage Weil
afd8be7eac ceph-volume: adjust arguments for 'ceph-volume raw activate'
Take a list of devices, so that we can selectively activate a raw osd
with db/wal.

Remove the argument type kludge introduced in 2c228a9a40
since it is no longer needed.

Note that we're making this change because (1) it allows db/wal and (2)
because there are no known users of 'raw activate'.  The only known user
is via 'ceph-volume activate' and we've fixed that caller in this commit.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 11:58:38 -05:00
Sage Weil
f0a0c70d5c ceph-volume: add raw support for db/wal for list and activate
Currently 'prepare' doesn't support db/wal, but we want it in list and
activate because 'ceph-volume activate ...' tries raw before lvm.

Note that I'm not sure we really want to accept --block.db and --block.wal
here at all.

Fixes: 3d7ceec684
Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 11:58:38 -05:00
Sage Weil
9ae9894827 qa/tasks/cephadm_cases/test_cli: fix test_daemon_restart
We cannot schedule a daemon start if there is another daemon action
with a higher priority (including stop) scheduled.  However,
that state isn't cleared until *after* the osd goes down, the
systemctl command returns, and mgr/cephadm gets around to updating
the inventory scheduled_daemon_action state.

Semi-fix: (1) wait for the orch status to change, and then (2)
wait a few more seconds after that.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-11-29 10:24:20 -06:00
Sebastian Wagner
6e457b2978
Merge pull request #44100 from adk3798/infer-config-fix
cephadm: only infer conf from mon if fsid matches

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 17:03:22 +01:00
Sebastian Wagner
e38f4891e8
Merge pull request #44101 from adk3798/agent-down-multiplier
mgr/cephadm: agent: allow agent down multiplier to be configured

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 15:35:32 +01:00
Brian_P
22ca9ce373
doc: fix typo in cephadm host management 2021-11-29 14:13:17 +00:00
Sebastian Wagner
602cbea5ed
Merge pull request #42378 from sebastian-philipp/no-grafana-admin
mgr/cephadm: Add GrafanaSpec.initial_admin_password

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
2021-11-29 14:08:22 +01:00
Sebastian Wagner
018807ef65
mgr/cephadm: serve.py: put _write_client_files into it's own method
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 11:53:05 +01:00
Sebastian Wagner
fb2321ec69
mgr/cephadm: serve.py: put _calc_client_files into it's own method
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 11:51:11 +01:00
Sebastian Wagner
1a87e5eaf5
mgr/cephadm: Raise errors to properly set a cli status code
otherwise `ceph orch host rm` will return 0

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 11:51:11 +01:00
Sebastian Wagner
02c942a093
mgr/cephadm: Add client.admin keyring when upgrading from older version
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 11:51:11 +01:00
Sebastian Wagner
8de88a1d0a
mgr/cephadm/inventory: remove unused filter_by_label
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
2021-11-29 11:26:37 +01:00
Sebastian Wagner
c3c4beb61c
Merge pull request #44011 from adk3798/repr-device
python-common: add string representation for Device and DeviceSelection classes

Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-11-29 09:50:28 +01:00
Mykola Golub
64054795de
Merge pull request #44114 from orozery/librbd-memory-leaks
librbd: fix various memory leaks

Reviewed-by: Mykola Golub <mgolub@suse.com>
2021-11-29 09:36:08 +02:00
Jianpeng Ma
cc8dae1d89 librbd/cache/pwl: revert patch 76f4d29d92.
In fact, After BlockGuard to fix flush reorder issue, patch
76f4d29d9 don't need. So revert.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2021-11-29 15:16:52 +08:00
Jianpeng Ma
8e8f3ef516 librbd/cache/pwl: Using BlockGuard control overlap ops order when flush to osd.
In process of tests, we met some inconsistent-data problem. Test case
mainly use write,then discard to detect data consistent.
W/o pwl, write/discard are synchronous ops. After write, data already
located into osd. But w/ pwl, we use asynchronous api to send ops to
osd.
Although we mare sure send order. But send-order don't makre sure
complete order. This mean pwl keep order of write/discard. But it
don't keep the same semantics which use synchronous api. W/ pwl, it make
synchronous to asynchronous. For normal ops, it's not problem. But if
connected-commands w/ overlap, it make data inconsistent.
So we use BlockGuard to solve this issue.

Fixes: https://tracker.ceph.com/issues/49876
Fixes: https://tracker.ceph.com/issues/53108

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2021-11-29 15:16:52 +08:00
Samuel Just
c4c324c2e0
Merge pull request #43530 from myoungwon/wip-seastore-nvme-device
seastore: add nvme commands to nvme device class

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-11-28 20:21:39 -08:00
Samuel Just
30ad010566
Merge pull request #44068 from rzarzynski/wip-crimson-weakref-in-sharedlru
crimson/common: don't assume pointer-from-SharedLRU can't outlive it.

Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2021-11-28 17:59:54 -08:00
Samuel Just
e6217f189a
Merge pull request #44110 from rzarzynski/wip-crimson-alienstore-syncumountread
crimson/os: fix a shutdown-related race condition in AlienStore.

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-11-28 16:36:47 -08:00
Xiubo Li
cfe8f05035 doc: fix the style of the cephfs capability doc
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2021-11-29 08:33:38 +08:00
Samuel Just
81d7403a7a
Merge pull request #43481 from myoungwon/wip-dedup-tool-repair
tool: add repair command to ceph-dedup-tool

Reviewed-by: Samuel Just <sjust@redhat.com>
2021-11-28 16:10:46 -08:00
Or Ozeri
5de8791da7 librbd/crypto: remove unused member from ShutDownCryptoRequest
m_crypto is not used - remove it.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
2021-11-28 13:06:34 +02:00
Or Ozeri
23831579b4 test/librbd: fix memory leak in TestMockShutDownCryptoRequest
fix memory leak in TestMockShutDownCryptoRequest.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
2021-11-28 13:06:34 +02:00
Or Ozeri
23bb3e458c test/librbd: fix memory leak in TestMockCryptoLoadRequest
fix memory leak in TestMockCryptoLoadRequest.CryptoAlreadyLoaded

Signed-off-by: Or Ozeri <oro@il.ibm.com>
2021-11-28 13:06:34 +02:00
Or Ozeri
bb0ccb3cc4 test/librbd: fix memory leak in TestMockCryptoCryptoObjectDispatch
fix memory leak in TestMockCryptoCryptoObjectDispatch.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
2021-11-28 13:06:34 +02:00
Or Ozeri
9992bbaa53 librbd/crypto: fix memory leak in openssl/DataCryptor
Re-initializing the same datacryptor, causes a memory leak of the old encryption key.
This commit fixes this issue.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
2021-11-28 13:06:34 +02:00