]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agolibrbd: hold cache_lock while clearing cache nonexistence flags 19800/head
Jason Dillaman [Wed, 27 Sep 2017 13:40:08 +0000 (09:40 -0400)]
librbd: hold cache_lock while clearing cache nonexistence flags

When transitioning from a snapshot that had an associated parent
to a snapshot where the parent was flattened and removed, the cache
was being referenced without holding the required lock.

Fixes: http://tracker.ceph.com/issues/21558
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 16ef97830cde30efb96f7aee69834b3a5c2d5248)

7 years agoMerge pull request #19243 from liewegas/wip-fix-statfs-luminous
Sage Weil [Wed, 3 Jan 2018 17:07:39 +0000 (11:07 -0600)]
Merge pull request #19243 from liewegas/wip-fix-statfs-luminous

mon/Monitor: fix statfs handling before luminous switchover happens

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19746 from ceph/wip-use-installer0-luminous2
vasukulkarni [Tue, 2 Jan 2018 22:23:35 +0000 (14:23 -0800)]
Merge pull request #19746 from ceph/wip-use-installer0-luminous2

qa/tests - Added options to use both cases: mon.a and installer.0

7 years agoqa/tests - Added options to use both cases: mon.a and installer.0 19746/head
Yuri Weinstein [Tue, 2 Jan 2018 18:12:54 +0000 (10:12 -0800)]
qa/tests - Added options to use both cases: mon.a and installer.0

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 10fc85089c3bb64ced8c3a0ea17987e9ec5f46a2)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoqa/tests: run ceph-ansible task on installer.0 role/node
Yuri Weinstein [Wed, 20 Dec 2017 21:05:22 +0000 (13:05 -0800)]
qa/tests: run ceph-ansible task on installer.0 role/node

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 3b2a26d919c173c887fd193f186ea56c33fcd9ae)

7 years agoMerge pull request #19741 from joscollin/luminous
Sage Weil [Tue, 2 Jan 2018 15:17:16 +0000 (09:17 -0600)]
Merge pull request #19741 from joscollin/luminous

luminous: doc: update Blacklisting and OSD epoch barrier

7 years agodoc: fix grammar mistake 19741/head
Jos Collin [Tue, 2 Jan 2018 10:47:39 +0000 (16:17 +0530)]
doc: fix grammar mistake

Fixed grammar mistake in a sentence.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: update Blacklisting and OSD epoch barrier
Jos Collin [Tue, 2 Jan 2018 10:41:30 +0000 (16:11 +0530)]
doc: update Blacklisting and OSD epoch barrier

Updated missing OSD epoch barrier section, which is referenced by http://docs.ceph.com/docs/luminous/cephfs/full/#hammer-and-later.

Fixes: http://tracker.ceph.com/issues/22552
Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19721 from tchaikov/wip-luminous-boost-un-submodule
Sage Weil [Sat, 30 Dec 2017 20:12:19 +0000 (14:12 -0600)]
Merge pull request #19721 from tchaikov/wip-luminous-boost-un-submodule

luminous: boost un-submodule

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agomake-dist: exclude unused bits in boost 19721/head
Kefu Chai [Fri, 24 Nov 2017 05:56:02 +0000 (13:56 +0800)]
make-dist: exclude unused bits in boost

the docs, examples and tests are not used. so drop them. we could go
further by removing unused components in boost. but that'd be an issue
if somebody added a component in CMakeLists but forgets to update this
script. also, we need to remove boost/$component and lib/$component to
achieve this goal. this also introduces extra complicity. so leave it
for another change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 65f91227a6b052ad60b01276d7d72dea07cbb1a4)

7 years agomake-dist: repackage boost in the correct path
Kefu Chai [Fri, 24 Nov 2017 02:27:19 +0000 (10:27 +0800)]
make-dist: repackage boost in the correct path

before this change, boost is put into ./src. after this change, it is
put into $outfile/src. i.e. something like
ceph-12.1.2-4592-gf5f2ced624/src .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2218efa005ab871f26402b5dd33b2e599897c11f)

7 years agomake-dist,cmake: Try multiple URLs to download boost before failing
Brad Hubbard [Thu, 28 Sep 2017 05:28:53 +0000 (15:28 +1000)]
make-dist,cmake: Try multiple URLs to download boost before failing

Remove SPOF during boost download for make-dist and later cmake > 3.7

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 598556f98b65a03ad40ad076623b9cc8b507810e)

