]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Casey Bodley [Thu, 11 Mar 2021 20:12:08 +0000 (15:12 -0500)]
rgw: rgw::sal::RGWBucket initializes creation_time
rgw::sal::RGWUser::list_buckets() uses the RGWBucketEnt constructor.
RGWBucketEnt::creation_time is initialized, but get_creation_time()
returns the uninitialized info.creation_time
Fixes: https://tracker.ceph.com/issues/49741
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Mykola Golub [Thu, 11 Mar 2021 13:59:33 +0000 (15:59 +0200)]
Merge pull request #40006 from dillaman/wip-qa-rbd-rwl-ssd
qa/suites/rbd: added SSD PWL cache mode to tests
Reviewed-by: Mykola Golub <mgolub@suse.com>
Sebastian Wagner [Thu, 11 Mar 2021 11:19:37 +0000 (12:19 +0100)]
Merge pull request #39875 from zdover23/wip-doc-cephadm-adoption-overview-and-limitations-rewrite-2021-Mar-06
doc/cephadm: rewrite part of adoption.rst
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Thu, 11 Mar 2021 11:06:20 +0000 (12:06 +0100)]
Merge pull request #40008 from mgfritch/cephadm-nfsv3-deprecate
doc/cephadm: add note about deprecation of NFSv3
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Thu, 11 Mar 2021 10:44:17 +0000 (11:44 +0100)]
Merge pull request #39932 from mgfritch/custom-monitoring-j2
doc/cephadm: update section on applying custom config (j2)
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Thu, 11 Mar 2021 08:07:22 +0000 (16:07 +0800)]
Merge pull request #40021 from xxhdx1985126/wip-io-sequencer-bug-fix
crimson/osd: retrive client_requests' prev_op_id right before "start_op"
Reviewed-by: Kefu Chai <kchai@redhat.com>
Xuehan Xu [Wed, 10 Mar 2021 07:31:23 +0000 (15:31 +0800)]
crimson/osd: retrive client_requests' prev_op_id right before "start_op"
ClientRequest::prev_op_id should record its immediate predecessor in the
pipeline. If we capture sequencer's last_issued when creating the client
request, it may not represent that predecessor
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
Kefu Chai [Thu, 11 Mar 2021 04:10:10 +0000 (12:10 +0800)]
Merge pull request #39859 from jhonxue/master
osd: do not dump an osd multiple times
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 11 Mar 2021 03:20:31 +0000 (11:20 +0800)]
Merge pull request #39989 from athanatos/sjust/wip-fix-seastore-gc
crimson: btree_lba_manager and segment_cleaner fixes
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Tue, 9 Mar 2021 04:42:54 +0000 (04:42 +0000)]
crimson/os/seastore/.../lba_btree_node_impl: fix lookup
lower_bound() here is wrong, use bound instead.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 9 Mar 2021 02:09:15 +0000 (18:09 -0800)]
crimson/os/seastore: add releasing state for segments pending close
This should fix a bug by which we might start scanning a segment a second
time as it is released and possibly even reused resulting in nonsensical
behavior.
Signed-off-by: Samuel Just <sjust@redhat.com>
Sage Weil [Thu, 11 Mar 2021 00:24:30 +0000 (19:24 -0500)]
Merge PR #39677 into master
* refs/pull/39677/head:
mgr/cephadm: add iscsi and nfs to upgrade
mgr/cephadm: update caps if necessary when getting keyring
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Adam King [Wed, 24 Feb 2021 21:44:57 +0000 (16:44 -0500)]
mgr/cephadm: add iscsi and nfs to upgrade
Fixes: https://tracker.ceph.com/issues/49462
Signed-off-by: Adam King <adking@redhat.com>
Adam King [Wed, 24 Feb 2021 21:13:01 +0000 (16:13 -0500)]
mgr/cephadm: update caps if necessary when getting keyring
If the caps change from the old version to the new one it causes
issues in the upgrade. This allows the caps to be updated. Currently
only seeing this with iscsi but changing it for other as a precaution
Signed-off-by: Adam King <adking@redhat.com>
Michael Fritch [Wed, 10 Mar 2021 17:28:11 +0000 (10:28 -0700)]
doc/cephadm: add note about deprecation of NFSv3
Signed-off-by: Michael Fritch <mfritch@suse.com>
Sebastian Wagner [Wed, 10 Mar 2021 17:34:03 +0000 (18:34 +0100)]
Merge pull request #39640 from sebastian-philipp/cephadm-cephfs-mirror
cephadm: cephfs-mirror
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Wed, 10 Mar 2021 16:30:47 +0000 (11:30 -0500)]
qa/suites/rbd: added SSD PWL cache mode to tests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 10 Mar 2021 15:35:43 +0000 (10:35 -0500)]
Merge pull request #39800 from MahatiC/wip-ssd-fixes
librbd/cache/pwl: Fix IO completion
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Patrick Donnelly [Wed, 10 Mar 2021 15:01:27 +0000 (07:01 -0800)]
Merge PR #38913 into master
* refs/pull/38913/head:
qa/tasks/cephfs/nfs: Add tests for updating fs exports
mgr/volumes/nfs: Handle rook restart error
doc/cephfs/nfs: Add about update export interface
mgr/volumes/nfs: Add command to update cephfs exports
pybind/volumes/nfs: set mds caps according to user specified access type
mgr/volumes/module: Remove unused json module
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Wed, 10 Mar 2021 14:59:46 +0000 (09:59 -0500)]
Merge PR #39953 into master
* refs/pull/39953/head:
debian/ceph-common.postinst: do not chown cephadm log dirs
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Fri, 26 Feb 2021 12:34:52 +0000 (13:34 +0100)]
mgr/cephadm: add cephfs-mirror to CEPH_UPGRADE_ORDER
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 15:06:56 +0000 (16:06 +0100)]
cephadm: Add cephfs-mirror
Fixes: https://tracker.ceph.com/issues/47261
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 15:05:47 +0000 (16:05 +0100)]
qa/cephadm: Add cephfs-mirror test
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 15:05:22 +0000 (16:05 +0100)]
qa/tasks: some type annotations
Mostly for making my IDE aware of things
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 14:48:29 +0000 (15:48 +0100)]
mgr/orch: Add cephfs-mirror to enum
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 13:45:02 +0000 (14:45 +0100)]
mgr/cephadm: Add CephfsMirrorService
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 14:42:01 +0000 (15:42 +0100)]
mgr/orch: replace def add_{type}(...) with generic add_daemon()
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 13:42:38 +0000 (14:42 +0100)]
mgr/cephadm: drop `create_func` arg from _add_daemon
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Tue, 23 Feb 2021 12:50:12 +0000 (13:50 +0100)]
mgr/cephadm: move CephadmExporter to new module
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sage Weil [Wed, 10 Mar 2021 13:38:22 +0000 (08:38 -0500)]
Merge PR #39860 into master
* refs/pull/39860/head:
vstart,init-ceph: include build bin/ in $PATH
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sebastian Wagner [Wed, 10 Mar 2021 13:04:41 +0000 (14:04 +0100)]
Merge pull request #39619 from sebastian-philipp/rm_injected_argv
cephadm: remove injected_args
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sebastian Wagner [Wed, 10 Mar 2021 12:58:37 +0000 (13:58 +0100)]
Merge pull request #39877 from liewegas/cephadm-rgw-simplification
mgr/cephadm: simplify handling for rgw
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Or Friedmann <ofriedma@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:54:24 +0000 (20:54 +0800)]
Merge pull request #39991 from tchaikov/wip-ninja-again
ceph.spec: include ninja as BuildRequires
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:46:20 +0000 (20:46 +0800)]
Merge pull request #39878 from batrick/centos-8.3
qa/distros: add centos 8.3
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Ernesto Puerta [Wed, 10 Mar 2021 12:45:41 +0000 (13:45 +0100)]
Merge pull request #39793 from rhcs-dashboard/replace-inventory-devices-title
mgr/dashboard: cluster > hosts: replace inventory->devices table title
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:43:51 +0000 (20:43 +0800)]
Merge pull request #39882 from tchaikov/wip-osd-watch
osd/Watch: use vector<> instead of list<>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:38:43 +0000 (20:38 +0800)]
Merge pull request #39897 from Rethan/clean-msgr-type
msg/Messenger: remove unused variable r
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:37:35 +0000 (20:37 +0800)]
Merge pull request #39937 from tchaikov/wip-49661
mgr: add mon metada using type of "mon"
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sebastian Wagner [Wed, 10 Mar 2021 12:37:10 +0000 (13:37 +0100)]
Merge pull request #39541 from pcuzner/config-checker
mgr/cephadm: Provide an integrated configuration validation feature
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 12:34:45 +0000 (20:34 +0800)]
Merge pull request #39905 from tchaikov/wip-lock-deps
common/lockdep: increase MAX_LOCKS to 128k
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Ernesto Puerta [Wed, 10 Mar 2021 12:11:42 +0000 (13:11 +0100)]
Merge pull request #39503 from rhcs-dashboard/fix-ssl-certificate-code
mgr/dashboard: fix dashboard instance ssl certificate functionality
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sebastian Wagner [Wed, 10 Mar 2021 11:14:37 +0000 (12:14 +0100)]
Merge pull request #39599 from pcuzner/cephadm-with-lsm
mgr/cephadm:Enable cephadm device scan to use libstoragemgmt
Reviewed-by: Dan Mick <dmick@redhat.com>
Sebastian Wagner [Wed, 10 Mar 2021 11:09:47 +0000 (12:09 +0100)]
Merge pull request #39924 from Daniel-Pivonka/osdrmstoptraceback
mgr/cephadm: prevent traceback when invalid osd id passed to 'orch osd rm stop'
Reviewed-by: Michael Fritch <mfritch@suse.com>
Kefu Chai [Thu, 4 Mar 2021 04:06:22 +0000 (12:06 +0800)]
ceph.spec: include ninja as BuildRequires
to ease the build for developers using SUSE, Fedora, CentOS or RHEL.
so install-deps.sh can install ninja for them.
Fixes: https://tracker.ceph.com/issues/49694
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 08:56:23 +0000 (16:56 +0800)]
Merge pull request #39828 from athanatos/sjust/wip-seastore-omap2
crimson/seastore: start wiring up collection_manager, omap_manager, onode_manager
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Wed, 10 Mar 2021 07:25:54 +0000 (07:25 +0000)]
crimson/.../staged-fltree/value.cc: return ValueDeltaRecorder for ONODE
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Mon, 8 Mar 2021 20:38:01 +0000 (12:38 -0800)]
crimson/seastore/onode_tree: add FLTreeOnodeManager unittest
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 9 Mar 2021 03:57:03 +0000 (19:57 -0800)]
crimson/os/seastore/.../fltree_onode_manager: fill in delta recorder
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 23 Feb 2021 05:20:58 +0000 (21:20 -0800)]
crimson/os/seastore/seastore.cc: wire up omap_manager
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 2 Mar 2021 20:25:13 +0000 (12:25 -0800)]
crimson/os/seastore/omap_manager: generalize omap_list to support lower_bound
The iterator interface needs both lower and upper bound, generalize list()
to support both.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Thu, 25 Feb 2021 05:45:21 +0000 (21:45 -0800)]
crimson/os: remove FuturizedStore::OmapIterator::tail_key
This doesn't actually make sense for FuturzizedStore implementations other
than BlueStore, and then only in a diagnostic capacity. It also doesn't
have any actual users at the moment.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Thu, 21 Jan 2021 22:34:12 +0000 (14:34 -0800)]
crimson/os/seastore/onode_manager: remove create_ephemeral
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Thu, 11 Feb 2021 02:58:58 +0000 (18:58 -0800)]
crimson/os/seastore: wire up FLTreeOnodeManager and FlatCollectionManager
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 2 Mar 2021 20:35:06 +0000 (12:35 -0800)]
crimson/os/seastore/onode_manager: introduce FLTreeOnodeManager
Adjusts OnodeManager interface and introduces FLTreeOnodeManager
implementation.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Thu, 28 Jan 2021 23:57:59 +0000 (23:57 +0000)]
crimson/os/seastore/onode_manager: remove simple-fltree
Doesn't actually have a TransactionManager implementation, and
it needs substantial changes to adapt to changes in Onode.
We can resurrect it in the future if we want to.
Signed-off-by: Samuel Just <sjust@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 04:55:49 +0000 (12:55 +0800)]
Merge pull request #39982 from tchaikov/wip-doc-theme
doc: fine tune the theme, fix formatting in mount.ceph
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 04:23:35 +0000 (12:23 +0800)]
doc/man/8/mount.ceph: fix the formatting
* fix the indent of item
* add an empty line before code block
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 04:07:40 +0000 (12:07 +0800)]
doc/start: fix the link pointing to ceph doc
use https instead of http, the latter cannot be redirected to the valid
docs. also, we don't have "next" branch, so remove the document
mentioning it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 10 Mar 2021 03:08:47 +0000 (11:08 +0800)]
doc/_themes: fine tune styling
* fix the "dl" (definition list) display in manpage. before this
change, if an item in dl is composed of strings with different fonts,
it is cluttered into a single string. after this change, they are
separated with proper spacing as before. see the "WORKLOAD" section in
https://docs.ceph.com/en/latest/man/8/ceph-syn/ and
https://docs.ceph.com/en/octopus/man/8/ceph-syn/
* reduce the spacing in "ul" (unordered list) in table. before
this change, we have large spacing at end of a list in table. after
this change, the spacing is reduced. see
https://docs.ceph.com/en/latest/start/hardware-recommendations/#ram
https://docs.ceph.com/en/octopus/start/hardware-recommendations/#ram
* increase the spacing between two "ul"s in table. see
https://docs.ceph.com/en/latest/start/hardware-recommendations/#Processor
https://docs.ceph.com/en/octopus/start/hardware-recommendations/#ram
Signed-off-by: Kefu Chai <kchai@redhat.com>
Michael Fritch [Wed, 10 Mar 2021 04:06:27 +0000 (21:06 -0700)]
doc/cephadm: remove step to restart the mgr
a restart of the mgr does not appear to be necessary
after a `ceph config-key set ...`
Signed-off-by: Michael Fritch <mfritch@suse.com>
Michael Fritch [Wed, 10 Mar 2021 04:06:20 +0000 (21:06 -0700)]
doc/cephadm: use `reconfig` instead of `redeploy`
`reconfig` can be used to apply a change to either
the tls/ssl cert or a custom configuration file (j2)
Signed-off-by: Michael Fritch <mfritch@suse.com>
Michael Fritch [Wed, 10 Mar 2021 04:06:12 +0000 (21:06 -0700)]
doc/cephadm: update custom j2 config-key name
introduced by:
cd79c9912ab35ee6296d613edc7830410a141e05
Signed-off-by: Michael Fritch <mfritch@suse.com>
Kefu Chai [Wed, 10 Mar 2021 03:43:36 +0000 (11:43 +0800)]
Merge pull request #39981 from xxhdx1985126/wip-obc-tri_mutex-bug
crimson/osd: fix two obc lock related bugs
Reviewed-by: Kefu Chai <kchai@redhat.com>
Xuehan Xu [Tue, 9 Mar 2021 03:06:26 +0000 (11:06 +0800)]
crimson/common: use excl_lock_from_excl when promoting tri_mutex from excl to excl
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
Xuehan Xu [Mon, 8 Mar 2021 07:51:49 +0000 (15:51 +0800)]
crimson/osd: acquire locks strictly by OSDOp type
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
Kefu Chai [Wed, 10 Mar 2021 00:30:13 +0000 (08:30 +0800)]
Merge pull request #39826 from tchaikov/wip-ninja
run-make: switch over to ninja-build
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
zdover23 [Tue, 9 Mar 2021 23:38:37 +0000 (09:38 +1000)]
Merge pull request #39946 from TheJJ/fix-ceph-crash-caps
doc/mgr/crash: explain needed crash upload permissions
Reviewed-by: Zac Dover <zac.dover@gmail.com>
Sage Weil [Tue, 9 Mar 2021 22:32:59 +0000 (17:32 -0500)]
Merge PR #39955 into master
* refs/pull/39955/head:
mgr/cephadm: do not prime service cache on reconfig
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:41:53 +0000 (13:41 -0800)]
Merge PR #37711 into master
* refs/pull/37711/head:
qa/cephfs: create class LocalCephFSMount
vstart_runner: reuse FuseMount methods in LocalFuseMount
vstart_runner: reuse KernelMount methods in LocalKernelMount
qa/cephfs: move common and generic methods mount.py
qa/cephfs: refactor FuseMount.mount method
qa/cephfs: refactor KernelMount.mount method
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:41:00 +0000 (13:41 -0800)]
Merge PR #37945 into master
* refs/pull/37945/head:
mds: add opened files/inodes and pinned i_caps metric payload support
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:40:09 +0000 (13:40 -0800)]
Merge PR #39408 into master
* refs/pull/39408/head:
test: add test for validating cephfs-mirror daemon service status
pybind/mirroring: interface to fetch mirror daemon status
cephfs-mirror: register mirror daemon with service manager
cephfs-mirror: remove unneeded json_spirit header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:38:57 +0000 (13:38 -0800)]
Merge PR #39502 into master
* refs/pull/39502/head:
qa: add sleep for blocklisting to take effect
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:37:35 +0000 (13:37 -0800)]
Merge PR #39687 into master
* refs/pull/39687/head:
tools/cephfs-shell: continue file listing even on error
tools/cephfs-shell: refactoring of code related listing
tools/cephfs-shell: fix listing of symbolic links
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 9 Mar 2021 21:36:40 +0000 (13:36 -0800)]
Merge PR #39814 into master
* refs/pull/39814/head:
qa/cephfs: move is_blocklisted() to filesystem.CephCluster
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Mon, 8 Mar 2021 14:49:14 +0000 (09:49 -0500)]
python-common: continue to allow RGWSpec(realm=r,zone=z)
This is for backward compatibility: an octopus spec yaml can still be
applied to an existing cluster. Note that it might not work on a new
cluster, since cephadm no longer tries to create the realm or zone if
they don't exist.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 8 Mar 2021 14:47:57 +0000 (09:47 -0500)]
PendingReleaseNodes: note changes in cephadm rgw behavior
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 5 Mar 2021 21:30:20 +0000 (16:30 -0500)]
qa/tasks/cephadm: drop realm.zone convention for rgw
Note that cephadm.py will no longer do anything with rgw realms and
zones. That means that the setup of rgw roles here is only useful
for the default zone and a non-multisite config.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 9 Mar 2021 19:29:39 +0000 (14:29 -0500)]
doc: update docs
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 9 Mar 2021 18:15:20 +0000 (12:15 -0600)]
mgr/cephadm: do not prime service cache on reconfig
Ceph daemon reconfig does not need any daemon state refresh since we don't
do a restart--we just rewrite the ceph.conf. This also avoids priming
our cache with a 'starting' state when the daemon wasn't touched.
Fixes: https://tracker.ceph.com/issues/49675
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 9 Mar 2021 17:56:42 +0000 (11:56 -0600)]
debian/ceph-common.postinst: do not chown cephadm log dirs
The container uid/gid is different than the debian uid/gid (because the
container is centos-based and we got a different uid/gid allocation there).
Fixes: https://tracker.ceph.com/issues/49677
Signed-off-by: Sage Weil <sage@newdream.net>
Kefu Chai [Tue, 9 Mar 2021 17:25:14 +0000 (01:25 +0800)]
Merge pull request #39948 from tchaikov/wip-clang-tidy
crimson,common: cleanups inspired by clang-tidy
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Sage Weil [Fri, 5 Mar 2021 21:01:00 +0000 (16:01 -0500)]
python-common/ceph/deployment: RGWSpec: accept (and drop) subcluster arg
This is just so we can load up a stored spec after upgrade. We'll silently
drop it, since we have the service_id, and this was only used to generate
that anyway.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 5 Mar 2021 20:52:54 +0000 (15:52 -0500)]
mgr/orchestrator: drop $realm.$zone naming convention
- Let users name the rgw service(s) whatever they like
- Make the rgw_zone and rgw_realm arguments optional, so that they can
omit them and let radosgw start up in the generic single-cluster
configuration (whichk, notably, has no realm).
- Continue to set the rgw_realm and rgw_zone options for the daemon(s),
but only when those values are specified.
- Adjust the CLI accordingly. Drop the subcluster argument, which was
only used to generate a service_id.
- Adjust rook. This is actually a simplification and improved mapping onto
the rook CRD, *except* that for octopus we enforced the realm.zone
naming *and* realm==zone. I doubt a single user actually did this
so it is not be worth dealing with, but we need a special case for
where there is a . in the service name.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 5 Mar 2021 18:13:56 +0000 (13:13 -0500)]
mgr/cephadm: rgw: do not mess with realm configuration
It is simpler to consider this out of scope for the orchestrator. The
user should set up their multisite realms/zones before deploying the
daemons (or the daemons will not start). In the future we can wrap this
with a more friendly tool, perhaps.
Signed-off-by: Sage Weil <sage@newdream.net>
Kefu Chai [Tue, 9 Mar 2021 14:30:56 +0000 (22:30 +0800)]
crimson: pass by `const` or `const&` if possible
more constness, and better performance.
Signed-off-by: Kefu Chai <kchai@redhat.com>
zdover23 [Tue, 9 Mar 2021 14:43:07 +0000 (00:43 +1000)]
Merge pull request #39930 from zdover23/wip-doc-cephadm-convert-adoption-process-2021-Mar-09
doc/cephadm: rewrite "adoption process"
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Tue, 9 Mar 2021 14:30:06 +0000 (22:30 +0800)]
crimson/mon: comment unused parameter
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 9 Mar 2021 14:28:09 +0000 (22:28 +0800)]
crimson: do not rely on implicit conversion to bool
for better readability
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 9 Mar 2021 14:26:23 +0000 (22:26 +0800)]
crimson: use `auto*` instead of `auto` for pointer
for better readability
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 9 Mar 2021 14:25:23 +0000 (22:25 +0800)]
crimson/admin: use moved string for constructing vector<>
it is the last consumer of cmdline, so move it away.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 9 Mar 2021 14:23:59 +0000 (22:23 +0800)]
crimson/admin: avoid using C-style cast
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 9 Mar 2021 14:22:57 +0000 (22:22 +0800)]
common/str_list: remove unused "using"
Signed-off-by: Kefu Chai <kchai@redhat.com>
Zac Dover [Mon, 8 Mar 2021 22:06:05 +0000 (08:06 +1000)]
doc/cephadm: rewrite "adoption process"
This rewrites the "Adoption Process" section
of the "Converting and Existing Cluster to
cephadm" chapter of the Cephadm guide.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Jonas Jelten [Tue, 9 Mar 2021 13:10:52 +0000 (14:10 +0100)]
doc/mgr/crash: explain needed crash upload permissions
Signed-off-by: Jonas Jelten <jj@sft.lol>
Kefu Chai [Tue, 9 Mar 2021 04:51:55 +0000 (12:51 +0800)]
mgr: add mon metada using type of "mon"
this change addresses a regression introduced by
c037f4cb5d7436879d58c34748ef516b5269781f
also remove the "P" before the json command.
see also: https://tracker.ceph.com/issues/48905
Fixes: https://tracker.ceph.com/issues/49661
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 4 Mar 2021 10:25:33 +0000 (18:25 +0800)]
cmake: silence "You are in 'detached HEAD' state" warning
git warns us when the repo is in 'detached HEAD' state, like:
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in
this state without impacting any branches by switching back to a branch.
...
Turn off this advice by setting config variable advice.detachedHead to
false
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 4 Mar 2021 09:17:15 +0000 (17:17 +0800)]
nasm-wrapper: use += for appending string to a variable
less repeating, better readablity
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 4 Mar 2021 08:46:05 +0000 (16:46 +0800)]
cmake: do not pass "-fdiagnostics-color" to as
this option can be understood by GCC. see
https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 4 Mar 2021 08:06:51 +0000 (16:06 +0800)]
nasm-wrapper: swallow -MD option
see also
- https://discourse.cmake.org/t/cmake-generating-invalid-ninja-build-rules-for-asm/1389
- https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4460
- https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4838
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 4 Mar 2021 07:46:42 +0000 (15:46 +0800)]
cmake: define BUILD_BYPRODUCTS for Boost
so if a cmake generator needs any one of them, it knowns how to build
it.
Signed-off-by: Kefu Chai <kchai@redhat.com>