Commit Graph

92062 Commits

Author SHA1 Message Date
Kefu Chai
0534786b9d
Merge pull request #24901 from wjwithagen/wjw-fix-rbd-ggate-cmake
tool: link rbd-ggate against librados-cxx

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 15:40:04 +08:00
Kefu Chai
01409a542c
Merge pull request #25060 from mooncak/fix_typos
doc: Fix some typos

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 15:29:39 +08:00
Kefu Chai
052b0f4614
Merge pull request #24999 from MrStupnikov/master-docfix-1358
doc: Put command template into literal block

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 15:14:03 +08:00
Kefu Chai
d143450450
Merge pull request #24996 from mcv21/bug/note_file_move
debian: correct ceph-common relationship with older radosgw package

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 14:28:47 +08:00
Kefu Chai
994229ac51
Merge pull request #25048 from swinds24/master_fix_36764
ceph-mgr: hold lock while accessing the request list and submitting request

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 14:26:53 +08:00
Kefu Chai
578f7e082e
Merge pull request #24458 from rzarzynski/wip-osd-drop-osd_instructions
osd: drop the unused request_redirect_t::osd_instructions

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 14:16:05 +08:00
Kefu Chai
ac48b5659d
Merge pull request #24141 from liu-chunmei/ceph_seastar_perfcounter
common,crimson: port perfcounters to seastar

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 14:13:39 +08:00
Kefu Chai
a04691031c
Merge pull request #24858 from jecluis/wip-pr-19983-tests
qa/cephtool: test bounds on pool's `hit_set_*`

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-15 14:12:09 +08:00
Kefu Chai
5965aff12e
Merge pull request #25106 from tchaikov/wip-qa-envlibrados
qa: fix upgrade tests and test_envlibrados_for_rocksdb.sh

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-11-15 14:06:54 +08:00
Kefu Chai
60dc1c2a32 qa: patch rocksdb the right way
quote from patch(1)

>       but usually just
>
>       patch -pnum <patchfile

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-15 13:03:00 +08:00
Neha Ojha
d46a472915
Merge pull request #24979 from neha-ojha/wip-upgrade-bug
doc/releases/mimic.rst: make note of 13.2.2 upgrade bug

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-11-14 20:51:55 -08:00
Kefu Chai
bbdb569666
Merge pull request #25072 from tchaikov/wip-silence-sign-compare
os/tests: silence -Wsign-compare warning

Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-11-15 12:09:49 +08:00
Kefu Chai
2dc0f86227 qa: use FOUND_VAR to be backward compatible with cmake 2.8.12
before this change, we assume that the variable set if rados::radospp is
found will be radospp_FOUND, but this is a feature cmake 3, see
https://cmake.org/cmake/help/v3.3/module/FindPackageHandleStandardArgs.html

while the cmake shipped by centos is cmake 2.8.12, where the variable
name will be <UPPERCASED_NAME>_FOUND, see
https://cmake.org/cmake/help/v2.8.12/cmake.html#module:FindPackageHandleStandardArgs

in the test of test_envlibrados_for_rocksdb.sh, we are using cmake not
the cmake3 offered by EPEL7, so RADOSPP_FOUND will be set instead. that's why
executable env_librados_test will fail to link against rados::radospp.
as rados::radospp won't be defined if radospp_FOUND is not defined/set.

after this change, the 2nd mode of FIND_PACKAGE_HANDLE_STANDARD_ARGS()
is used instead to ensure that radospp_FOUND is defined even if cmake
2.8.12 is used.

also, the message() commands for debugging purpose are removed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-15 11:57:52 +08:00
Kefu Chai
ae36a61446 qa/suites: add librados2 to "extra_packages" for upgrade tests
we use the playbook of "testnodes.yml" defined by ceph-cm-ansible for
initializing test nodes, and the role of "testnode" is used by
testnodes.yml. "testnode" requires "qemu-system-x86" or "qemu-kvm"
package to be installed. the qemu in turn depends on librbd1 and
librados2.