7 years agomake-dist,cmake: move boost tarball location to download.ceph.com
Sage Weil [Tue, 26 Sep 2017 21:15:17 +0000 (17:15 -0400)]
make-dist,cmake: move boost tarball location to download.ceph.com

Sourceforge is down.  Also, we can hammer our servers instead of
theirs.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 19987549e0ce526e353e24adddc7df8b1f165aab)

7 years agomake-dist: download and repackage boost
Kefu Chai [Thu, 31 Aug 2017 17:00:04 +0000 (01:00 +0800)]
make-dist: download and repackage boost

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f04436b189376cf7b53d710ab2f2bf01d47482ad)

7 years agoboost: remove boost submodule
Kefu Chai [Tue, 30 May 2017 15:58:44 +0000 (23:58 +0800)]
boost: remove boost submodule

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6b23056cf8d0d1bbd269bc96eef33dc27c25fd9e)

7 years agoMerge pull request #19680 from tchaikov/wip-luminous-22220
Nathan Cutler [Fri, 29 Dec 2017 17:27:43 +0000 (18:27 +0100)]
Merge pull request #19680 from tchaikov/wip-luminous-22220

luminous: install-deps.sh: revert gcc to the one shipped by distro

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19048 from shinobu-x/wip-22196-luminous
Kefu Chai [Mon, 25 Dec 2017 17:27:04 +0000 (01:27 +0800)]
Merge pull request #19048 from shinobu-x/wip-22196-luminous

luminous: mgr[zabbix] float division by zero (osd['kb'] = 0)

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoinstall-deps.sh: update g++ symlink also 19680/head
Kefu Chai [Fri, 22 Dec 2017 14:42:16 +0000 (22:42 +0800)]
install-deps.sh: update g++ symlink also

we need to update g++ symlink also, if it points to the wrong version

http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: the libboost issue does not affect master. as master builds
     boost from source. so, it's not cherry-picked from master.
(cherry picked from commit 248a157635b46d3cf23e37ae263c62b0dc4e0e59)

7 years agoinstall-deps.sh: readlink /usr/bin/gcc not /usr/bin/x86_64-linux-gnu-gcc
Kefu Chai [Thu, 14 Dec 2017 13:01:43 +0000 (21:01 +0800)]
install-deps.sh: readlink /usr/bin/gcc not /usr/bin/x86_64-linux-gnu-gcc

See: http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5be6ff11e536cb492dd50dedf8a04fb9acc1222e)

7 years agoinstall-deps.sh: point gcc to the one shipped by distro
Kefu Chai [Wed, 13 Dec 2017 05:36:54 +0000 (13:36 +0800)]
install-deps.sh: point gcc to the one shipped by distro

to define a struct in a method is legal in C++11, but it causes internal
compiler error due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82155
if we are using GCC-7. so we need to either workaround in our source
code by moving the struct definition out of the member method or revert
to a GCC without this bug. but if we go with the first route, the jewel
build still fails, because GCC-7 starts to use the new CXX11 ABI, which
is not compatible with the libboost we use in jewel. the libboost was
still built with the old ABI for backward compatibility. so let's just
fix the install-deps.sh to point gcc to the origin one.

See: http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: the libboost issue does not affect master. as master builds
 boost from source. so, it's not cherry-picked from master.
(cherry picked from commit ccc4dea90e483ea8bf6bee0721ef929e7f48ff5a)

7 years agoMerge pull request #18771 from ceph/wip-yuriw-22048-luminous
Josh Durgin [Mon, 18 Dec 2017 21:25:15 +0000 (13:25 -0800)]
Merge pull request #18771 from ceph/wip-yuriw-22048-luminous

tests - Initial checkin for luminous point-to-point upgrade

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #19522 from ceph/wip-ceph-disk-deprecation-revert
Kefu Chai [Fri, 15 Dec 2017 12:52:14 +0000 (20:52 +0800)]
Merge pull request #19522 from ceph/wip-ceph-disk-deprecation-revert

Revert "ceph-disk add deprecation warnings in favor of ceph-volume"

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotests - Initial checkin for luminous point-to-point upgrade 18771/head
Yuri Weinstein [Mon, 6 Nov 2017 20:22:27 +0000 (12:22 -0800)]
tests - Initial checkin for luminous point-to-point upgrade

Fixes http://tracker.ceph.com/issues/22048
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #19532 from ceph/luminous-rm22297
Andrew Schoen [Thu, 14 Dec 2017 21:03:23 +0000 (22:03 +0100)]
Merge pull request #19532 from ceph/luminous-rm22297

