]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Jason Dillaman [Fri, 18 Dec 2020 15:14:13 +0000 (10:14 -0500)]
librbd: drop explicit masking of implicit feature bits
Now that the create image state machine is handling the masking
of implicit features, all callers to the state machine can skip
the need to perform the masking themselves.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
e1dd69391900a236fbda5e4cee58e9bdc20824fc )
Conflicts:
src/librbd/api/Migration.cc
- in octopus, this file does not mention RBD_FEATURES_IMPLICIT_ENABLE
Jason Dillaman [Fri, 18 Dec 2020 14:55:30 +0000 (09:55 -0500)]
librbd/image: mask out all implicit features when creating an image
This will ensure that all paths to the create image state machine
properly handle this condition. Previously, it was up to the callers
of the state machine to clear the implicit feature bits.
Fixes: https://tracker.ceph.com/issues/48647
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f52f78caca6f9743e75c8289771375f5f582300a )
Jason Dillaman [Fri, 18 Dec 2020 14:48:58 +0000 (09:48 -0500)]
librbd/image: use internal feature flag mask when creating images
When validating the provided features for an image, utilize the
RBD_FEATURES_INTERNAL flag instead of just RBD_FEATURE_OPERATION.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7dd77814402f0710f9283084b45960a054078897 )
Jason Dillaman [Fri, 18 Dec 2020 14:42:51 +0000 (09:42 -0500)]
librbd/api: do not explicitly add the MIGRATION feature bit
This feature bit is automatically added to the source and destination
images via the cls method on the OSD.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5380615037e1f78369e58eac9847b465e9e8bf19 )
Conflicts:
src/librbd/api/Migration.cc
- no Migration<I>::prepare_import template in octopus
Nathan Cutler [Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)]
Merge pull request #38761 from p-se/wip-48607-octopus
octopus: mgr/dashboard: enable different URL for users of browser to Grafana
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:17:41 +0000 (09:17 -0800)]
Merge pull request #38337 from k0ste/wip-48399-octopus
octopus: mgr/balancer: fix available pgs sent to calc_pg_upmaps
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:17:02 +0000 (09:17 -0800)]
Merge pull request #38943 from smithfarm/wip-48889-octopus
octopus: do_cmake.sh: use python-3.9 with fedora version 33
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:16:28 +0000 (09:16 -0800)]
Merge pull request #38888 from votdev/wip-46963-octopus
octopus: mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:14:47 +0000 (09:14 -0800)]
Merge pull request #38847 from smithfarm/wip-48828-octopus
octopus: cmake: add empty RPATH to ceph-diff-sorted
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:13:46 +0000 (09:13 -0800)]
Merge pull request #38810 from rhcs-dashboard/wip-48794-octopus
octopus: mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:10:21 +0000 (09:10 -0800)]
Merge pull request #38801 from callithea/wip-48714-octopus
octopus: mgr/ActivePyModules.cc: always release GIL before attempting to acquire a lock
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:07:14 +0000 (09:07 -0800)]
Merge pull request #38755 from smithfarm/wip-48737-octopus
octopus: rpm: require smartmontools on SUSE
Reviewed-by: Volker Theile <vtheile@suse.com>
Yuri Weinstein [Fri, 22 Jan 2021 17:06:19 +0000 (09:06 -0800)]
Merge pull request #38595 from callithea/wip-48557-octopus
octopus: mgr/restful: fix TypeError occurring in _gather_osds()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ernesto Puerta [Fri, 22 Jan 2021 10:12:36 +0000 (11:12 +0100)]
Merge pull request #38808 from badone/wip-48528-octopus
octopus: install-deps.sh: Make powertools repo case insensitive
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ernesto Puerta [Thu, 21 Jan 2021 17:14:21 +0000 (18:14 +0100)]
Merge pull request #38973 from rhcs-dashboard/wip-48928-octopus
octopus: mgr/dashboard: add `--ssl` to `ng serve`
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ernesto Puerta [Thu, 21 Jan 2021 17:10:33 +0000 (18:10 +0100)]
Merge pull request #38867 from callithea/wip-48809-octopus
octopus: mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ernesto Puerta [Thu, 21 Jan 2021 16:54:52 +0000 (17:54 +0100)]
Merge pull request #38593 from callithea/wip-48578-octopus
octopus: mgr/prometheus: Fix 'pool filling up' with >50% usage
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <pseidensal@suse.com>
Ernesto Puerta [Thu, 21 Jan 2021 16:52:52 +0000 (17:52 +0100)]
Merge pull request #38496 from bk201/wip-48460-octopus
octopus: mgr/dashboard: allow selecting all daemons for Orchestrator NFS clusters
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Thu, 21 Jan 2021 16:52:31 +0000 (08:52 -0800)]
Merge pull request #38347 from smithfarm/wip-48378-octopus
octopus: mon: validate crush-failure-domain
Reviewed-by: Neha Ojha <nojha@redhat.com>
Ernesto Puerta [Thu, 21 Jan 2021 16:51:19 +0000 (17:51 +0100)]
Merge pull request #37930 from rhcs-dashboard/wip-48079-octopus
octopus: mgr/dashboard: Prevent table items from getting selected while expanding
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Wed, 20 Jan 2021 16:24:27 +0000 (08:24 -0800)]
Merge pull request #38951 from smithfarm/wip-48888-octopus
octopus: cmake: detect and use sigdescr_np() if available
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Wed, 20 Jan 2021 16:23:25 +0000 (08:23 -0800)]
Merge pull request #38421 from smithfarm/wip-48429-octopus
octopus: rgw: avoid expiration early triggering caused by overflow
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Wed, 20 Jan 2021 16:22:25 +0000 (08:22 -0800)]
Merge pull request #38420 from smithfarm/wip-48427-octopus
octopus: rgw: S3 Put Bucket Policy should return 204 on success
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 20 Jan 2021 16:21:39 +0000 (08:21 -0800)]
Merge pull request #38339 from smithfarm/wip-48345-octopus
octopus: rgw: fix invalid payload issue when serving s3website error page
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Tatjana Dehler [Tue, 12 Jan 2021 09:28:35 +0000 (10:28 +0100)]
mgr/dashboard: add `--ssl` to `ng serve`
Add the `--ssl` option to the `ng serve` command in order to
reflect the changes to the cookies (https://tracker.ceph.com/issues/44591)
and be able to log into the dashboard by using the development server.
Fixes: https://tracker.ceph.com/issues/48847
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit
3971cdb0a64c077c9d136135b745778d875e0dae )
Conflicts:
src/pybind/mgr/dashboard/frontend/package.json
- Adopted master branch changes.
David Disseldorp [Tue, 1 Sep 2020 11:49:21 +0000 (13:49 +0200)]
cmake: detect and use sigdescr_np() if available
sys_siglist is deprecated with glibc 2.32. A new thread-safe and
async-signal safe sigdescr_np() function is provided, so use it if
available.
Fixes: https://tracker.ceph.com/issues/47187
Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit
b9b6faf66ae67648626470cb4fc3f0850ac4d842 )
Sunny Kumar [Fri, 23 Oct 2020 14:38:39 +0000 (15:38 +0100)]
do_cmake.sh: use python-3.9 with fedora version 33
Fedora-33 (rawhide) now has python-3.9.
Build breaks on Fedoa-33 with Traceback:
CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
Could NOT find Python3: Found unsuitable version "3.9.0", but required is
exact version "3.8" (found /usr/bin/python3, found components: Interpreter
Development)
Fixes: https://tracker.ceph.com/issues/47971
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
(cherry picked from commit
2cc747cf4a55fb38a524ec12f6b6e5888fadf07a )
Yuri Weinstein [Fri, 15 Jan 2021 18:54:42 +0000 (10:54 -0800)]
Merge pull request #38626 from batrick/i48635
octopus: qa: tox failures
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 15 Jan 2021 18:53:59 +0000 (10:53 -0800)]
Merge pull request #36803 from ShyamsundarR/wip-46820-octopus
octopus: mgr/volumes: Implement subvolume version v2
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Fri, 15 Jan 2021 18:53:32 +0000 (10:53 -0800)]
Merge pull request #38688 from batrick/
4ca8aaafa32bb7397eec80a8eb366d2dd781a72f -octopus
octopus: qa: unmount volumes before removal
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Volker Theile [Mon, 20 Jul 2020 12:45:36 +0000 (14:45 +0200)]
mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec
Fixes: https://tracker.ceph.com/issues/44831
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
dc5e5a5980456cffa468f88bc0d51cbb3c32dd06 )
Conflicts:
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
* Use i18n instead of $localize
* Remove CdForm class
* Adapt code to ngx-bootstrap. Typeahead works a little bit different than in Pacific/ng-bootstrap.
* Adapt to older TypeScript version
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
* Adapt code to ngx-bootstrap.
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
* Use i18n instead of $localize
* Replace ModalService by BsModalService
- src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts
* Use i18n instead of $localize
- src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
* Relocate changes to src/pybind/mgr/dashboard/frontend/src/styles.scss
Ernesto Puerta [Wed, 13 Jan 2021 18:39:26 +0000 (19:39 +0100)]
Merge pull request #38594 from callithea/wip-48587-octopus
octopus: mgr/dashboard: RGW User Form is validating disabled fields
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Patrick Seidensal [Tue, 3 Nov 2020 12:47:23 +0000 (13:47 +0100)]
mgr/dashboard: enable different URL for users of browser to Grafana
Fixes: https://tracker.ceph.com/issues/47386
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
676f82923d875cfe9528a401963c09f29a6de7f4 )
Conflicts:
doc/mgr/dashboard.rst
src/pybind/mgr/dashboard/controllers/grafana.py
Resolved some trivial conflicts and replaced the heading of the newly
added section in the documentation to another level, as the
documentation between master and octopus differs quite much.
Kiefer Chang [Sun, 27 Dec 2020 01:04:06 +0000 (09:04 +0800)]
mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart
Use the percentage of READ ops instead of its value.
Fixes: https://tracker.ceph.com/issues/48717
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
9ef1a729b5100b0ee32c0df367ef4b33ba762d4a )
Nizamudeen A [Thu, 10 Dec 2020 08:05:38 +0000 (13:35 +0530)]
mgr/dashboard: Updating the docs regarding the user lockout
Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
3f50b05e2530dfcdc44e5f13abac9fbdf20400c1 )
Nizamudeen A [Thu, 26 Nov 2020 10:25:00 +0000 (15:55 +0530)]
mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts
Implemented a user lockout mechanism if the user enters 10 invalid attempts. The attempt count gets resetted to 0 once the user succesfully logins before getting disabled. Once the user gets disabled administrator has to manually enable the user which will also resets the number of attempts.
Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
41941f0d28f51cb391ff7bacae84a5d511bafb36 )
Yuri Weinstein [Mon, 11 Jan 2021 20:05:39 +0000 (12:05 -0800)]
Merge pull request #38759 from tchaikov/octopus-38263
octopus: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 20:00:24 +0000 (12:00 -0800)]
Merge pull request #38770 from votdev/wip-48629-octopus
octopus: mgr/dashboard: The /rgw/status endpoint does not check for running service
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 19:57:27 +0000 (11:57 -0800)]
Merge pull request #38592 from callithea/wip-48574-octopus
octopus: mgr/crash: Serialize command handling
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 19:56:35 +0000 (11:56 -0800)]
Merge pull request #38555 from kamoltat/wip-ksriivad-octopus-backport
octopus: qa/tasks/mgr/test_progress: update test suite to check for specific progress events
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 19:56:03 +0000 (11:56 -0800)]
Merge pull request #38455 from trociny/wip-48470-octopus
octopus: librbd: fix regression in object map diff request
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 19:55:22 +0000 (11:55 -0800)]
Merge pull request #38429 from smithfarm/wip-48194-octopus
octopus: bluestore: Make mempool assignment same after bufferlist rebuild
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 11 Jan 2021 19:54:39 +0000 (11:54 -0800)]
Merge pull request #38428 from smithfarm/wip-48094-octopus
octopus: os/bluestore: fix segfault on out-of-bound offset provided to claim_free_to_right() call
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Nathan Cutler [Wed, 15 Jul 2020 16:21:37 +0000 (18:21 +0200)]
cmake: add empty RPATH to ceph-diff-sorted
This fixes a transient FTBFS on openSUSE:
[ 5365s] -- Installing: /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s] CMake Error at src/tools/cmake_install.cmake:230 (file):
[ 5365s] file RPATH_CHANGE could not write new RPATH:
[ 5365s]
[ 5365s] /usr/lib64/ceph
[ 5365s]
[ 5365s] to the file:
[ 5365s]
[ 5365s] /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s]
[ 5365s] No valid ELF RPATH or RUNPATH entry exists in the file;
Fixes: https://tracker.ceph.com/issues/46553
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
cb20ce39315dc218e1b6338aae6a676a18453124 )
Yuri Weinstein [Mon, 11 Jan 2021 17:40:20 +0000 (09:40 -0800)]
Merge pull request #38086 from orztt/wip-rgw-versioning-octopus
octopus: rgw: cls/rgw/cls_rgw.cc: fix multiple lastest version problem
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sebastian Wagner [Mon, 11 Jan 2021 17:39:32 +0000 (18:39 +0100)]
Merge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696-37576-38211-38278-38304-38285-38317-38130-38064-3803
octopus: cephadm: batch backport January (1)
Reviewed-by: Michael Fritch <mfritch@suse.com>
Ernesto Puerta [Fri, 8 Jan 2021 21:05:20 +0000 (22:05 +0100)]
Merge pull request #38798 from votdev/wip-48652-octopus
octopus: mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:52:06 +0000 (21:52 +0100)]
Merge pull request #38797 from rhcs-dashboard/wip-48626-octopus
octopus: mgr/dashboard: Fixing dashboard logs e2e test
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:47:00 +0000 (21:47 +0100)]
Merge pull request #38607 from rhcs-dashboard/wip-48605-octopus
octopus: mgr/dashboard: Fix CRUSH map viewer VirtualScroll
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:46:03 +0000 (21:46 +0100)]
Merge pull request #38583 from votdev/wip-48592-octopus
octopus: mgr/dashboard: Drop invalid RGW client instances, improve logging
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:44:21 +0000 (21:44 +0100)]
Merge pull request #38598 from callithea/wip-48494-octopus
octopus: mgr/dashboard: Fix for misleading "Orchestrator is not available" error
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:42:17 +0000 (21:42 +0100)]
Merge pull request #38597 from callithea/wip-48539-octopus
octopus: mgr/dashboard: adjust refresh intervals of Services and Daemons
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:41:23 +0000 (21:41 +0100)]
Merge pull request #38503 from callithea/wip-48511-octopus
octopus: mgr/dashboard: remove pyOpenSSL version pinning
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ernesto Puerta [Fri, 8 Jan 2021 20:39:53 +0000 (21:39 +0100)]
Merge pull request #37969 from bk201/wip-48132-octopus
octopus: mgr/dashboard: disable cluster selection in NFS export editing form
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Brad Hubbard [Mon, 9 Nov 2020 23:43:45 +0000 (09:43 +1000)]
install-deps.sh: Make powertools repo case insensitive
It looks like CentOS 8.3 will see all repos converted to lower case and
this has been pre-empted in the CentOS stream repos so we need to be
able to enable a repo called 'PowerTools' or 'powertools'
See https://git.centos.org/rpms/centos-repos/c/
b759b17
Fixes: https://tracker.ceph.com/issues/48174
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
7a68845579c701f43c9526c810e586680cf76fe0 )
Conflicts:
install-deps.sh - minor formatiing difference
Cory Snyder [Mon, 21 Dec 2020 14:33:22 +0000 (09:33 -0500)]
mgr/ActivePyModules.cc: always release GIL before attempting to acquire a lock
A thread that holds the GIL while attempting to acquire a mutex will cause a deadlock
if another thread owns the mutex and is waiting on the GIL. The GIL must not be treated
like an ordinary mutex since it may be preempted at any time or released when doing
blocking I/O. Such deadlocks are severe since they starve all threads from access to the
GIL and therefore prevent any Python code from running until the mgr process is restarted.
Fixes: https://tracker.ceph.com/issues/39264
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit
0601b31a53a455f0b67c981460d198cb3a97f3de )
Daniel-Pivonka [Fri, 18 Dec 2020 15:51:31 +0000 (10:51 -0500)]
mgr/cephadm: fix bug in orch apply osd --dry-run where empty table printed
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit
459fa5777d400d5aa9eb7d4fe520369d47c775b9 )
Dan Mick [Thu, 17 Dec 2020 02:06:31 +0000 (02:06 +0000)]
qa/distros: configure podman to pull from docker-mirror
This also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present
Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit
f30c55a242f381f0d191b55c76d3fc5d027e602e )
Paul Cuzner [Mon, 14 Dec 2020 20:12:36 +0000 (09:12 +1300)]
cephadm: update permissions on newly created dirs
Use 755 instead of 700 on new directories created during
bootstrap
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
9ef60e9111691c6511baa93ca1d080250588d6c0 )
Paul Cuzner [Sun, 13 Dec 2020 22:15:38 +0000 (11:15 +1300)]
cephadm: create default output dir during bootstrap
If the output dir doesn't exist the old behaviour was to
abort bootstrap. Since we're running with UID=0, this
patch will create the missing dirs for the user to keep the
bootstrap process going
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
27b5eada81189ad01b31ff34bf0e362353cfbd92 )
Paul Cuzner [Fri, 18 Dec 2020 01:45:07 +0000 (14:45 +1300)]
mgr/cephadm: correct connection failure message
When add host fails with py3 missing, wasn't used in
the output returned to the admin - instead they saw
the generic failure message which "points them in the
wrong direction". This patch shows the py3 missing
message
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
9e27995bb0a7de0072742e5f18926343acf80e05 )
Patrick Donnelly [Mon, 14 Dec 2020 17:21:59 +0000 (09:21 -0800)]
pybind/mgr/cephadm: limit rgw osd caps
Using tagged pools ensures RGW only can access pools used for RGW.
Fixes: https://tracker.ceph.com/issues/48594
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
373cc847cf0f8b4ec7aefbfe64c01c3f18a4e021 )
Sebastian Wagner [Tue, 8 Sep 2020 12:44:43 +0000 (14:44 +0200)]
doc/cephadm: Add remove host to operations
Co-authored-by: Alexandra Settle <asettle@suse.com>
Co-authored-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
453000af19b25082aef1b473bd9284311ac98204 )
Adam King [Thu, 19 Nov 2020 23:49:25 +0000 (18:49 -0500)]
mgr/cephadm: improve iscsi dashboard config
updating iscsi config dashboard to match what was done with ceph ansible.
This includes:
- set iscsi api ssl verification to false when api_secure is set
- using https rather than http in gateway url when spi_secure is set
- default api_user and api_password to "admin"
- convert hostname to ip address when creating gateway url
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
ba6d22b492400588de22b93189eee8818f647807 )
Sebastian Wagner [Thu, 10 Dec 2020 14:53:00 +0000 (15:53 +0100)]
mgr/cephadm: disallow_untyped_defs=True
simplifies mypy.ini
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a823ee6b1f5a8eb2030c1edf0a7014f86eb719ab )
Conflicts:
src/mypy.ini
Paul Cuzner [Fri, 11 Dec 2020 04:25:08 +0000 (17:25 +1300)]
orchestrator: drop redundant try/except
YAML is validated up front, so the additional try/except
clause is not needed.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
a8690f1b50f0952155e327ffb17952d7cecfbe98 )
Paul Cuzner [Thu, 3 Dec 2020 03:00:27 +0000 (16:00 +1300)]
orchestrator: validate osd yaml
Validate the yaml document ahead of usage, to catch
any basic errors in the yaml doc. If errors are found the
exception is shown in the mgr log, and the user gets a
more friendly error message, without the traceback.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
0f236c7911bdcc4b0266833e1b7da01a3c7e4eac )
Sebastian Wagner [Mon, 7 Dec 2020 11:05:40 +0000 (12:05 +0100)]
cephadm: command_unit: call systemctl with verbose=True
Otherwise `cephadm unit ... status` won't print anything
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
35fcd04fc65a7f7dc491fd0cb2619a9572f0b4f5 )
Sebastian Wagner [Fri, 20 Nov 2020 12:04:50 +0000 (13:04 +0100)]
mgr/cephadm: make type annotations for module.py mandatory
Fixing bogus json representation for registry-login
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
7bbc77cd48bf48da2c120220ad31678f650c05b1 )
Conflicts:
src/mypy.ini
src/pybind/mgr/cephadm/module.py
Paul Cuzner [Fri, 4 Dec 2020 00:58:06 +0000 (13:58 +1300)]
doc/dev/cephadm: Add link to the index
Adds a link to the index for the compliance-check doc
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
f2791c0e26a81b8d0f1a7d070f67dd79cd6ed25c )
Conflicts:
doc/dev/cephadm/index.rst
Paul Cuzner [Fri, 4 Dec 2020 00:48:46 +0000 (13:48 +1300)]
doc/dev/cephadm: Updates following feedback
Minor grammatical and formatting changes
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
1facc5e9a725d33e57370c65d3086e952f13b05c )
Paul Cuzner [Sun, 11 Oct 2020 22:59:32 +0000 (11:59 +1300)]
doc: moved design doc under doc/dev
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
7168cbf0521aa29701f0133b4e38b858888e46b4 )
Paul Cuzner [Fri, 2 Oct 2020 00:24:55 +0000 (13:24 +1300)]
docs: high level design for a compliance check feature
Document defining the high level goals of a compliance check
feature that could be added to mgr/cephadm.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
2407a7bf996fced3b053727db5c1dc17ffbc9624 )
Sebastian Wagner [Fri, 20 Nov 2020 11:06:59 +0000 (12:06 +0100)]
mgr/cephadm: make annotations for schedule.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ba3189b13882ff919ad39a2e377fa6b29c04c79a )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 11:04:53 +0000 (12:04 +0100)]
mgr/cephadm: make annotations for inventory.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
77791a21db6597bc17a33411e02b12c03bd857a8 )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 10:56:26 +0000 (11:56 +0100)]
mgr/cephadm: make annotations for serve.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
95bf93a9e4f214cfd3bba2b4358174d9ddc8f0ea )
Conflicts:
src/mypy.ini
Sebastian Wagner [Fri, 20 Nov 2020 10:51:07 +0000 (11:51 +0100)]
mgr/cephadm: make annotations for upgrade.py mandatory
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
3f9bf2b3f35566ec5537fd36a5163a17ab7778c6 )
Varsha Rao [Mon, 30 Nov 2020 12:19:50 +0000 (17:49 +0530)]
mgr/orchestrator: Remove 'CONTAINER ID' col from orch ps if unknown
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9c241e946a9808b23e5f923ab9283666355883fd )
Michael Fritch [Wed, 4 Nov 2020 18:48:09 +0000 (11:48 -0700)]
mgr/cephadm: improve logging during JSONDecodeError
improve logging around JSONDecodeErrors that can occur during a
cephadm image pull, load of the extra_ceph_conf, and parsing the cluster
health status
Fixes: https://tracker.ceph.com/issues/48120
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
d4c9d5e680cb17379940a1ceaa038c6224b9b039 )
Michael Fritch [Wed, 4 Nov 2020 18:28:52 +0000 (11:28 -0700)]
mgr/cephadm: handle JSONDecodeError in OSD service
avoid exceptions when attempting an osd deployment etc.
Fixes: https://tracker.ceph.com/issues/48119
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
46692e26c12ed169a9f3569857a13304d09b41c1 )
Michael Fritch [Wed, 4 Nov 2020 18:12:34 +0000 (11:12 -0700)]
mgr/cephadm: handle JSONDecodeError in the serve loop
avoid exceptions when attempting to parse invalid JSON output as this
will later cause the cephadm module to fail with a MGR_MODULE_ERROR err
Fixes: https://tracker.ceph.com/issues/48118
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
6d759fb5deac0c52b3c738a2e695738228749420 )
Michael Fritch [Wed, 18 Nov 2020 02:36:29 +0000 (19:36 -0700)]
cephadm: reference the last local image by digest
use the image digest rather than repo/tag combo when inferring the last
used local ceph image
Fixes: https://tracker.ceph.com/issues/48205
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
4cf49997c3af7428d2767e72f62f6b875e55c51d )
Michael Fritch [Fri, 13 Nov 2020 17:06:48 +0000 (10:06 -0700)]
mgr/cephadm: verify the `host` key exists during refresh
various parts of the host cache might not have a key for the desired
host due to ssh communication issues during host add/remove
Fixes: https://tracker.ceph.com/issues/48223
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
218d00c8ed8e3d1df2f08ce5d89ec9ddd4f07630 )
Sebastian Wagner [Tue, 17 Nov 2020 12:08:44 +0000 (13:08 +0100)]
mgr/cephadm: upgrade: fail gracefully, if daemon redeploy fails
Current behaviour kills the `serve()` loop of mgr/cephadm
Fixes: https://tracker.ceph.com/issues/47684
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
1ceb6dfb15781569ece627fc53bbd1eb294bf2b7 )
Sebastian Wagner [Fri, 27 Nov 2020 10:58:41 +0000 (11:58 +0100)]
mgr/cephadm: OSD service: reduce log noise
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f0ee6284a7ab0ea85ae486d236e072e13b658a78 )
Juan Miguel Olmo Martínez [Wed, 25 Nov 2020 14:40:57 +0000 (15:40 +0100)]
mgr/cephadm: Get host facts data in host cache
Include cephadm gather-facts information in host cache
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
ab43d6d0c6e696fb365694102e2a26d7ae8cba68 )
Paul Cuzner [Wed, 9 Dec 2020 20:37:13 +0000 (09:37 +1300)]
doc/dev/cephadm: update index links
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
ba485f2472fa0549a8cad8b9be5aad6535c1af33 )
Paul Cuzner [Thu, 3 Dec 2020 03:23:26 +0000 (16:23 +1300)]
doc: Update drivegroup spec examples
The examples currently miss the document separator, so a
copy/paste will result in only a single doc being parsed (the
last one!)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
92fa97347c41955692031858103ea0728a596152 )
Sebastian Wagner [Thu, 26 Nov 2020 10:03:00 +0000 (11:03 +0100)]
mgr/cephadm: add docstring describing the HostCache
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
0cc58de5c79fd65c490276449731400bf037abec )
Volker Theile [Wed, 25 Nov 2020 09:57:45 +0000 (10:57 +0100)]
mgr: Fix various typos
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
d3e09b6e04c6a9990807ac1b6ff340a8004fa8f9 )
Ricardo Marques [Fri, 20 Nov 2020 11:52:02 +0000 (11:52 +0000)]
mgr/orchestrator: Sort 'ceph orch device ls' by host
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
c6e6eb5ef53278b9d0cc0198bc32a441ab8f9a81 )
Patrick Seidensal [Fri, 25 Sep 2020 13:39:32 +0000 (15:39 +0200)]
doc/cephadm: document setting custom monitoring templates
Fixes: https://tracker.ceph.com/issues/47651
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
7f5b1d8bfed931bd035ebf40218aa1ba249089e9 )
Patrick Seidensal [Fri, 16 Oct 2020 12:19:53 +0000 (14:19 +0200)]
doc/cepham: instructions for custom Grafana TLS certs
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
344c0a69b34013a92b4224325af1e4e71a9c8564 )
Ken Dreyer [Wed, 18 Nov 2020 16:18:56 +0000 (09:18 -0700)]
rpm: cephadm package is noarch
The cephadm package contains an architecture-independent Python script,
empty directories, and an empty authorized_keys file. There are no
architecture-dependent files here, so we can use a single noarch RPM
across all host architectures.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
d73134660e9a0c5dbda996fc91e2939c4c0bf687 )
Paul Cuzner [Fri, 23 Oct 2020 05:31:50 +0000 (18:31 +1300)]
doc/dev/cephadm: Updates following PR feedback
Minor update adding an idea for future development as
per suggestion from @anthonyeleven
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
df1afd6b127d215cbd6dbd254ff5e8c5090aca78 )
Paul Cuzner [Fri, 23 Oct 2020 02:35:06 +0000 (15:35 +1300)]
doc/dev/cephadm: add link for feature designs
Add a link from the main cephadm page to the index
within /dev/dev/cephadm
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
10f382c359226070a0eceafcc9f74be26cb943b9 )
Paul Cuzner [Fri, 9 Oct 2020 00:20:28 +0000 (13:20 +1300)]
doc/dev/cephadm: Doc defining the design for host maintenance
Initial PR to define/agree the scope and goals of providing
a host maintenance feature.
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit
8f3ed063a7c7a58d430e0c9a2ac43a7214fe86e4 )
Volker Theile [Mon, 7 Dec 2020 12:56:56 +0000 (13:56 +0100)]
mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled
Set a health check warning if debug mode is enabled.
Fixes: https://tracker.ceph.com/issues/48475
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
a1aa760acf6c6457f7edc0274a2196cc2f3673c0 )
Nizamudeen A [Wed, 16 Dec 2020 08:23:14 +0000 (13:53 +0530)]
mgr/dashboard: Fixing dashboard logs e2e test
Yesterday there were some changes went in which disables the logging of config set and config-key set to to be logged in mgr audit logs. Dashboard has an e2e test which checks for this config set and broke the current e2e jenkins job. This commit removes that certain test to fix the jenkins job.
Fixes: https://tracker.ceph.com/issues/48623
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
0b2b172930845dbbec2e458addb5a04b609c6c24 )
Yuri Weinstein [Wed, 6 Jan 2021 16:30:01 +0000 (08:30 -0800)]
Merge pull request #38620 from smithfarm/wip-48615-octopus
octopus: Do not add sensitive information in Ceph log files
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>