]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Nizamudeen A [Fri, 17 Sep 2021 16:07:09 +0000 (21:37 +0530)]
mgr/dashboard: Fix failing config dashboard e2e check
Recently a new osd config has been added in
6ca32bde2e1d0dd58df168126582a570ac09aad6 and this is getting Modified.
So on our dashboard e2e config check which checks for the Modified
filter, this is also coming on the entry. So we need to increase the
count.
Fixes: https://tracker.ceph.com/issues/52649
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
53f78d330c98f803c09a2314397d48f253db0866 )
Ernesto Puerta [Tue, 21 Sep 2021 09:57:58 +0000 (11:57 +0200)]
Merge pull request #43190 from rhcs-dashboard/wip-52251-pacific
pacific: mgr/dashboard: cephfs MDS Workload to use rate for counter type metric
Ernesto Puerta [Tue, 21 Sep 2021 09:54:46 +0000 (11:54 +0200)]
Merge pull request #42678 from callithea/wip-52021-pacific
pacific: mgr/dashboard: Visual regression tests for ceph dashboard
Reviewed-by: aaryanporwal <NOT@FOUND>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Yuri Weinstein [Fri, 17 Sep 2021 17:15:02 +0000 (10:15 -0700)]
Merge pull request #43002 from ktdreyer/pacific-52472-rm-virtualenv
pacific: *: s/virtualenv/python -m venv/
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Jenkins Build Slave User [Thu, 16 Sep 2021 14:27:19 +0000 (14:27 +0000)]
16.2.6
Jan Horáček [Thu, 27 May 2021 00:03:01 +0000 (02:03 +0200)]
[mgr/dashboard] cephfs metrics in MDS Workload panels to use rate because of counter type metric
Fixes: https://tracker.ceph.com/issues/51954
Signed-off-by: Jan Horacek <jan.horacek@livesport.eu>
(cherry picked from commit
5bf516dcc7f59a970c6369ab075cbca7d81ac7d5 )
Yuri Weinstein [Wed, 15 Sep 2021 14:30:22 +0000 (07:30 -0700)]
Merge pull request #43168 from linuxbox2/pacific-perl-semicolon
workunits/rgw: semicolon terminates perl statements
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Matt Benjamin [Tue, 14 Sep 2021 17:16:23 +0000 (13:16 -0400)]
workunits/rgw: semicolon terminates perl statements
Fixes a lexical error in one line of code added in
90e9307ab0a52da260bc1ebb50329cd8ff942eb9 , removing the dependency
on lsb_release, on 8/16/2021.
Fixes: https://tracker.ceph.com/issues/52613
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
221fdb858be083a981697cdb59c19f0659be3f1d )
Yuri Weinstein [Tue, 14 Sep 2021 15:43:58 +0000 (08:43 -0700)]
Merge pull request #43151 from ceph/pacific-systemd
pacific: debian/control: dh-systemd is part of debhelper now
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 14 Sep 2021 15:43:13 +0000 (08:43 -0700)]
Merge pull request #43131 from ceph/remove-cython
pacific: debian/control: remove cython from Build-Depends
Reviewed-by: Kefu Chai <kchai@redhat.com>
David Galloway [Fri, 10 Sep 2021 13:55:56 +0000 (09:55 -0400)]
pacific: debian/control: dh-systemd is part of debhelper now
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822670
Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit
4f21d41b73e30b71c9222841751dcebf898613cc )
Kefu Chai [Sun, 21 Mar 2021 14:55:37 +0000 (22:55 +0800)]
debian/control: remove cython from Build-Depends
as cython3 is enough. and we've dropped the python2 support.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
bcd7f3ac0f299855516df871a56ef26c1ee21bc9 )
Yuri Weinstein [Thu, 9 Sep 2021 17:26:33 +0000 (10:26 -0700)]
Merge pull request #43100 from ifed01/wip-ifed-fix-migrate-pac
pacific: os/bluestore: fix bluefs migrate command
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 9 Sep 2021 17:25:24 +0000 (10:25 -0700)]
Merge pull request #42976 from idryomov/wip-51419-pacific
pacific: common/buffer: fix SIGABRT in rebuild_aligned_size_and_memory
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Guillaume Abrioux [Thu, 9 Sep 2021 15:38:33 +0000 (17:38 +0200)]
Merge pull request #43116 from guits/wip-52560-pacific
pacific: ceph-volume: fix lvm activate arguments
Guillaume Abrioux [Thu, 9 Sep 2021 14:53:14 +0000 (16:53 +0200)]
Merge pull request #43110 from guits/wip-52554-pacific
pacific: ceph-volume: fix lvm migrate without args
Dimitri Savineau [Thu, 26 Aug 2021 21:11:12 +0000 (17:11 -0400)]
ceph-volume: fix lvm activate arguments
When using the `lvm activate` subcommand without any osd ID or osd FSID
then ceph-volume fails.
Currently we can either activate with:
- both osd ID and osd FSID
- only the osd FSID (because it's unique)
The remaining scenarios aren't covered and generate a stack trace:
- only the osd ID
- no osd ID nor osd FSID
This ends up with an error like:
--> UnboundLocalError: local variable 'tags' referenced before assignment
Fixes: https://tracker.ceph.com/issues/50665
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
b77ed5f99d3cb14a46bb36bb74e4136c22edf48a )
Aaryan Porwal [Fri, 16 Jul 2021 08:44:54 +0000 (14:14 +0530)]
Added visual regression tests for login component
Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
(cherry picked from commit
7d69309cf9444d5581ff52486748e6e970fd5a3e )
Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
line 41191 - 41208 ("hast-util-parse-selector" has not been in pacific before);
update package-lock.json
Dimitri Savineau [Fri, 3 Sep 2021 14:45:18 +0000 (10:45 -0400)]
ceph-volume: fix lvm migrate without args
When running the `lvm migrate` subcommand without any args then the
ceph-volume command fails with a stack trace.
Traceback (most recent call last):
File "/usr/lib/python3.6/site-packages/ceph_volume/decorators.py", line 59, in newfunc
return f(*a, **kw)
File "/usr/lib/python3.6/site-packages/ceph_volume/main.py", line 151, in main
terminal.dispatch(self.mapper, subcommand_args)
File "/usr/lib/python3.6/site-packages/ceph_volume/terminal.py", line 194, in dispatch
instance.main()
File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/main.py", line 46, in main
terminal.dispatch(self.mapper, self.argv)
File "/usr/lib/python3.6/site-packages/ceph_volume/terminal.py", line 194, in dispatch
instance.main()
File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/migrate.py", line 520, in main
self.migrate_osd()
File "/usr/lib/python3.6/site-packages/ceph_volume/decorators.py", line 16, in is_root
return func(*a, **kw)
File "/usr/lib/python3.6/site-packages/ceph_volume/devices/lvm/migrate.py", line 403, in migrate_osd
if self.args.osd_id:
AttributeError: 'Migrate' object has no attribute 'args'
That's because we're exiting the parse_argv function but we continue to
execute the migrate_osd function. We should instead exit from the main function.
This update the parsing argument to have the same code than new-db and
new-wal classes.
Now the parsing is done in the make_parser function but the argv testing is
done in the main function allowing to exit the program and displaying the
help message when no arguments are provided.
Fixes: https://tracker.ceph.com/issues/51811
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
98de3306127cb758e5517a322f6da9e636f91036 )
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:43 +0000 (09:30 +0200)]
Merge pull request #43091 from guits/wip-52545-pacific
pacific: ceph-volume: support no_systemd with lvm migrate
Guillaume Abrioux [Thu, 9 Sep 2021 07:30:07 +0000 (09:30 +0200)]
Merge pull request #43098 from guits/wip-52547-pacific
pacific: ceph-volume: remove --all ref from deactivate help
Yuri Weinstein [Wed, 8 Sep 2021 21:54:27 +0000 (14:54 -0700)]
Merge pull request #42925 from lxbsz/flush_mdlog_pacific
pacific: client: flush the mdlog in unsafe requests' relevant and auth MDSes only
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Wed, 8 Sep 2021 21:53:40 +0000 (14:53 -0700)]
Merge pull request #42923 from lxbsz/pg_num-pacific
pacific: qa: increase the pg_num for cephfs_data/metadata pools
Reviewed-by: Ramana Raja <rraja@redhat.com>
Igor Fedotov [Tue, 31 Aug 2021 12:54:23 +0000 (15:54 +0300)]
os/bluestore: fix bluefs migrate command
After migrating DB volume to a slow one RocksDB still
needs to be provided with slow.db path to properly access relevant files under db.slow subfolder.
Without that specification it tries to access them under 'db' one which
results in "not-found" error.
Fixes: https://tracker.ceph.com/issues/40434
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
90852d9b6f0da7967121200c9a1c56bed1929d2d )
Igor Fedotov [Tue, 31 Aug 2021 12:54:04 +0000 (15:54 +0300)]
qa/osd-bluefs-volume-ops: reproduce bluefs migrate bug
Reproduces: https://tracker.ceph.com/issues/40434
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
0b0f8ef12fcc53666809b5bea6d24d07a8777425 )
Yuri Weinstein [Wed, 8 Sep 2021 15:52:26 +0000 (08:52 -0700)]
Merge pull request #43023 from ifed01/wip-ifed-fix-bluefs-replay-crc-pac
pacific: os/bluestore: accept undecodable multi-block bluefs transactions on log
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 8 Sep 2021 15:51:32 +0000 (08:51 -0700)]
Merge pull request #42990 from rhcs-dashboard/wip-52325-pacific
pacific: pybind/mgr: Fix IPv6 url generation
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Dimitri Savineau [Fri, 3 Sep 2021 23:06:42 +0000 (19:06 -0400)]
ceph-volume: remove --all ref from deactivate help
Until the `--all` feature is implemented.
This was partially removed in
c13901f but not from the help command.
Fixes: https://tracker.ceph.com/issues/50109
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
3a385bc38686e45c734ffaa182a23837aaceaaa2 )
Guillaume Abrioux [Wed, 8 Sep 2021 15:23:42 +0000 (17:23 +0200)]
Merge pull request #43087 from guits/wip-52538-pacific
pacific: ceph-volume: fix raw list with logical partition
Guillaume Abrioux [Wed, 8 Sep 2021 15:21:17 +0000 (17:21 +0200)]
Merge pull request #43089 from guits/wip-52542-pacific
pacific: doc/ceph-volume: add lvm migrate/new-db/new-wal
Dimitri Savineau [Fri, 3 Sep 2021 16:47:25 +0000 (12:47 -0400)]
ceph-volume: support no_systemd with lvm migrate
The `ceph-volume lvm migrate/new-db/new-wal` commands don't support
running on non systemd systems or within containers.
Like other ceph-volume commands (lvm activate/batch/zap or raw activate)
we also need to be able to use the --no-systemd flag.
Fixes: https://tracker.ceph.com/issues/51854
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
96d84acf5aedc9cf462230fd5fb685f0562a1371 )
Dimitri Savineau [Fri, 3 Sep 2021 19:44:39 +0000 (15:44 -0400)]
doc/ceph-volume: add lvm migrate/new-db/new-wal
The inital PR was implementing those new commands only adds the man page
and not the online documentation.
Fixes: https://tracker.ceph.com/issues/51814
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
22de626220e6145fce8e1fd963802170f099f733 )
Guillaume Abrioux [Wed, 8 Sep 2021 11:22:10 +0000 (13:22 +0200)]
Merge pull request #43076 from guits/wip-52525-pacific
pacific: ceph-volume: pvs --noheadings replace pvs --no-heading
Guillaume Abrioux [Tue, 7 Sep 2021 13:38:33 +0000 (15:38 +0200)]
ceph-volume: test the lsblk command in list.py
Let's test we use the expected args when we build the `lsblk` command
to list the devices present on the node.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
959ea33c0ba118984d678403b234e7628ccac3dc )
Dimitri Savineau [Fri, 3 Sep 2021 18:24:48 +0000 (14:24 -0400)]
ceph-volume: fix raw list with logical partition
This is a regression introduced by
9212420 , when the host is using a
logical partition then lsblk reports that partition as a child from the
physical device.
That logical partition is prefixed by the `└─` character.
This leads the `raw list` subcommand to show the lsblk error on the stderr.
```
$ ceph-volume raw list
{}
stderr: lsblk: `-/dev/sda1: not a block device
```
The lsblk command output looks like:
```
$ lsblk --paths --output=NAME --noheadings
/dev/sda
└─/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```
Using the `--list` option with lsblk solves the issue.
```
$ lsblk --list --paths --output=NAME --noheadings
/dev/sda
/dev/sda1
/dev/sdb
/dev/sdc
/dev/sdd
```
Fixes: https://tracker.ceph.com/issues/52504
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
7a6486bf4ddb2d789cc16047d8163baa8473e253 )
Yuri Weinstein [Tue, 7 Sep 2021 20:02:39 +0000 (13:02 -0700)]
Merge pull request #42937 from batrick/i51977
pacific: client: make sure only to update dir dist from auth mds
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 7 Sep 2021 16:04:28 +0000 (09:04 -0700)]
Merge pull request #43007 from ifed01/wip-ifed-fix-52311-pac
pacific: os/bluestore: fix using incomplete bluefs log when dumping it.
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Tue, 7 Sep 2021 16:03:49 +0000 (09:03 -0700)]
Merge pull request #43001 from ktdreyer/pacific-52449-rm-lsb-release
pacific: Remove dependency on lsb_release
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 7 Sep 2021 16:03:19 +0000 (09:03 -0700)]
Merge pull request #43000 from ktdreyer/pacific-52471-rm-gdbm
pacific: ceph.spec.in: drop gdbm from build deps
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 7 Sep 2021 16:02:25 +0000 (09:02 -0700)]
Merge pull request #42987 from MrFreezeex/wip-52461-pacific
pacific: rbd-mirror: add perf counters to snapshot replayer
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 7 Sep 2021 16:01:09 +0000 (09:01 -0700)]
Merge pull request #42980 from idryomov/wip-50522-pacific
pacific: rbd: fix default pool handling for nbd map/unmap
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Yuri Weinstein [Tue, 7 Sep 2021 15:58:52 +0000 (08:58 -0700)]
Merge pull request #42979 from idryomov/wip-52063-pacific
pacific: rbd-mirror: fix potential async op tracker leak in start_image_replayers
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 7 Sep 2021 15:58:05 +0000 (08:58 -0700)]
Merge pull request #42972 from idryomov/wip-51867-pacific
pacific: pybind/rbd: fix mirror_image_get_status
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Sebastian Wagner [Tue, 7 Sep 2021 13:16:34 +0000 (15:16 +0200)]
Merge pull request #43029 from sebastian-philipp/pacific-backport-42535-42682-42252-42293-42816-42589-42590-42592-42690-42405-
pacific: cephadm: September batch 1
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
FengJiankui [Wed, 1 Sep 2021 09:37:25 +0000 (17:37 +0800)]
ceph-volume: pvs --noheadings replace pvs --no-heading
Fixes: https://tracker.ceph.com/issues/52482
Signed-off-by: FengJiankui <fengjiankui@inspur.com>
(cherry picked from commit
7083c4ffc63274bdd3103e9c5296bc70acbe745f )
Sebastian Wagner [Mon, 23 Aug 2021 10:07:30 +0000 (12:07 +0200)]
cephadm: Add test_command_list_networks
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
8b768153b8829692fe5ad833a8f86c70f8101360 )
Sebastian Wagner [Mon, 23 Aug 2021 09:27:48 +0000 (11:27 +0200)]
cephadm: test_networks: Move tests from test_cephadm
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
419dfd6afae96739efe52a979603b257dd000568 )
Sebastian Wagner [Fri, 6 Aug 2021 09:41:39 +0000 (11:41 +0200)]
cephadm: list-networks: Avoid duplicated IPs
Fixes: https://tracker.ceph.com/issues/52083
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
b65822fc8cd3cbf541d50e9ee69d77ef9d1e9cfd )
Sebastian Wagner [Mon, 23 Aug 2021 09:19:16 +0000 (11:19 +0200)]
cephadm: Fix TestCephVolume.test_noop
Fixes `PermissionError: [Errno 13] Permission denied: '/var/lib/ceph/760b...5a5fbb'`
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
1978cd33238351045a8b7d856a1e35e36221f09a )
Dimitri Savineau [Thu, 19 Aug 2021 18:20:43 +0000 (14:20 -0400)]
cephadm: Set tcmalloc env var for Ceph daemons
We don't need to set the TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES environment
variable for non Ceph daemons.
Fixes: https://tracker.ceph.com/issues/52334
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit
c08c56324fd53a60518cd75859fe8ec8771e4104 )
Paul Cuzner [Wed, 18 Aug 2021 05:02:32 +0000 (17:02 +1200)]
cephadm:Add listening ports to gather-facts output
This patch adds tcp and udp listening ports to the data
returned by gather-facts. This can be used to check port
availability prior to trying to deploying daemons, to
catch port conflicts earlier. IPv4 and IPv6 are supported
Fixes: #52038
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
0c4e88993bc04d248b1616ba4d46ebe24bf17381 )
Oleander Reis [Wed, 18 Aug 2021 13:45:42 +0000 (15:45 +0200)]
cephadm: check for openntpd.service as time sync service
openntpd is an alternative implementation of time synchronization
by the openbsd project and is packaged for debian and ubuntu
since at least jessie / 18.04 with the service named openntpd.service
Signed-off-by: Oleander Reis <oleander.reis@hostserver.de>
(cherry picked from commit
dadf786e77f0adc2f62fd91a70f4ed31a82c1e32 )
Adam King [Thu, 5 Aug 2021 14:09:16 +0000 (10:09 -0400)]
mgr/cephadm: make scheduler able to accomodate offline/maintenance hosts
Fixes: https://tracker.ceph.com/issues/51027
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
01a580b3082f83347181bf835b9ef698cecfc015 )
Yuxiang Zhu [Mon, 2 Aug 2021 17:03:11 +0000 (01:03 +0800)]
cephadm: better port stripping
in case the specified port number contains leading zeros
Signed-off-by: Yuxiang Zhu <vfreex@gmail.com>
(cherry picked from commit
496a2c40c87858c188467b7dbacf5e2385ad521c )
Yuxiang Zhu [Mon, 2 Aug 2021 16:53:26 +0000 (00:53 +0800)]
cephadm: propagate environment variables to subprocesses
so that I can use an http(s) proxy for external network access when running cephadm.
e.g.
```sh
http_proxy=http://proxy:8080 https_proxy=http://proxy:8080 cephadm pull
```
Signed-off-by: Yuxiang Zhu <vfreex@gmail.com>
(cherry picked from commit
8f72f774892be6aec458452fc2678578f2436e90 )
Yuxiang Zhu [Mon, 2 Aug 2021 16:47:22 +0000 (00:47 +0800)]
cephadm: Fix bootstrap error with IPv6 mon-ip
Fix the following error by removing the enclosing square brackets in `ctx.mon_ip`.
This issue also occurs on pacific.
```sh
$ sudo cephadm --verbose bootstrap --mon-ip fd49:277:42:2020:c4ba:e6ff:fedf:604
/usr/bin/ceph: stderr > ssh -F ssh_config -i ~/cephadm_private_key root@[fd49:277:42:2020:c4ba:e6ff:fedf:604]
Traceback (most recent call last):
File "/usr/sbin/cephadm", line 3776, in prepare_ssh
cli(args)
File "/usr/sbin/cephadm", line 4076, in cli
return CephContainer(
File "/usr/sbin/cephadm", line 3263, in run
out, _, _ = call_throws(self.ctx, self.run_cmd(),
File "/usr/sbin/cephadm", line 1453, in call_throws
raise RuntimeError('Failed command: %s' % ' '.join(command))
RuntimeError: Failed command: /usr/bin/podman run --rm --ipc=host --stop-signal=SIGTERM --net=host --entrypoint /usr/bin/ceph --init -e CONTAINER_IMAGE=docker.io/ceph/ceph:v16 -e NODE_NAME=ceph-node2 -e CEPH_USE_RANDOM_NONCE=1 -v /var/log/ceph/
fee89f24 -f3af-11eb-87b1-
c6bae6df0604 :/var/log/ceph:z -v /tmp/ceph-tmpnjeaui27:/etc/ceph/ceph.client.admin.keyring:z -v /tmp/ceph-tmpjfm82r9d:/etc/ceph/ceph.conf:z docker.io/ceph/ceph:v16 orch host add ceph-node2 [fd49:277:42:2020:c4ba:e6ff:fedf:604]
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/sbin/cephadm", line 8230, in <module>
main()
File "/usr/sbin/cephadm", line 8218, in main
r = ctx.func(ctx)
File "/usr/sbin/cephadm", line 1759, in _default_image
return func(ctx)
File "/usr/sbin/cephadm", line 4142, in command_bootstrap
prepare_ssh(ctx, cli, wait_for_mgr_restart)
File "/usr/sbin/cephadm", line 3778, in prepare_ssh
raise Error('Failed to add host <%s>: %s' % (host, e))
__main__.Error: Failed to add host <ceph-node2>: Failed command: /usr/bin/podman run --rm --ipc=host --stop-signal=SIGTERM --net=host --entrypoint /usr/bin/ceph --init -e CONTAINER_IMAGE=docker.io/ceph/ceph:v16 -e NODE_NAME=ceph-node2 -e CEPH_USE_RANDOM_NONCE=1 -v /var/log/ceph/
fee89f24 -f3af-11eb-87b1-
c6bae6df0604 :/var/log/ceph:z -v /tmp/ceph-tmpnjeaui27:/etc/ceph/ceph.client.admin.keyring:z -v /tmp/ceph-tmpjfm82r9d:/etc/ceph/ceph.conf:z docker.io/ceph/ceph:v16 orch host add ceph-node2 [fd49:277:42:2020:c4ba:e6ff:fedf:604]
Releasing lock
140115256165328 on /run/cephadm/
fee89f24 -f3af-11eb-87b1-
c6bae6df0604 .lock
Lock
140115256165328 released on /run/cephadm/
fee89f24 -f3af-11eb-87b1-
c6bae6df0604 .lock
```
Signed-off-by: Yuxiang Zhu <vfreex@gmail.com>
(cherry picked from commit
d3f5aaf40267a168f9709be0292b160638297999 )
Sebastian Wagner [Tue, 17 Aug 2021 12:27:40 +0000 (14:27 +0200)]
mgr/cephadm/upgrade: Upgrade status: We also upgrade non-ceph daemons
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit
bcd127b46a097d18f43ee829ff8b97033902b05e )
Zac Dover [Mon, 12 Jul 2021 20:07:49 +0000 (06:07 +1000)]
doc/cephadm: rewrite client-setup.rst
This improves the text in client-setup.rst.
We should make certain that the technical details
in this file remain current in July 2021. This
file was origingally written in November 2019.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
18a15891df23222a60affdf9cfcd5760cfb0fa05 )
Alfonso Martínez [Wed, 11 Aug 2021 06:59:13 +0000 (08:59 +0200)]
mgr/dashboard: set rgw credentials: fix api tests
Fixes: https://tracker.ceph.com/issues/44605
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
a682b9d7a49fbd50c69494f947a6c0565ad0c78e )
Alfonso Martínez [Mon, 9 Aug 2021 11:14:20 +0000 (13:14 +0200)]
mgr/dashboard: run-frontend-e2e-tests.sh: remove unneeded rgw setting
Fixes: https://tracker.ceph.com/issues/44605
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
8e482f36f2b4eca228f8990690414c0ec513bf88 )
Alfonso Martínez [Mon, 9 Aug 2021 10:12:52 +0000 (12:12 +0200)]
mgr/dashboard: rgw service creation form: add realm and zone to service spec.
Align rgw service id pattern with cephadm: https://github.com/ceph/ceph/pull/39877
- Update rgw pattern to allow service id for non-multisite config.
- Extract realm and zone from service id (when detected) and add them to the service spec.
Fixes: https://tracker.ceph.com/issues/44605
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
0575844192502ded32962b75a91cf51de22e97e6 )
Alfonso Martínez [Fri, 6 Aug 2021 06:57:47 +0000 (08:57 +0200)]
mgr/dashboard: connect-rgw: rename to set-rgw-credentials; refactoring
- Rename the dashboard command to better reflect its behavior.
- Rename '_radosgw_admin' method to 'send_rgwadmin_command' for consistency with
'send_mon_command' and move it to the mgr_module.py .
- Cleanup: remove unneeded rgw settings.
- Better error handling and test coverage.
Fixes: https://tracker.ceph.com/issues/44605
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
6e20ef1dd35f3681d14cd4e08ca63eb20edc2c88 )
Alfonso Martínez [Wed, 28 Jul 2021 07:48:18 +0000 (09:48 +0200)]
mgr/dashboard: connect-rgw: adaptation and test coverage
- Align Dashboard with cephadm: configure credentials using the same logic.
- Fix: create a 'dashboard' user per realm (before: only on 1st realm).
- Lint fixes, test coverage, method renaming to better reflect behavior and method visibility.
Fixes: https://tracker.ceph.com/issues/44605
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
0fcf0a7827cf4e8748a382613f9c8d1715c4a1e8 )
Sage Weil [Thu, 8 Jul 2021 17:22:59 +0000 (13:22 -0400)]
mgr/cephadm: re-check dashboard <-> rgw creds when rgw daemons created/destroyed
We don't always know when a realm is created/destroyed, but we can use
service config and purge to cover most such cases.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
91e185d956495885575f052848204169937efde7 )
Sage Weil [Thu, 8 Jul 2021 17:10:23 +0000 (13:10 -0400)]
mgr/dashboard: add 'dashboard connect-rgw' command
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
478c53ba68feb0448d9b4bb8be2f5012f7d85b9b )
Sage Weil [Thu, 8 Jul 2021 20:19:42 +0000 (16:19 -0400)]
doc/mgr/dashboard: simplify dashboard+rgw config docs
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
599116a0680296776445d614c55b63f145a700b6 )
Sage Weil [Thu, 5 Aug 2021 14:31:09 +0000 (10:31 -0400)]
cephadm: no need to explicitly enable prometheus module
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
4dc860feef4802d0432c54f3a40584ad7e9138bf )
Sage Weil [Thu, 5 Aug 2021 14:24:13 +0000 (10:24 -0400)]
mgr/cephadm: enable prometheus module before deploying prometheus
The mon will restart the mgr when the module is enabled, so we don't
really have to do anything here. The raise is there just in case the
mgr doesn't immediately get the new mgrmap and respawn, although there is
likely no harm done if we continue to deploy prometheus in the meantime,
even if we're interrupted partway through.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
50dc1d0decb2fbf7b9129bddba940969410be5cd )
Sage Weil [Thu, 5 Aug 2021 14:17:40 +0000 (10:17 -0400)]
mgr/cephadm: drop daemon_id arg to CephadmService.config()
Unused (and nonsensical since this is *service* config).
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e9dabdab6540d949bd3401fef66ec583368b33de )
Sage Weil [Thu, 5 Aug 2021 14:24:46 +0000 (10:24 -0400)]
doc/cephadm: no need to manually enable the prometheus module
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
afa509ec572b1099c2e8d8c69787a764a1fcc44a )
Sage Weil [Wed, 28 Jul 2021 18:06:49 +0000 (13:06 -0500)]
doc/install/containers: quay.io!
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
d1c744ee534a6196964ef546f4e9bbd302907dfe )
Daniel Pivonka [Wed, 14 Jul 2021 13:27:59 +0000 (09:27 -0400)]
mgr/cephadm: add ability to remove offline host
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
219887301dfdeac55c75a7105bf3a2851fe56387 )
Igor Fedotov [Wed, 18 Aug 2021 10:39:02 +0000 (13:39 +0300)]
os/bluestore: accept undecodable multi-block bluefs transactions on log
replay.
We should proceed with OSD startup when detecting undecodable bluefs
transaction spanning multiple disk blocks during log replay.
The rationale is that such a transaction might appear during unexpected
power down - just not every disk block is written to disk. Hence we can
consider this a normal log replay stop condition.
https://tracker.ceph.com/issues/52079
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
2ba5cb7865c2a7452ee2abda5e0986ce9c42f4b9 )
Yuri Weinstein [Wed, 1 Sep 2021 21:16:59 +0000 (14:16 -0700)]
Merge pull request #42939 from batrick/i51832
pacific: mds: META_POP_READDIR, META_POP_FETCH, META_POP_STORE, and cache_hit_rate are not updated
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Wed, 1 Sep 2021 21:16:17 +0000 (14:16 -0700)]
Merge pull request #42938 from batrick/i51932
pacific: mds: MDCache.cc:5319 FAILED ceph_assert(rejoin_ack_gather.count(mds->get_nodeid()))
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Wed, 1 Sep 2021 21:15:38 +0000 (14:15 -0700)]
Merge pull request #42936 from batrick/i51198
pacific: msg: active_connections regression
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Wed, 1 Sep 2021 21:14:45 +0000 (14:14 -0700)]
Merge pull request #42935 from batrick/i51935
pacific: mds: add debugging when rejecting mksnap with EPERM
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Wed, 1 Sep 2021 18:59:40 +0000 (11:59 -0700)]
Merge pull request #42956 from ifed01/wip-ifed-fix-huge-omap-rename-pac
pacific: os/bluestore: cap omap naming scheme upgrade transaction.
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sebastian Wagner [Wed, 1 Sep 2021 10:54:21 +0000 (12:54 +0200)]
Merge pull request #42534 from liewegas/use-quay-pacific
pacific: cephadm: use quay, not docker
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Ernesto Puerta [Wed, 1 Sep 2021 10:25:24 +0000 (12:25 +0200)]
Merge pull request #42889 from rhcs-dashboard/wip-52378-pacific
pacific: mgr/dashboard: stats=false not working when listing buckets
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Igor Fedotov [Tue, 9 Feb 2021 15:16:09 +0000 (18:16 +0300)]
os/bluestore: fix using incomplete bluefs log when dumping it.
BlueFS superblock might contain incomplete list of physical extents for
bluefs log. Hence we should alway replay ops for ino 1 to get them properly.
Fixes: https://tracker.ceph.com/issues/52311
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
47632fe9baf7f20921c3e6888e29c4478fa5ff2d )
Ernesto Puerta [Wed, 1 Sep 2021 09:29:40 +0000 (11:29 +0200)]
Merge pull request #42974 from s0nea/wip-52308-pacific
pacific: mgr/dashboard: don't notify for suppressed alerts
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Kefu Chai [Sat, 31 Jul 2021 13:15:48 +0000 (21:15 +0800)]
rpm, debian: drop virtualenv from build deps
since we've replaced "virtualenv" with "python3 -m venv", there is no
need to have it in the build deps list.
since, on ubuntu, venv modules is not available by default, we need to
install python3-venv.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3741f57eeed2fac7170900277c1d4bd8737d9f31 )
Conflicts:
debian/control - trivial ordering
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Kefu Chai [Sat, 31 Jul 2021 13:13:50 +0000 (21:13 +0800)]
script/ceph-release-notes: s/virtualenv/python3 -m venv/
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3a2004dcc0922ffd564f1fd4b86dd332affccf00 )
Kefu Chai [Sat, 31 Jul 2021 13:06:23 +0000 (21:06 +0800)]
qa/tasks: s/virtualenv/python3 -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
f0ed7a188facb9bb5098c2452fb4d3d134d2c436 )
Kefu Chai [Sat, 31 Jul 2021 12:59:33 +0000 (20:59 +0800)]
admin/build-doc: s/virtualenv/python3 -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
90c4995c99857e0528922574f1b275ce7fed9d09 )
Conflicts:
admin/build-doc
Cherry-pick notes:
- admin/build-doc always pip-install's requirements (lacking
144bf1a73
from master)
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Kefu Chai [Sat, 31 Jul 2021 12:57:38 +0000 (20:57 +0800)]
doc/man/8/cephfs-shell: s/virtualenv/python3 -m venv/
so user does not have to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
70f05e42a361e45c2f9d6deb41f4e330d1267e2b )
Kefu Chai [Sat, 31 Jul 2021 12:55:55 +0000 (20:55 +0800)]
install-deps.sh: s/virtualenv/python -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3185854c800fde1ed2e498d9fc692228f2db9277 )
Kefu Chai [Sat, 31 Jul 2021 12:53:56 +0000 (20:53 +0800)]
pybind/mgr/dashboard: s/virtualenv/python -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
730f7134f6db1537b2c6cc94f1f4b099579b0c8c )
Kefu Chai [Sat, 31 Jul 2021 12:51:57 +0000 (20:51 +0800)]
test/run-cli-tests: s/virtualenv/python -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
f9514e3386fe1907e240d7079f2251f9cd419cb3 )
Kefu Chai [Sat, 31 Jul 2021 12:47:28 +0000 (20:47 +0800)]
tools/setup-virtualenv: s/virtualenv/python -m venv/
so we don't need to use virtualenv python package for creating a
virtualenv, the "venv" module in Python3 would suffice.
see also https://docs.python.org/3/library/venv.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
494fea50ced7224322f382796f1904742e6a6b69 )
Kefu Chai [Sat, 31 Jul 2021 12:44:57 +0000 (20:44 +0800)]
script/run_tox.sh: drop support of python2
since we don't support python2 anymore, there is not need to mention or
support python2 when performing tests
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3c40db975cbf0dc6af02e64ecaf8048fe088877c )
Ken Dreyer [Thu, 12 Aug 2021 14:48:18 +0000 (10:48 -0400)]
rpm, debian: remove lsb-release
Nothing requires this any more, so we can remove it from the RPM
and Debian packaging.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
cbc0127f3435a1c62344df377e19577c4931b376 )
Conflicts:
debian/control - trivial ordering
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Ken Dreyer [Thu, 12 Aug 2021 14:47:42 +0000 (10:47 -0400)]
make-debs.sh: remove lsb_release
The lsb_release utility brings in a lot of other dependencies. Remove
it from the make-debs script.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
92f73a2bb94d7ff645072b98c2b9c7eea8208782 )
Ken Dreyer [Thu, 12 Aug 2021 14:46:16 +0000 (10:46 -0400)]
test/docker-test: remove lsb_release
The lsb_release utility brings in a lot of other dependencies. Remove
it from the docker-test script.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
24af043ee57419bd28d72ffc85cd1078df9af123 )
Ken Dreyer [Thu, 12 Aug 2021 14:44:48 +0000 (10:44 -0400)]
workunits/rbd: remove lsb_release
The lsb_release utility brings in a lot of other dependencies. Remove
it from the RBD workunit script.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
65f4d6eb3664a4cc6120031679b8368cbc02a4a5 )
Conflicts:
qa/workunits/rbd/qemu-iotests.sh - trivial fix
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Ken Dreyer [Thu, 12 Aug 2021 14:43:46 +0000 (10:43 -0400)]
workunits/rgw: remove lsb_release
The lsb_release utility brings in a lot of other dependencies. Remove
it from the RGW workunit Perl scripts.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
db66f6f35735d2aae2170af3520d222cf748ef9b )
Kefu Chai [Tue, 17 Aug 2021 17:04:39 +0000 (01:04 +0800)]
ceph.spec.in: drop gdbm from build deps
neither gdbm nor libgdbm is used when building ceph, so let's drop it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
9d05d7337460322b78d676bf32a52c4519c7ae1f )
Yuri Weinstein [Tue, 31 Aug 2021 19:34:04 +0000 (12:34 -0700)]
Merge pull request #42898 from smithfarm/wip-52380-pacific
pacific: cmake: exclude "grafonnet-lib" target from "all"
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Yuri Weinstein [Tue, 31 Aug 2021 19:31:07 +0000 (12:31 -0700)]
Merge pull request #42897 from ifed01/wip-ifed-fix-spurious-read-errors-warn-pac
pacific: os/bluestore: respect bluestore_warn_on_spurious_read_errors setting
Reviewed-by: Neha Ojha <nojha@redhat.com>