luminous ceph-volume handle inline comments in the ceph.conf file

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #19530 from ceph/luminous-rm22326
Andrew Schoen [Thu, 14 Dec 2017 20:50:22 +0000 (21:50 +0100)]
Merge pull request #19530 from ceph/luminous-rm22326

luminous ceph-volume: warn on missing ceph.conf file

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume configuration allow inlined comments for # and ; 19532/head
Alfredo Deza [Mon, 4 Dec 2017 13:22:23 +0000 (08:22 -0500)]
ceph-volume configuration allow inlined comments for # and ;

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aec5f5042a684952c2b07922695e7675e13645ec)

7 years agoceph-volume tests verify that INI comments can be inlined
Alfredo Deza [Mon, 4 Dec 2017 13:21:29 +0000 (08:21 -0500)]
ceph-volume tests verify that INI comments can be inlined

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit fe6c4c0d6055c46baadd89723c0a2b78b5ffb7f8)

7 years agoMerge pull request #19525 from ceph/backport-19363
Alfredo Deza [Thu, 14 Dec 2017 18:48:53 +0000 (13:48 -0500)]
Merge pull request #19525 from ceph/backport-19363

luminous: ceph-volume: removed the explicit use of sudo

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume test logging ignored ceph.conf file 19530/head
Alfredo Deza [Tue, 5 Dec 2017 18:59:22 +0000 (13:59 -0500)]
ceph-volume test logging ignored ceph.conf file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 69482d1d8059c3b264532f7623c9e6592c57b7c3)

7 years agoceph-volume main warn on inability to load ceph.conf, don't raise
Alfredo Deza [Tue, 5 Dec 2017 18:58:53 +0000 (13:58 -0500)]
ceph-volume main warn on inability to load ceph.conf, don't raise

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 44c768db0da0163340b52643122b66ecebbefe23)

7 years agoMerge pull request #19528 from ceph/luminous-rm22305
Andrew Schoen [Thu, 14 Dec 2017 17:30:52 +0000 (18:30 +0100)]
Merge pull request #19528 from ceph/luminous-rm22305

luminous ceph-volume should be able to handle multiple LVM (VG/LV) tags

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #19527 from ceph/luminous-rm22299
Andrew Schoen [Thu, 14 Dec 2017 17:26:30 +0000 (18:26 +0100)]
Merge pull request #19527 from ceph/luminous-rm22299

luminous ceph-volume Format correctly when vg/lv cannot be used

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #19526 from ceph/luminous-rm22280
Andrew Schoen [Thu, 14 Dec 2017 17:22:22 +0000 (18:22 +0100)]
Merge pull request #19526 from ceph/luminous-rm22280

luminous ceph-volume: handle leading whitespace/tabs in ceph.conf

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume tests.api ensure that we can handle non-ceph tags in lvs 19528/head
Alfredo Deza [Mon, 4 Dec 2017 14:56:00 +0000 (09:56 -0500)]
ceph-volume tests.api ensure that we can handle non-ceph tags in lvs

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c98731ecede09d8d15dca99c57e331212747060e)

7 years agoceph-volume api.lvm only consider 'ceph.' tags in logical volumes
Alfredo Deza [Mon, 4 Dec 2017 14:54:35 +0000 (09:54 -0500)]
ceph-volume api.lvm only consider 'ceph.' tags in logical volumes

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a7e7df14602a10190a2830262a67202e7ad38f49)

7 years agoceph-volume tests verify proper formatting of RuntimeError on vg/lv error 19527/head
Alfredo Deza [Fri, 1 Dec 2017 18:53:39 +0000 (13:53 -0500)]
ceph-volume tests verify proper formatting of RuntimeError on vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d7320313a15ad8bb948e501382269c8f33a8cb70)

7 years agoceph-volume lvm.prepare correctly format argument for vg/lv error
Alfredo Deza [Fri, 1 Dec 2017 18:53:06 +0000 (13:53 -0500)]
ceph-volume lvm.prepare correctly format argument for vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7c0b00615d46a9451cb3a7731594cd7864eabc07)

7 years agoceph-volume test leading whitespace is handled in configurations 19526/head
Alfredo Deza [Thu, 30 Nov 2017 13:58:37 +0000 (08:58 -0500)]
ceph-volume test leading whitespace is handled in configurations

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ec7f8a27b8c51e1e1d02a2a13d9219bbb1a58c26)

7 years agoceph-volume trim tabbed/whitespaced configuration files when loading them
Alfredo Deza [Thu, 30 Nov 2017 13:58:04 +0000 (08:58 -0500)]
ceph-volume trim tabbed/whitespaced configuration files when loading them

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9706e8cc9eb53d0f01fc78978625c1d18bf4667e)