before librados3 was introduced, this worked perfectly. because in ceph
repo, qa/packages/packages.yaml defines the default set of packages the
"install" tasks should install. and in that yaml file, librados2 was
listed. so the package management system will overwrite the librados2
installed by ansible playbook with the version specified by the
"install" task, as apt/yum thinks this is what user requires explicitly,
so it's fine to install a different version of librados2.

after librados3 was introduced, librados2 was removed from
qa/packages/packages.yaml. because, by default, we need to install
librados3 instead of librados2 for ready a nautilus cluster. but the
problem is, the packge list also applies to "install" tasks installing
releases before nautilus, where we still need to replace the librados2
installed by ansible.

so, to address this issue, "librados2" is added to "extra_packages" of
the "install" tasks of tests installing old releases to install
librados2 explicitly instead of as a dependency of other ceph packages
like librbd1.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-15 11:56:24 +08:00
Alfredo Deza
eaf8e40980
Merge pull request #25098 from ceph/rm-27062
ceph-volume: reject devices that have existing GPT headers

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-11-14 13:31:18 -05:00
Andrew Schoen
74f25e5b81
Merge pull request #25093 from alfredodeza/wip-bz1644828
ceph-volume: remove LVs when using zap --destroy

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-11-14 11:00:34 -06:00
Kefu Chai
0a517ec0ac os/tests: silence -Wsign-compare warning
silence warning like

In file included from
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/test/objectstore/store_test.cc:25:0:
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/googletest/googletest/include/gtest/gtest.h:
In instantiation of 'testing::AssertionResult
testing::internal::CmpHelperEQ(const char*, const char*, const T1&,
const T2&) [with T1 = int; T2 = long unsigned int]':

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-15 00:59:02 +08:00
Andrew Schoen
0cb95ace88 ceph-volume: update tests after removing the LVPath arg validator
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:30 -06:00
Andrew Schoen
fdf7f3c575 ceph-volume: return lvs as vg/lv from ValidDevice if as_string is True
All code in prepare and activate expect lvs to be in that format.
Eventually we can refactor all that to use the Device class as well.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:30 -06:00
Andrew Schoen
cc0317efac ceph-volume: adds lv_name property to Device class
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:30 -06:00
Andrew Schoen
d6a5a7606c ceph-volume: combine the LVPath arg validator with ValidDevice
This combines the two arg validators and makes both batch and
prepare/active both use ValidDevice.

