]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agoinclude: Add [[nodiscard]] to make_scope_guard 48633/head
Adam C. Emerson [Wed, 26 Oct 2022 17:22:08 +0000 (13:22 -0400)]
include: Add [[nodiscard]] to make_scope_guard

To prevent a bug where an unassigned scope guard runs right away.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2 years agoMerge pull request #48619 from ceph/wip-tracker-57883
Laura Flores [Wed, 26 Oct 2022 14:43:09 +0000 (09:43 -0500)]
Merge pull request #48619 from ceph/wip-tracker-57883

qa/standalone/erasure-code: give osdmap 5 seconds to refresh

2 years agoMerge pull request #48557 from phlogistonjohn/jjm-fix-cephadm-test-py36
Adam King [Wed, 26 Oct 2022 13:47:00 +0000 (09:47 -0400)]
Merge pull request #48557 from phlogistonjohn/jjm-fix-cephadm-test-py36

cephadm: fix running cephadm tox test suite on python 3.6

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #48620 from mgfritch/cephadm-gitignore
Adam King [Wed, 26 Oct 2022 12:40:57 +0000 (08:40 -0400)]
Merge pull request #48620 from mgfritch/cephadm-gitignore

cephadm: add .gitignore for tox related files

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #48627 from zdover23/wip-doc-2022-10-26-ceph-volume-lvm-prepare-3
zdover23 [Wed, 26 Oct 2022 10:23:13 +0000 (20:23 +1000)]
Merge pull request #48627 from zdover23/wip-doc-2022-10-26-ceph-volume-lvm-prepare-3

doc/ceph-volume: refine "filestore" section

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #48625 from zdover23/wip-doc-2022-10-26-ceph-volume-lvm-prepare-2
zdover23 [Wed, 26 Oct 2022 10:16:08 +0000 (20:16 +1000)]
Merge pull request #48625 from zdover23/wip-doc-2022-10-26-ceph-volume-lvm-prepare-2

doc/ceph-volume: refine "bluestore" section

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge PR #43284 into main
Venky Shankar [Wed, 26 Oct 2022 05:58:25 +0000 (11:28 +0530)]
Merge PR #43284 into main

* refs/pull/43284/head:
doc: describe bal_rank_mask configuration
qa/cephfs: add bal_rank_mask test cases
mds: add bal_rank_mask option for ceph fs set

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agodoc/ceph-volume: refine "filestore" section 48627/head
Zac Dover [Wed, 26 Oct 2022 03:14:00 +0000 (13:14 +1000)]
doc/ceph-volume: refine "filestore" section

This commit refines the "filestore" section in the doc/ceph-volume/lvm/prepare.rst file.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2 years agodoc/ceph-volume: refine "bluestore" section 48625/head
Zac Dover [Wed, 26 Oct 2022 01:24:25 +0000 (11:24 +1000)]
doc/ceph-volume: refine "bluestore" section

This commit refines the "bluestore" section in the
doc/ceph-volume/lvm/prepare.rst file.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2 years agocephadm: add .gitignore for tox related files 48620/head
Michael Fritch [Tue, 25 Oct 2022 17:02:54 +0000 (11:02 -0600)]
cephadm: add .gitignore for tox related files

ignore files created by a run of `tox -e coverage`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2 years agoqa/standalone/erasure-code: give osdmap 5 seconds to refresh 48619/head
Laura Flores [Tue, 25 Oct 2022 17:03:24 +0000 (17:03 +0000)]
qa/standalone/erasure-code: give osdmap 5 seconds to refresh

Fixes: https://tracker.ceph.com/issues/57883
Signed-off-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #40363 from orozery/rbd-clone-encryption
Ilya Dryomov [Tue, 25 Oct 2022 16:16:33 +0000 (18:16 +0200)]
Merge pull request #40363 from orozery/rbd-clone-encryption

librbd: add encryption format support for clones (part 1/2)

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agocephadm: fix running test suite on python3.6 48557/head
John Mulligan [Wed, 12 Oct 2022 18:06:40 +0000 (14:06 -0400)]
cephadm: fix running test suite on python3.6

While a new version of pyfakefs is available, version 5 is not available
for python 3.6. In order to run the test suite on centos 8 we will
continue to work with pyfakefs version 4.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agocephadm: fix base class behavior on python3.6
John Mulligan [Wed, 12 Oct 2022 18:15:59 +0000 (14:15 -0400)]
cephadm: fix base class behavior on python3.6

This fixes the cephadm test files when running tox/pytest on python3.6
(centos/rhel 8).
Long story short, combining classmethod and property on py3.6 behaves
differently from py3.7 and up. Since the classmethod is actually
unnecessary for the base class to behave as it does, we drop that
decorator.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #48547 from SUSE/wip-fix-57893
Tim Serong [Tue, 25 Oct 2022 02:57:44 +0000 (13:57 +1100)]
Merge pull request #48547 from SUSE/wip-fix-57893

make-dist: don't set Release tag in ceph.spec for SUSE distros

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2 years agoMerge pull request #48610 from zdover23/wip-doc-2022-10-25-cephadm-ssh-capitalization
zdover23 [Tue, 25 Oct 2022 01:54:04 +0000 (11:54 +1000)]
Merge pull request #48610 from zdover23/wip-doc-2022-10-25-cephadm-ssh-capitalization

doc/cephadm: s/ssh/SSH/ in doc/cephadm (complete)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephadm: s/ssh/SSH/ in doc/cephadm (complete) 48610/head
Zac Dover [Mon, 24 Oct 2022 23:09:11 +0000 (09:09 +1000)]
doc/cephadm: s/ssh/SSH/ in doc/cephadm (complete)

This PR alters "ssh" to "SSH" in the text (that is, not in
commands) every location in the doc/cephadm/ directory where
"ssh" should be "SSH".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2 years agomake-dist: don't set Release tag in ceph.spec for SUSE distros 48547/head
Nathan Cutler [Mon, 29 Jan 2018 12:38:08 +0000 (13:38 +0100)]
make-dist: don't set Release tag in ceph.spec for SUSE distros

SUSE's Open Build Service overwrites the Release tag with checkin
and build counters, so we can't use it to record the number of
commits since the last tag, and the last commit hash.  This commit
appends that extra information to the Version tag instead for
SUSE builds.

Fixes: https://tracker.ceph.com/issues/57893
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2 years agoMerge pull request #46188 from Zhiwei-Dai/wip-rgw-crypto-stack-on-compress
Casey Bodley [Mon, 24 Oct 2022 15:52:26 +0000 (11:52 -0400)]
Merge pull request #46188 from Zhiwei-Dai/wip-rgw-crypto-stack-on-compress

rgw: support full object encryption stack on compression

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agodoc: describe bal_rank_mask configuration 43284/head
Yongseok Oh [Tue, 11 Oct 2022 11:49:19 +0000 (20:49 +0900)]
doc: describe bal_rank_mask configuration

Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>
2 years agoqa/cephfs: add bal_rank_mask test cases
Yongseok Oh [Tue, 11 Oct 2022 11:49:45 +0000 (20:49 +0900)]
qa/cephfs: add bal_rank_mask test cases

Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>
2 years agomds: add bal_rank_mask option for ceph fs set
Yongseok Oh [Tue, 11 Oct 2022 11:47:32 +0000 (20:47 +0900)]
mds: add bal_rank_mask option for ceph fs set

fixes: https://tracker.ceph.com/issues/52720

Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>