7 years agoceph-volume: removed the explicit use of sudo 19525/head
Andrew Schoen [Wed, 6 Dec 2017 16:40:55 +0000 (10:40 -0600)]
ceph-volume: removed the explicit use of sudo

This will allow users to run ceph-volume on systems that do
not have sudo installed.

Fixes: http://tracker.ceph.com/issues/22282
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit aee71a3f5169043f750fd768e7fea9c74309e12d)

7 years agoRevert "ceph-disk add deprecation warnings in favor of ceph-volume" 19522/head
Alfredo Deza [Thu, 14 Dec 2017 13:28:58 +0000 (08:28 -0500)]
Revert "ceph-disk add deprecation warnings in favor of ceph-volume"

This reverts commit b8bf0d047868054135592188c7ebe186181310c5.

Deprecation warnings for ceph-disk will no longer be present in any
Luminous release beyond 12.2.2 - but are still present in master and any
newer release.

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #19042 from liewegas/wip-22128
Sage Weil [Tue, 12 Dec 2017 15:04:20 +0000 (09:04 -0600)]
Merge pull request #19042 from liewegas/wip-22128

mon/OSDMonitor: fix ruleset-* to crush-* fixup

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #19355 from tchaikov/wip-18589-luminous
Kefu Chai [Fri, 8 Dec 2017 02:54:12 +0000 (10:54 +0800)]
Merge pull request #19355 from tchaikov/wip-18589-luminous

luminous: build/ops: move ceph-*-tool binaries out of ceph-test subpackage

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agodebian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 19355/head
Kefu Chai [Wed, 6 Dec 2017 02:19:09 +0000 (10:19 +0800)]
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 57bb57f76d733d6e6dea4fc0682058e4e6abe7df)

7 years agodebian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
Sage Weil [Tue, 5 Dec 2017 03:25:16 +0000 (21:25 -0600)]
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266fe653311673e07bd7c7dbb51d866f82)

7 years agodoc: add ceph-kvstore-tool's man
liuchang0812 [Fri, 18 Aug 2017 13:52:52 +0000 (21:52 +0800)]
doc: add ceph-kvstore-tool's man

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 0667db4eb61338887743d17c93a61c0e89868b08)

7 years agodebian: fix package relationships after d3ac8d18
Kefu Chai [Mon, 23 Oct 2017 12:15:16 +0000 (20:15 +0800)]
debian: fix package relationships after d3ac8d18

d3ac8d18 moves ceph-client-debug from ceph-test to ceph-base without
updating the package relationships between the two involved packages.
which results in:

dpkg: error processing archive /var/cache/apt/archives/ceph-test_12.2.1-241-g43e027b-1trusty_amd64.deb (--unpack):
 trying to overwrite '/usr/bin/ceph-client-debug', which is also in package ceph-base 10.2.10-14-gcbaddae-1trusty
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ed988fc660c5da3cb97e48e82ac5b7ad8f3bcd41)

7 years agodebian: fix package relationships after 40caf6a6
Kefu Chai [Mon, 23 Oct 2017 07:26:35 +0000 (15:26 +0800)]
debian: fix package relationships after 40caf6a6

we have issues when running upgrade tests:

dpkg: error processing archive /var/cache/apt/archives/ceph-osd_13.0.0-2201-g6cc0b41-1trusty_amd64.deb (--unpack):
trying to overwrite '/usr/bin/ceph-osdomap-tool', which is also in package ceph-test 10.2.10-14-gcbaddae-1trusty

in 40caf6a6, we moves some tools from ceph-test out into ceph-osd,
ceph-mon and ceph-base respectively. but didn't update the relationships
between these packages accordingly. this causes the upgrade failure.

see https://www.debian.org/doc/debian-policy/#document-ch-relationships
for more details on "Breaks" and "Conflicts".

the reason why the package version to be replaced/conflicted is 12.2.2
is that: i assume that this change will be backported to luminous, and
the next release of it will be 12.2.2 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 50dad805d9f635f2d8085237e94ee8fd0948dd3c)

7 years agobuild/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage
Nathan Cutler [Fri, 13 Oct 2017 08:34:52 +0000 (10:34 +0200)]
build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 40caf6a6d85fbde930b74df57a62381f6225c3fd)

7 years agobuild/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage
Nathan Cutler [Fri, 13 Oct 2017 08:34:52 +0000 (10:34 +0200)]
build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d7b493a7108a68302bc0f48337bf3c253a720266)