This will also allow us to use lvs with a full path, like
/dev/vg/lv instead of always enforcing vg/lv.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:29 -06:00
Andrew Schoen
568a0ce5be ceph-volume: adds has_gpt_headers property to Device class
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:29 -06:00
Andrew Schoen
3d86d2dda9 ceph-volume: add PTTYPE to blkid parser
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves: rm#27062
2018-11-14 10:36:29 -06:00
Jos Collin
6ea924df4b
Merge pull request #25094 from CharlotteRose/wip-fix-boxes
doc: Fixed the paragraph and boxes

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-11-14 21:53:28 +05:30
Lenz Grimmer
4e5559f26c
Merge pull request #24789 from Ranjitha-G/dashboard-test-erasure
mgr/dashboard: Add unit test case for controller/erasure_code_profile.py

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-11-14 16:46:34 +01:00
Scoots Hamilton
eec2310e9d doc: Fixed the paragraph and boxes.
Signed-off-by: Scoots Hamilton <scoots@redhat.com>
2018-11-14 10:27:48 -05:00
Lenz Grimmer
acde3a4d4c
Merge pull request #24788 from Ranjitha-G/dashboard-hacking-doc
mgr/dashboard: Fix some setup steps in HACKING.rst

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2018-11-14 13:44:19 +01:00
mooncake
67a44af1a5 doc: Fix some typos
Signed-off-by: mooncake <xcoder@tenxcloud.com>
2018-11-14 19:49:13 +08:00
Josh Durgin
bc2c80f437
Merge pull request #25080 from smithfarm/wip-37089
tests: make ceph-admin-commands.sh log what it does

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-11-14 15:47:52 +05:30
Jason Dillaman
b14751c18e
Merge pull request #25083 from iridescent-rsy/fix-typo
rbd: fix some typos

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-14 12:02:58 +05:30
Shiyang Ruan
1857217e8a rbd_mirror: fix a typo.
Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
2018-11-14 11:42:11 +08:00
Shiyang Ruan
424d3d8b8a rbd_mirror: restore the header annotation.
Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
2018-11-14 11:42:11 +08:00
Shiyang Ruan
9a6f2608db rbd: fix typos.
Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
2018-11-14 11:23:56 +08:00
Neha Ojha
970184cc57 doc/releases/mimic.rst: make note of 13.2.2 upgrade bug
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-11-13 15:29:42 -08:00
Alfredo Deza
27d0a915d4 ceph-volume tests update tests to handle new SystemExit exceptions in main
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:07:01 -05:00
Alfredo Deza
9527cffbe3 ceph-volume tests.api verify that Volume object can be removed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:07:01 -05:00
Alfredo Deza
e7daa71604 ceph-volume api.lvm allow passing a Volume object to remove_lv
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:07:01 -05:00
Alfredo Deza
4656bf0e33 ceph-volume tests.functional.lvm test full removal of LVs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:07:00 -05:00
Alfredo Deza
f695d1716e ceph-volume main raise sys.exit to prevent garbage in help
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:06:56 -05:00
Alfredo Deza
677cbbb059 ceph-volume lvm.zap remove vgs|lvs when --destroy is used
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-13 17:06:48 -05:00
Patrick Donnelly
0aa5566c81
Merge PR #24490 into master
* refs/pull/24490/head:
	mds: flush dirty dirfrags that weren't logged when deactivating mds
	mds: use MDlog::trim_all() to trim log when deactivating mds
	mds: don't cap log when there are replicated objects

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-11-13 13:03:02 -08:00
Nathan Cutler
0185abfeb4 tests: make ceph-admin-commands.sh log what it does
Fixes: http://tracker.ceph.com/issues/37089
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-11-13 19:46:24 +01:00
Casey Bodley
d444c6dc9f
Merge pull request #25057 from joke-lee/wip-ceph-dencoder-support
ceph-dencoder: add RGWRealm and RGWPeriod  support.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-11-13 08:56:26 -05:00
Kefu Chai
e0e977f4a0
Merge pull request #25071 from tchaikov/wip-install-dep-for-python-saml
install-deps.sh: install libtool-ltdl-devel for building python-saml

Reviewed-by: Ricardo Marques <rimarques@suse.com>
2018-11-13 18:17:54 +08:00
Kefu Chai
c8a89df744 install-deps.sh: install libtool-ltdl-devel for building python-saml
python-saml depends on dm.xmlsec.binding. which links against ltdl. so
without libtool-ltdl-devel, we will have

/opt/rh/devtoolset-7/root/usr/libexec/gcc/aarch64-redhat-linux/7/ld:
cannot find -lltdl

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-13 15:28:45 +08:00
yuliyang
6fb5e7b243 ceph-dencoder: add RGWRealm support.
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
2018-11-13 08:24:24 +08:00
Kefu Chai
c89e0715cb
Merge pull request #25037 from tchaikov/wip-qa-upgrade
qa: add librados3 to exclude_packages for ugprade tests

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2018-11-13 06:38:21 +08:00
Alfredo Deza
debfa76540
Merge pull request #25063 from alfredodeza/wip-rm36768
ceph-volume: patch Device when testing 

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-11-12 14:59:14 -05:00
Alfredo Deza
82d96f8764 ceph-volume tests patch Device() by splitting parametrized method
This was causing failures on systems where there is no LVM or where the
device names don't match. Patching is always recommended to avoid
conflicts with the system testing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-12 14:04:23 -05:00
Alfredo Deza
7ee7a59910 ceph-volume tests inventory should patch before using .get_devices()
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-11-12 14:04:23 -05:00