7 years agoMerge pull request #19299 from tchaikov/wip-pr-19196-luminous 19359/head
Alfredo Deza [Tue, 5 Dec 2017 12:01:35 +0000 (07:01 -0500)]
Merge pull request #19299 from tchaikov/wip-pr-19196-luminous

luminous: ceph-disk: fix signed integer is greater than maximum when call major

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-disk: fix signed integer is greater than maximum when call major 19299/head
Song Shun [Tue, 28 Nov 2017 03:28:43 +0000 (11:28 +0800)]
ceph-disk: fix signed integer is greater than maximum when call major
  fix signed integer is greater than maximum when call os.major
  using python 2.7.5 in Centos 7

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
(cherry picked from commit f77934b19939796d7ab52daf4dac44846a2ad162)

7 years agoMerge remote-tracking branch 'gh/luminous' into luminous
Alfredo Deza [Fri, 1 Dec 2017 14:57:44 +0000 (09:57 -0500)]
Merge remote-tracking branch 'gh/luminous' into luminous

7 years agoMerge pull request #19001 from tchaikov/wip-pr-18848-luminous
Kefu Chai [Fri, 1 Dec 2017 05:48:29 +0000 (13:48 +0800)]
Merge pull request #19001 from tchaikov/wip-pr-18848-luminous

luminous: mgr/dashboard: fix audit log loading

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19270 from tchaikov/wip-pr-19225-luminous
Kefu Chai [Fri, 1 Dec 2017 05:47:17 +0000 (13:47 +0800)]
Merge pull request #19270 from tchaikov/wip-pr-19225-luminous

luminous: qa/suites/rados/singleton: more whitelist

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/singleton: more whitelist 19270/head
Kefu Chai [Wed, 29 Nov 2017 05:51:49 +0000 (13:51 +0800)]
qa/suites/rados/singleton: more whitelist

* SLOW_OPS is normal in a cluster with flattering OSDs
* so is OBJECT_MISPLACED.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e987665fe480530a0d1664392604713828bfa5c)

7 years ago12.2.2 v12.2.2
Jenkins Build Slave User [Thu, 30 Nov 2017 14:59:27 +0000 (14:59 +0000)]
12.2.2

7 years agoMerge pull request #19240 from tchaikov/wip-22266-luminous
Kefu Chai [Thu, 30 Nov 2017 14:26:46 +0000 (22:26 +0800)]
Merge pull request #19240 from tchaikov/wip-22266-luminous

luminous: tools/ceph_monstore_tool: rebuild initial mgrmap also

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agomon/Monitor: fix statfs handling before luminous switchover happens 19243/head
Sage Weil [Wed, 29 Nov 2017 21:20:59 +0000 (15:20 -0600)]
mon/Monitor: fix statfs handling before luminous switchover happens

After the mons are luminous but before we switch over to using the
MgrStatMonitor's new info, the version on mgrstat will generally be <<
than that of pgmon, and the client will send that version with the
request.  This means that the statfs message will perpetually appear to be
in the future and fail the is_readable() check.

Fix this with any ugly hack that resets the version to 1 if we haven't
completed the luminous upgrade yet.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19230 from tchaikov/wip-22247-luminous
Gregory Farnum [Wed, 29 Nov 2017 21:25:14 +0000 (16:25 -0500)]
Merge pull request #19230 from tchaikov/wip-22247-luminous

luminous: mon/PGMap: Fix %USED calculation

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #19239 from ceph/luminous-bz1518264
Andrew Schoen [Wed, 29 Nov 2017 16:33:34 +0000 (10:33 -0600)]
Merge pull request #19239 from ceph/luminous-bz1518264

luminous: ceph-volume correctly fallback to bluestore when no objectstore is specified

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agotools/ceph_monstore_tool: rebuild initial mgrmap also 19240/head
Kefu Chai [Wed, 29 Nov 2017 12:21:33 +0000 (20:21 +0800)]
tools/ceph_monstore_tool: rebuild initial mgrmap also

Fixes: http://tracker.ceph.com/issues/22266
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f63d1da4afa3463730ecbc0be29df6375b79fa8f)

7 years agoceph-volume lvm.activate correct detection and fallback of objectstore flags 19239/head
Alfredo Deza [Tue, 28 Nov 2017 14:22:19 +0000 (09:22 -0500)]
ceph-volume lvm.activate correct detection and fallback of objectstore flags

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f0ac2dfdbc0a05cff0a5edbedca91274885b7870)

7 years agoceph-volume tests.devices.lvm verify objectstore flags in activate
Alfredo Deza [Tue, 28 Nov 2017 14:21:34 +0000 (09:21 -0500)]
ceph-volume tests.devices.lvm verify objectstore flags in activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8d22856d6c95ac3b45918765b382cae507a8d1a4)

7 years agoMerge pull request #19217 from liewegas/wip-p2p-app-warning-luminous
Sage Weil [Wed, 29 Nov 2017 14:43:07 +0000 (08:43 -0600)]
Merge pull request #19217 from liewegas/wip-p2p-app-warning-luminous

upgrade/jewel-x/parallel: debug fuse

7 years agomon/PGMap: Fix %USED calculation bug. 19230/head
Xiaoxi Chen [Mon, 27 Nov 2017 05:51:58 +0000 (22:51 -0700)]
mon/PGMap: Fix %USED calculation bug.

Previous code forgot to multiple raw_used_ratio to calculate
used byte.

Fixes: http://tracker.ceph.com/issues/22247
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit d10c6c26f9ef7372e2c95da79d23b07ce5f4e0e5)

7 years agoqa/suites/upgrade/jewel-x/point-to-point: whitelist more stuff 19217/head
Sage Weil [Tue, 28 Nov 2017 22:48:36 +0000 (16:48 -0600)]
qa/suites/upgrade/jewel-x/point-to-point: whitelist more stuff

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/upgrade/jewel-x/parallel: only mount ceph-fuse once
Sage Weil [Tue, 28 Nov 2017 21:02:18 +0000 (15:02 -0600)]
qa/suites/upgrade/jewel-x/parallel: only mount ceph-fuse once

Otherwise we do 4 mounts for no good reason.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoupgrade/jewel-x/parallel: debug fuse
Sage Weil [Tue, 28 Nov 2017 21:00:05 +0000 (15:00 -0600)]
upgrade/jewel-x/parallel: debug fuse

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19216 from liewegas/wip-p2p-app-warning-luminous
Sage Weil [Tue, 28 Nov 2017 20:48:08 +0000 (14:48 -0600)]
Merge pull request #19216 from liewegas/wip-p2p-app-warning-luminous

qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

7 years agoqa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning 19216/head
Sage Weil [Tue, 28 Nov 2017 20:46:02 +0000 (14:46 -0600)]
qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

It's generated on the mgr.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19205 from tchaikov/wip-22136-luminous
Kefu Chai [Tue, 28 Nov 2017 15:47:17 +0000 (23:47 +0800)]
Merge pull request #19205 from tchaikov/wip-22136-luminous

luminous: qa/ceph-disk: enlarge the simulated SCSI disk

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #19152 from smithfarm/wip-22235-luminous
Nathan Cutler [Tue, 28 Nov 2017 13:03:01 +0000 (14:03 +0100)]
Merge pull request #19152 from smithfarm/wip-22235-luminous

luminous: ceph-disk flake8 test fails on very old, and very new, versions of flake8

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/ceph-disk: enlarge the simulated SCSI disk 19205/head
Kefu Chai [Tue, 28 Nov 2017 06:42:31 +0000 (14:42 +0800)]
qa/ceph-disk: enlarge the simulated SCSI disk

100MB will be allocated for journal, and the remaining 100MB is for data
device. taking the inode into consideration, there will be approximately
87988 kB available for the activated OSD. and it will complain with a
"nearfull" state.

Fixes: http://tracker.ceph.com/issues/22136
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b3c159e9fb8c31d0acd75f0702080f18959f672e)

7 years agoMerge pull request #19173 from smithfarm/wip-22251-luminous
Nathan Cutler [Tue, 28 Nov 2017 02:23:09 +0000 (03:23 +0100)]
Merge pull request #19173 from smithfarm/wip-22251-luminous

luminous: build/ops: macros expanding in spec file comment

Reviewed-by: David Disseldorp <ddiss@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoMerge pull request #19179 from ceph/wip-yuriw-BP-19175-luminous
Yuri Weinstein [Mon, 27 Nov 2017 18:23:57 +0000 (10:23 -0800)]
Merge pull request #19179 from ceph/wip-yuriw-BP-19175-luminous

qa/suites/rados/rest: move rest_test from qa/suites/rest/

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoqa/suites/rados/rest: move rest_test from qa/suites/rest/ 19179/head
Sage Weil [Mon, 27 Nov 2017 16:11:51 +0000 (10:11 -0600)]
qa/suites/rados/rest: move rest_test from qa/suites/rest/

...and add more health whitelists.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ddb274669ca16b95c452b256e58a2830af10c73d)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #19177 from liewegas/wip-jewel-x-p2p
Yuri Weinstein [Mon, 27 Nov 2017 17:20:18 +0000 (09:20 -0800)]
Merge pull request #19177 from liewegas/wip-jewel-x-p2p

qa/suites/upgrade/jewel-x/point-to-point: skip ec tests when mons may be old

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoqa/suites/upgrade/jewel-x/point-to-point: skip ec tests when mons may be old 19177/head
Sage Weil [Mon, 27 Nov 2017 16:28:16 +0000 (10:28 -0600)]
qa/suites/upgrade/jewel-x/point-to-point: skip ec tests when mons may be old

Early point release mons don't handle legacy ruleset-* ec profiles, new
ones do.  Skip the ec tests that may trigger this when we are doing a
workload that races with mon upgrades.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorpm: rm macros in comments 19173/head
Ken Dreyer [Thu, 17 Aug 2017 15:19:38 +0000 (09:19 -0600)]
rpm: rm macros in comments

rpm expands all macros in a .spec file, even those in comments. Drop the
percent signs so rpm will not expand these.

This change silences rpmlint's warning about macros in comments.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 5c1e9f55d3a144c93c9c18b031db3cdc320561ef)

7 years agotests: ceph-disk: ignore E722 in flake8 test 19152/head
Nathan Cutler [Tue, 21 Nov 2017 10:36:02 +0000 (11:36 +0100)]
tests: ceph-disk: ignore E722 in flake8 test

Very old, and very new, versions of flake8 treat E722 as an error:

flake8 runtests: commands[0] | flake8 --ignore=H105,H405,E127 ceph_disk tests
ceph_disk/main.py:1575:9: E722 do not use bare except'
ceph_disk/main.py:1582:9: E722 do not use bare except'
ceph_disk/main.py:3252:5: E722 do not use bare except'
ceph_disk/main.py:3288:21: E722 do not use bare except'
ceph_disk/main.py:3296:17: E722 do not use bare except'
ceph_disk/main.py:4358:5: E722 do not use bare except'
tests/test_main.py:26:1: E722 do not use bare except'
ERROR: InvocationError: '/opt/j/ws/mkck/src/ceph-disk/.tox/flake8/bin/flake8 --ignore=H105,H405,E127 ceph_disk tests'

Fixes: http://tracker.ceph.com/issues/22207
References: https://gitlab.com/pycqa/flake8/issues/361

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3600cd7bfdca76485d2998c5da1a0dd25816d1ce)

7 years agoMerge pull request #19080 from smithfarm/wip-22212-luminous
Kefu Chai [Wed, 22 Nov 2017 05:36:58 +0000 (13:36 +0800)]
Merge pull request #19080 from smithfarm/wip-22212-luminous

luminous: tests: ceph-disk: silence deprecation warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits: silence py warnings for ceph-disk tests 19080/head
Kefu Chai [Tue, 21 Nov 2017 13:47:30 +0000 (21:47 +0800)]
qa/workunits: silence py warnings for ceph-disk tests

ceph-disk now prints "depreacted" warning message when it starts. but
the tests parses its stdout and stderr for a json string. so we need to
silence the warnings for the tests.

Fixes: http://tracker.ceph.com/issues/22154
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d44334f31704487ec3574738e75145872d9932cf)

7 years agoqa/suites/upgrade/jewel-x: move mon_warn_on_pool_no_app to global 19042/head
Sage Weil [Mon, 20 Nov 2017 20:35:48 +0000 (14:35 -0600)]
qa/suites/upgrade/jewel-x: move mon_warn_on_pool_no_app to global

Check runs on mgr.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/zabbix: ignore osd with 0 kb capacity 19048/head
Ilja Slepnev [Tue, 24 Oct 2017 17:27:59 +0000 (20:27 +0300)]
mgr/zabbix: ignore osd with 0 kb capacity

Fixes: http://tracker.ceph.com/issues/21904
Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
(cherry picked from commit e532949556453668158d0e261e59e0fae48e461f)

7 years agoMerge pull request #18989 from ceph/wip-luminous-rm22154
Andrew Schoen [Mon, 20 Nov 2017 15:24:41 +0000 (09:24 -0600)]
Merge pull request #18989 from ceph/wip-luminous-rm22154

luminous: ceph-disk create deprecation warnings

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agomon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles
Sage Weil [Mon, 20 Nov 2017 14:55:59 +0000 (08:55 -0600)]
mon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19025 from tchaikov/wip-pr-19024-luminous
Kefu Chai [Mon, 20 Nov 2017 14:55:06 +0000 (22:55 +0800)]
Merge pull request #19025 from tchaikov/wip-pr-19024-luminous

luminous: qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18945 from liewegas/wip-22128
Sage Weil [Mon, 20 Nov 2017 13:23:30 +0000 (07:23 -0600)]
Merge pull request #18945 from liewegas/wip-22128

mon/OSDMonitor: add option to fix up ruleset-* to crush-* for ec profiles

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoqa/tasks: prolong revive_osd() timeout to 6 min 19025/head
Kefu Chai [Mon, 20 Nov 2017 05:40:56 +0000 (13:40 +0800)]
qa/tasks: prolong revive_osd() timeout to 6 min

see also #17902

Fixes: http://tracker.ceph.com/issues/21474
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 749bbda07522114b99b17a4a01cfcf019520285d)

7 years agoMerge pull request #18983 from pdvian/wip-22150-luminous
Sage Weil [Sun, 19 Nov 2017 02:34:50 +0000 (20:34 -0600)]
Merge pull request #18983 from pdvian/wip-22150-luminous

luminous: os/bluestore: fix SharedBlob unregistration

7 years agomon/OSDMonitor: add option to fix up ruleset-* to crush-* for ec profiles 18945/head
Sage Weil [Wed, 15 Nov 2017 14:55:33 +0000 (08:55 -0600)]
mon/OSDMonitor: add option to fix up ruleset-* to crush-* for ec profiles

The jewel->luminous upgrade test will fail if we finish the upgrade while
a workload setting old-style ec profiles is running.  Add option to
automatically fix them up.  Warn to the cluster log when this happens.

For now, enable this option to ease upgrades and whitelist the warning.

Only include this option in luminous so that we implicitly sunset this
compatibility kludge immediately.

Fixes: http://tracker.ceph.com/issues/22128
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18751 from shinobu-x/wip-21701-luminous
Sage Weil [Sat, 18 Nov 2017 15:44:46 +0000 (09:44 -0600)]
Merge pull request #18751 from shinobu-x/wip-21701-luminous

luminous: ceph-kvstore-tool does not call bluestore's umount when exit

7 years agoMerge pull request #18750 from shinobu-x/wip-21702-luminous
Sage Weil [Sat, 18 Nov 2017 15:44:19 +0000 (09:44 -0600)]
Merge pull request #18750 from shinobu-x/wip-21702-luminous

luminous: BlueStore::umount will crash when the BlueStore is opened by start_kv_only()

7 years agoMerge pull request #18860 from liewegas/wip-filestore-rocksdb-compression-luminous
Sage Weil [Sat, 18 Nov 2017 15:41:37 +0000 (09:41 -0600)]
Merge pull request #18860 from liewegas/wip-filestore-rocksdb-compression-luminous

luminous: os/filestore: disable rocksdb compression

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
7 years agomgr/dashboard: fix audit log loading 19001/head
John Spray [Thu, 9 Nov 2017 12:33:10 +0000 (07:33 -0500)]
mgr/dashboard: fix audit log loading

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 85e1dadb287ee5216985b16b4a144dfe148d6a60)

7 years agodoc/ceph-volume create a migration section to help users coming from ceph-disk 18989/head
Alfredo Deza [Fri, 17 Nov 2017 18:10:29 +0000 (13:10 -0500)]
doc/ceph-volume create a migration section to help users coming from ceph-disk

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e433efe51481ec63bc9753a0f446fe2b12b5bb6a)

7 years agoceph-disk add deprecation warnings in favor of ceph-volume
Alfredo Deza [Fri, 17 Nov 2017 18:01:14 +0000 (13:01 -0500)]
ceph-disk add deprecation warnings in favor of ceph-volume

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Fixes: http://tracker.ceph.com/issues/22154
(cherry picked from commit c9da92e1ec8d60dc40d86630dab95e4fec4d0d30)

7 years agoMerge pull request #18973 from ceph/backport-18924
Alfredo Deza [Fri, 17 Nov 2017 17:19:36 +0000 (12:19 -0500)]
Merge pull request #18973 from ceph/backport-18924

luminous: ceph-volume: allow using a device or partition for `lvm --data`

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.devices.lvm prepare isn't bluestore specific anymore 18973/head
Alfredo Deza [Fri, 17 Nov 2017 13:41:24 +0000 (08:41 -0500)]
ceph-volume tests.devices.lvm prepare isn't bluestore specific anymore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 2f40dbac386be631ac97e2450117c218d9bf02f9)