]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoceph-volume: add inventory call to functional tests 25390/head
Jan Fajerski [Fri, 7 Dec 2018 08:59:34 +0000 (09:59 +0100)]
ceph-volume: add inventory call to functional tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
6 years agoceph-volume: add partition support to Device
Jan Fajerski [Tue, 4 Dec 2018 16:00:59 +0000 (17:00 +0100)]
ceph-volume: add partition support to Device

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
6 years agoRevert "ceph-volume tests.util ensure partitions are listed as top-level keys"
Jan Fajerski [Tue, 4 Dec 2018 07:33:53 +0000 (08:33 +0100)]
Revert "ceph-volume tests.util ensure partitions are listed as top-level keys"

This reverts commit 6dc01772245e557b73551111f7c48cc60aec0893.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
6 years agoRevert "ceph-volume util.disk include partitions as top level devices in get_devices"
Jan Fajerski [Tue, 4 Dec 2018 07:29:39 +0000 (08:29 +0100)]
Revert "ceph-volume util.disk include partitions as top level devices in get_devices"

This reverts commit 7f3c3598491e556ec1b93ea0a54f52144202fab6.
Fixes: http://tracker.ceph.com/issues/37506
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
6 years agoMerge pull request #25394 from LenzGr/master-documentation
Jos Collin [Tue, 11 Dec 2018 14:11:23 +0000 (19:41 +0530)]
Merge pull request #25394 from LenzGr/master-documentation

doc: Added some hints on how to further accelerate builds with ccache

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Erwan Velu <erwan@redhat.com>
Reviewed-by: Kai Wagner <kwagner@suse.com>
6 years agoMerge pull request #25469 from sebastian-philipp/ceph-volume-fix-join
Alfredo Deza [Tue, 11 Dec 2018 13:19:44 +0000 (08:19 -0500)]
Merge pull request #25469 from sebastian-philipp/ceph-volume-fix-join

ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #25401 from jmolmo/improve_wait_code
Sebastian Wagner [Tue, 11 Dec 2018 12:57:45 +0000 (13:57 +0100)]
Merge pull request #25401 from jmolmo/improve_wait_code

mgr/orchestrator: Simplify Orchestrator wait implementation

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
6 years agodoc: Added some hints on how to further accelerate builds with ccache 25394/head
Lenz Grimmer [Tue, 11 Dec 2018 11:54:54 +0000 (12:54 +0100)]
doc: Added some hints on how to further accelerate builds with ccache

Fixed incorrect note directives and added a section about how to speed
up development/scratch builds with ccache.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
6 years agoMerge pull request #25432 from rzarzynski/wip-bl-drop-pipesize
Kefu Chai [Tue, 11 Dec 2018 11:44:00 +0000 (19:44 +0800)]
Merge pull request #25432 from rzarzynski/wip-bl-drop-pipesize

common: drop unused get_max_pipe_size() in buffer.cc.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #25457 from trociny/wip-37581
Kefu Chai [Tue, 11 Dec 2018 11:42:13 +0000 (19:42 +0800)]
Merge pull request #25457 from trociny/wip-37581

pybind/mgr: drop unnecessary iterkeys usage to make py-3 compatible

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25471 from majianpeng/bluestore-open-blufs
Kefu Chai [Tue, 11 Dec 2018 11:41:11 +0000 (19:41 +0800)]
Merge pull request #25471 from majianpeng/bluestore-open-blufs

os/bluestore: check return value of _open_bluefs.

Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>

6 years agoceph-volume: Fix TypeError: join() takes exactly one argument (2 given) 25469/head
Sebastian Wagner [Mon, 10 Dec 2018 13:38:08 +0000 (14:38 +0100)]
ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #25404 from ptozys/master
Kefu Chai [Tue, 11 Dec 2018 06:21:22 +0000 (14:21 +0800)]
Merge pull request #25404 from ptozys/master

async/dpdk: when enable dpdk, multiple message queue defect

Reviewed-by: Haomai Wang <haomai@xsky.com>
6 years agoMerge pull request #25460 from tchaikov/wip-krb5-off
Kefu Chai [Tue, 11 Dec 2018 03:48:35 +0000 (11:48 +0800)]
Merge pull request #25460 from tchaikov/wip-krb5-off

auth: do not use GSS/KRB5 if ! HAVE_GSSAPI

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25298 from smanjara/wip-rgw-import
Kefu Chai [Tue, 11 Dec 2018 01:35:22 +0000 (09:35 +0800)]
Merge pull request #25298 from smanjara/wip-rgw-import

qa/rgw: add missing import line

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25429 from alfredodeza/wip-bz1644847
Alfredo Deza [Mon, 10 Dec 2018 17:27:37 +0000 (12:27 -0500)]
Merge pull request #25429 from alfredodeza/wip-bz1644847

ceph-volume zap devices associated with an OSD ID and/or OSD FSID

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Reviewed-by: Sebastien Han <shan@redhat.com>
6 years agoMerge pull request #25354 from ceph/wip-rm37409
Alfredo Deza [Mon, 10 Dec 2018 16:56:16 +0000 (11:56 -0500)]
Merge pull request #25354 from ceph/wip-rm37409

ceph-volume: test with multiple NVME drives

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agocommon: drop unused get_max_pipe_size() in buffer.cc. 25432/head
Radoslaw Zarzynski [Thu, 6 Dec 2018 22:58:40 +0000 (23:58 +0100)]
common: drop unused get_max_pipe_size() in buffer.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #25120 from Devp00l/wip-ecp-api-test-failure
Lenz Grimmer [Mon, 10 Dec 2018 16:25:10 +0000 (17:25 +0100)]
Merge pull request #25120 from Devp00l/wip-ecp-api-test-failure

mgr/dashboard/qa: Fix ECP creation test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #25363 from zmc/wip-fix-dash-ecp-test
Lenz Grimmer [Mon, 10 Dec 2018 15:19:05 +0000 (16:19 +0100)]
Merge pull request #25363 from zmc/wip-fix-dash-ecp-test

mgr/dashboard: Fix a broken ECP controller test

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #25391 from SUSE/wip-orchestrator-deepsea-cleanup
Sebastian Wagner [Mon, 10 Dec 2018 15:04:56 +0000 (16:04 +0100)]
Merge pull request #25391 from SUSE/wip-orchestrator-deepsea-cleanup

mgr/deepsea: check for inflight completions when starting event reader, cleanup logging and comments

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agopybind/mgr: drop unnecessary iterkeys usage to make py-3 compatible 25457/head
Mykola Golub [Mon, 10 Dec 2018 13:50:46 +0000 (13:50 +0000)]
pybind/mgr: drop unnecessary iterkeys usage to make py-3 compatible

Fixes: http://tracker.ceph.com/issues/37581
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoos/bluestore: check return value of _open_bluefs. 25471/head
Jianpeng Ma [Mon, 10 Dec 2018 13:12:10 +0000 (21:12 +0800)]
os/bluestore: check return value of _open_bluefs.

With an non-existing device as db, it met the following error messages:

sceph7: 2018-12-11 04:52:28.117 7efe74b1f600 -1 bluestore(/var/lib/ceph/mnt/osd-device-0-data) _read_fsid unparsable uuid
sceph7: 2018-12-11 04:52:28.121 7efe74b1f600 -1 bluestore(/var/lib/ceph/mnt/osd-device-0-data) _open_bluefs /var/lib/ceph/mnt/osd-device-0-data/block.db symlink exists but target unusable: (2) No such file or directory
sceph7: *** Caught signal (Segmentation fault) **
sceph7:  in thread 7efe74b1f600 thread_name:ceph-osd
sceph7:  ceph version 14.0.1-1121-gfbea0e658a (fbea0e658a94c83936d2f78c42b5a8650b9700c4) nautilus (dev)
sceph7:  1: (()+0x29e7ebc) [0x564a473f8ebc]
sceph7:  2: (()+0x12890) [0x7efe7235f890]
sceph7:  3: (__pthread_mutex_trylock()+0x14) [0x7efe72357244]
sceph7:  4: (ceph::mutex_debug_detail::mutex_debug_impl<false>::try_lock_impl()+0x1f) [0x564a46ae5091]
sceph7:  5: (ceph::mutex_debug_detail::mutex_debug_impl<false>::try_lock(bool)+0x1d) [0x564a46abd3bf]
sceph7:  6: (ceph::mutex_debug_detail::mutex_debug_impl<false>::lock(bool)+0x49) [0x564a46a9b20b]
sceph7:  7: (std::lock_guard<ceph::mutex_debug_detail::mutex_debug_impl<false> >::lock_guard(ceph::mutex_debug_detail::mutex_debug_impl<false>&)+0x2f) [0x564a46a98515]
sceph7:  8: (BlueFS::mkdir(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)+0x45) [0x564a4739a7cb]
sceph7:  9: (BlueRocksEnv::CreateDir(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)+0x3a) [0x564a473b691a]
sceph7:  10: (BlueStore::_open_db(bool, bool)+0x11b3) [0x564a471ec2b7]
sceph7:  11: (BlueStore::mkfs()+0x149a) [0x564a471f4e00]
sceph7:  12: (OSD::mkfs(CephContext*, ObjectStore*, uuid_d, int)+0xc9) [0x564a46a07c2b]
sceph7:  13: (main()+0x1bf0) [0x564a469d4850]
sceph7:  14: (__libc_start_main()+0xe7) [0x7efe70ff4b97]
sceph7:  15: (_start()+0x2a) [0x564a469d1c5a]
sceph7: 2018-12-11 04:52:28.137 7efe74b1f600 -1 *** Caught signal (Segmentation fault) **

To avoid this occur, it should check return value of _open_bluefs.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
6 years agomgr/dashboard/qa: Fix ECP creation test 25120/head
Stephan Müller [Thu, 15 Nov 2018 15:59:51 +0000 (16:59 +0100)]
mgr/dashboard/qa: Fix ECP creation test

The current solution fails on our CI-system as some outputs can have
more values and some parameters like 'w' can vary in different
environments.

As this was only tested before in a vstart cluster environment it
worked.

Through this commit only the given attributes we know to be there,
will be tested.

Fixes: https://tracker.ceph.com/issues/37275
Signed-off-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #24790 from sileht/doc-fix
Kefu Chai [Mon, 10 Dec 2018 11:16:02 +0000 (19:16 +0800)]
Merge pull request #24790 from sileht/doc-fix

doc/mgr/dashboard: fix typo in mgr ssl setup

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/ansible: Simplify Orchestrator wait implementation 25401/head
Juan Miguel Olmo Martínez [Tue, 4 Dec 2018 20:16:47 +0000 (21:16 +0100)]
mgr/ansible: Simplify Orchestrator wait implementation

- Changed return value (list to boolean) in the ansible orchestrator wait method
- Improved and simplify the orchestrator_cli wait method using a new property, should_wait in completion objects.

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
6 years agoMerge pull request #25427 from tspmelo/wip-silent-xi18n
Lenz Grimmer [Mon, 10 Dec 2018 09:05:33 +0000 (10:05 +0100)]
Merge pull request #25427 from tspmelo/wip-silent-xi18n

mgr/dashboard: Disable showing xi18n's progress

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agopybind/rados: silence GCC warning 25460/head
Kefu Chai [Mon, 10 Dec 2018 07:57:30 +0000 (15:57 +0800)]
pybind/rados: silence GCC warning

otherwise we will have following warnings:

[1/1] Cythonizing rados.pyx
warning: rados.pyx:91:4: 'rados_t' redeclared
warning: rados.pyx:92:4: 'rados_config_t' redeclared
warning: rados.pyx:93:4: 'rados_ioctx_t' redeclared

these types are already defined by librados.h, so no need to define them
again in rados.pyx .

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoauth: do not use GSS/KRB5 if ! HAVE_GSSAPI
Kefu Chai [Mon, 10 Dec 2018 07:56:26 +0000 (15:56 +0800)]
auth: do not use GSS/KRB5 if ! HAVE_GSSAPI

WITH_GSSAPI is a configure-time setting, so we should not compile krb5
related sources if this option is disabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25434 from majianpeng/osd-getpg-reserve
Kefu Chai [Mon, 10 Dec 2018 07:21:23 +0000 (15:21 +0800)]
Merge pull request #25434 from majianpeng/osd-getpg-reserve

osd/OSD: preallocate for _get_pgs/_get_pgids to avoid reallocate.

Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>

6 years agoMerge pull request #25420 from majianpeng/buffer-repeated-condtion
Kefu Chai [Mon, 10 Dec 2018 07:18:44 +0000 (15:18 +0800)]
Merge pull request #25420 from majianpeng/buffer-repeated-condtion

common/buffer: remove repeated condtion-check.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25424 from rzarzynski/wip-bl-c_str_tracker
Kefu Chai [Mon, 10 Dec 2018 07:17:43 +0000 (15:17 +0800)]
Merge pull request #25424 from rzarzynski/wip-bl-c_str_tracker

common: hint bufferlist's buffer_track_c_str accordingly.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25439 from p-na/pna-wip-cleanup
Kefu Chai [Mon, 10 Dec 2018 07:16:09 +0000 (15:16 +0800)]
Merge pull request #25439 from p-na/pna-wip-cleanup

mgr/dashboard: Remove unused code

Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge PR #25425 into master
Sage Weil [Sat, 8 Dec 2018 17:16:57 +0000 (11:16 -0600)]
Merge PR #25425 into master

* refs/pull/25425/head:
test/common/blkdev-udevadm-info-samples: add a few test cases
ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL
common/blkdev: micron SSDs don't include vendor name in ID_SERIAL
ceph-volume: update get_device_id to match in-tree implementation
common/blkdev: improve device_id generation

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agodoc: fix typo in mgr ssl setup 24790/head
Mehdi Abaakouk [Sat, 27 Oct 2018 06:29:06 +0000 (08:29 +0200)]
doc: fix typo in mgr ssl setup

Unlike `config set`, `config-key set` does not take the <who>
argument.

This change removes it from mgr ssl setup.

Signed-off-by: Mehdi Abaakouk <sileht@sileht.net>
6 years agoMerge pull request #25312 from falcon78921/wip-doc-37451
Jos Collin [Sat, 8 Dec 2018 05:42:50 +0000 (11:12 +0530)]
Merge pull request #25312 from falcon78921/wip-doc-37451

doc: broken link on troubleshooting-mon page

Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agodoc: broken link on troubleshooting-mon page 25312/head
James McClune [Thu, 29 Nov 2018 03:10:33 +0000 (22:10 -0500)]
doc: broken link on troubleshooting-mon page
Fixes: https://tracker.ceph.com/issues/37451
This fix involves adding :ref: labels to the add-or-rm-mons.rst
page. I also added :ref: labels for other headings within
add-or-rm-mons.rst (for future reference).

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge pull request #25410 from dragonylffly/rb
Kefu Chai [Sat, 8 Dec 2018 03:57:20 +0000 (11:57 +0800)]
Merge pull request #25410 from dragonylffly/rb

tools/rados: fix memory leak in error path

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25393 from Aran85/fix-agent-state
Kefu Chai [Sat, 8 Dec 2018 03:54:54 +0000 (11:54 +0800)]
Merge pull request #25393 from Aran85/fix-agent-state

osd: avoid using null agent_state

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25370 from majianpeng/sharedlru-addfunc
Kefu Chai [Sat, 8 Dec 2018 03:47:59 +0000 (11:47 +0800)]
Merge pull request #25370 from majianpeng/sharedlru-addfunc

common/shared_cache: bumps it to the front of the LRU if key existed.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #25275 into master
Patrick Donnelly [Fri, 7 Dec 2018 18:57:36 +0000 (10:57 -0800)]
Merge PR #25275 into master

* refs/pull/25275/head:
osdc/Journaler: make try_read_entry store data in contiguous memory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #25270 into master
Patrick Donnelly [Fri, 7 Dec 2018 18:56:25 +0000 (10:56 -0800)]
Merge PR #25270 into master

* refs/pull/25270/head:
mds: use uniform write handler for PQ

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #24991 into master
Patrick Donnelly [Fri, 7 Dec 2018 18:54:46 +0000 (10:54 -0800)]
Merge PR #24991 into master

* refs/pull/24991/head:
mds: disallow dumping huge caches to formatter

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #24940 into master
Patrick Donnelly [Fri, 7 Dec 2018 18:53:44 +0000 (10:53 -0800)]
Merge PR #24940 into master

* refs/pull/24940/head:
qa: add test for getfattr ceph.dir.pin
client: support getfattr ceph.dir.pin extended attribute

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoceph-volume tests.functional.batch symlink test_zap to all batch scenarios 25429/head
Alfredo Deza [Fri, 7 Dec 2018 17:29:45 +0000 (12:29 -0500)]
ceph-volume tests.functional.batch symlink test_zap to all batch scenarios

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge PR #24748 into master
Patrick Donnelly [Fri, 7 Dec 2018 18:50:57 +0000 (10:50 -0800)]
Merge PR #24748 into master

* refs/pull/24748/head:
qa: use 6h timeout for pjd test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoceph-volume tests.functional.batch add test_zap yaml to tox.ini
Alfredo Deza [Fri, 7 Dec 2018 17:28:37 +0000 (12:28 -0500)]
ceph-volume tests.functional.batch add test_zap yaml to tox.ini

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume tests.functional.batch create a separate test_zap playbook
Alfredo Deza [Fri, 7 Dec 2018 17:08:44 +0000 (12:08 -0500)]
ceph-volume tests.functional.batch create a separate test_zap playbook

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume lvm.zap update success message for OSD IDs
Alfredo Deza [Fri, 7 Dec 2018 12:53:43 +0000 (07:53 -0500)]
ceph-volume lvm.zap update success message for OSD IDs

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agodoc/man/ceph-volume add zapping by osd-id examples
Alfredo Deza [Thu, 6 Dec 2018 20:30:38 +0000 (15:30 -0500)]
doc/man/ceph-volume add zapping by osd-id examples

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agodoc/ceph-volume add zapping by osd-id examples
Alfredo Deza [Thu, 6 Dec 2018 20:30:22 +0000 (15:30 -0500)]
doc/ceph-volume add zapping by osd-id examples

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #25347 from smithfarm/wip-37485
Nathan Cutler [Fri, 7 Dec 2018 17:22:29 +0000 (18:22 +0100)]
Merge pull request #25347 from smithfarm/wip-37485

build/ops: rpm: make ceph-grafana-dashboards own its directories

Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #25414 from ivancich/wip-rgw-user-stats-mismatch
Casey Bodley [Fri, 7 Dec 2018 16:53:30 +0000 (11:53 -0500)]
Merge pull request #25414 from ivancich/wip-rgw-user-stats-mismatch

rgw: fix bad user stats on versioned bucket after reshard

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agotest/common/blkdev-udevadm-info-samples: add a few test cases 25425/head
Sage Weil [Thu, 6 Dec 2018 17:03:35 +0000 (11:03 -0600)]
test/common/blkdev-udevadm-info-samples: add a few test cases

The erwan1 one unfortunately has no model information :(.  The other two
work with the current implementation, although erwan.v1.sdb has
"Shared_PERC8" for the model, and I suspect the Shared_ prefix is not
part of the real model?

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-volume: Micron SSDs don't include vendor name in ID_SERIAL
Sage Weil [Thu, 6 Dec 2018 16:02:35 +0000 (10:02 -0600)]
ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/blkdev: micron SSDs don't include vendor name in ID_SERIAL
Sage Weil [Thu, 6 Dec 2018 16:02:20 +0000 (10:02 -0600)]
common/blkdev: micron SSDs don't include vendor name in ID_SERIAL

According to Ryan Meredith <rmeredith@micron.com>, the NVMes begin with
MTFD, but their other devices use the standard Micron_$model_$serial.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-volume: update get_device_id to match in-tree implementation
Sage Weil [Thu, 6 Dec 2018 15:43:36 +0000 (09:43 -0600)]
ceph-volume: update get_device_id to match in-tree implementation

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/blkdev: improve device_id generation
Sage Weil [Thu, 6 Dec 2018 15:27:34 +0000 (09:27 -0600)]
common/blkdev: improve device_id generation

A few interesting cases:

1. autriche (my desktop)

$ sudo udevadm info /dev/nvme0n1 | grep ID_
E: ID_PART_TABLE_TYPE=gpt
E: ID_PART_TABLE_UUID=c83d5616-676b-4667-bcf3-c82fd4fc7e64
E: ID_SERIAL=Samsung SSD 960 EVO 250GB_S3ESNX0J958081E
E: ID_SERIAL_SHORT=S3ESNX0J958081E

- no ID_MODEL or ID_VENDOR
-> use ID_SERIAL

2. my dev box

gnit:~ (master) 09:09 AM $ udevadm info /dev/nvme0n1 | grep ID_
E: ID_FS_TYPE=xfs
E: ID_FS_USAGE=filesystem
E: ID_FS_UUID=860d4503-9c9d-4c24-af09-4266b7717a5c
E: ID_FS_UUID_ENC=860d4503-9c9d-4c24-af09-4266b7717a5c
E: ID_MODEL=INTEL SSDPEDMD400G4
E: ID_PATH=pci-0000:82:00.0-nvme-1
E: ID_PATH_TAG=pci-0000_82_00_0-nvme-1
E: ID_SERIAL=INTEL SSDPEDMD400G4_CVFT520200G7400BGN
E: ID_SERIAL_SHORT=CVFT520200G7400BGN
E: ID_WWN=nvme.8086-43564654353230323030473734303042474e-494e54454c205353445045444d443430304734-00000001

- no ID_VENDOR
-> ID_MODEL + ID_SERIAL_SHORT

gnit:~ (master) 09:12 AM $ udevadm info /dev/sda | grep ID_
E: ID_ATA=1
E: ID_ATA_DOWNLOAD_MICROCODE=1
E: ID_ATA_FEATURE_SET_HPA=1
E: ID_ATA_FEATURE_SET_HPA_ENABLED=1
E: ID_ATA_FEATURE_SET_PM=1
E: ID_ATA_FEATURE_SET_PM_ENABLED=1
E: ID_ATA_FEATURE_SET_SECURITY=1
E: ID_ATA_FEATURE_SET_SECURITY_ENABLED=0
E: ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=2
E: ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=2
E: ID_ATA_FEATURE_SET_SECURITY_FROZEN=1
E: ID_ATA_FEATURE_SET_SMART=1
E: ID_ATA_FEATURE_SET_SMART_ENABLED=1
E: ID_ATA_ROTATION_RATE_RPM=0
E: ID_ATA_SATA=1
E: ID_ATA_SATA_SIGNAL_RATE_GEN1=1
E: ID_ATA_SATA_SIGNAL_RATE_GEN2=1
E: ID_ATA_WRITE_CACHE=1
E: ID_ATA_WRITE_CACHE_ENABLED=1
E: ID_BUS=ata
E: ID_MODEL=INTEL_SSDSC2BB240G4
E: ID_MODEL_ENC=INTEL\x20SSDSC2BB240G4\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20
E: ID_PART_TABLE_TYPE=dos
E: ID_PART_TABLE_UUID=bb35118c
E: ID_PATH=pci-0000:00:1f.2-ata-1
E: ID_PATH_TAG=pci-0000_00_1f_2-ata-1
E: ID_REVISION=D2010355
E: ID_SERIAL=INTEL_SSDSC2BB240G4_BTWL3414034J240NGN
E: ID_SERIAL_SHORT=BTWL3414034J240NGN
E: ID_TYPE=disk
E: ID_WWN=0x55cd2e404b4e47d8
E: ID_WWN_WITH_EXTENSION=0x55cd2e404b4e47d8

- no ID_VENDOR
-> ID_MODEL + ID_SERIAL_SHORT

3. mira lab machine (old areca controller in JBOD mode, I think)

root@mira055:~# udevadm info /dev/sdb | grep ID_
E: ID_BUS=scsi
E: ID_MODEL=HUS724040ALA640
E: ID_MODEL_ENC=HUS724040ALA640\x20
E: ID_PART_TABLE_TYPE=gpt
E: ID_PART_TABLE_UUID=957b2db6-de5c-46cb-a672-243fa12d55b2
E: ID_PATH=pci-0000:01:00.0-scsi-0:0:0:1
E: ID_PATH_TAG=pci-0000_01_00_0-scsi-0_0_0_1
E: ID_REVISION=R001
E: ID_SCSI=1
E: ID_SCSI_SERIAL=PN1334PBH5JMJS
E: ID_SERIAL=2001b4d2058da3a00
E: ID_SERIAL_SHORT=001b4d2058da3a00
E: ID_TYPE=disk
E: ID_VENDOR=HGST
E: ID_VENDOR_ENC=HGST\x20\x20\x20\x20

- ID_VENDOR and ID_MODEL
- ID_MODEL doesn't include vendor name + _
- ID_SERIAL and _SHORT are junk
- ID_SCSI_SERIAL has the serial number!  wth
-> ID_VENDOR + ID_MODEL + ID_SCSI_SHORT

Added a bunch of udevadm output samples.

So,

- if ID_VENDOR + ID_MODEL + ID_SCSI_SERIAL are present, use them.
- if ID_MODEL + ID_SERIAL_SHORT are present, use them
- if ID_SERIAL is present, use it.
- fail

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agobuild/ops: rpm: make ceph-grafana-dashboards own its directories on SUSE 25347/head
Nathan Cutler [Fri, 30 Nov 2018 12:11:13 +0000 (13:11 +0100)]
build/ops: rpm: make ceph-grafana-dashboards own its directories on SUSE

This is only required to get the spec file to build in the OpenSUSE
Build Service (OBS). Also, this change could potentially make the
package impossible to install together with grafana (if the latter
owns the same directories with different ownership/permissions).
Therefore, make the change specific to SUSE.

Fixes: http://tracker.ceph.com/issues/37485
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
6 years agomgr/dashboard: Remove unused code 25439/head
Patrick Nawracay [Fri, 7 Dec 2018 09:34:51 +0000 (09:34 +0000)]
mgr/dashboard: Remove unused code

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
6 years agoMerge pull request #25415 from dillaman/wip-rbd-cli-integration
Mykola Golub [Fri, 7 Dec 2018 08:19:24 +0000 (10:19 +0200)]
Merge pull request #25415 from dillaman/wip-rbd-cli-integration

test/cli-integration/rbd: added new parent image attributes

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25234 from jan--f/prometheus-add-iface-objstore-metadata
Jan Fajerski [Fri, 7 Dec 2018 08:13:23 +0000 (09:13 +0100)]
Merge pull request #25234 from jan--f/prometheus-add-iface-objstore-metadata

mgr/prometheus: add interface and objectstore to osd metadata

6 years agoosd/OSD: preallocate for _get_pgs/_get_pgids to avoid reallocate. 25434/head
Jianpeng Ma [Fri, 7 Dec 2018 03:13:09 +0000 (11:13 +0800)]
osd/OSD: preallocate for _get_pgs/_get_pgids to avoid reallocate.

num_pgs is the most accurate value fore reserve when call _get_pgs &
_get_pgids.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
6 years agoMerge pull request #19454 from ifed01/wip-ifed-pool-sizes
Kefu Chai [Fri, 7 Dec 2018 02:35:23 +0000 (10:35 +0800)]
Merge pull request #19454 from ifed01/wip-ifed-pool-sizes

osd: per-pool osd stats collection

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25243 into master
Sage Weil [Thu, 6 Dec 2018 23:22:57 +0000 (17:22 -0600)]
Merge PR #25243 into master

* refs/pull/25243/head:
osdc/Objecter: update op_target_t::paused in _calc_target

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25399 into master
Sage Weil [Thu, 6 Dec 2018 23:22:23 +0000 (17:22 -0600)]
Merge PR #25399 into master

* refs/pull/25399/head:
osd: requeue waiting peering events from deleted slots in unprime_split_children

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #25428 from trociny/wip-open-flags
Jason Dillaman [Thu, 6 Dec 2018 22:27:51 +0000 (17:27 -0500)]
Merge pull request #25428 from trociny/wip-open-flags

librbd: corrected usage of ImageState::open flag parameter

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25430 from cbodley/wip-pr-22539
Matt Benjamin [Thu, 6 Dec 2018 21:41:57 +0000 (16:41 -0500)]
Merge pull request #25430 from cbodley/wip-pr-22539

rgw: rgwgc:process coredump in some special case

6 years agorgw: rgwgc:process coredump in some special case。 Gc processes obja, objb, objc in... 25430/head
sdnets [Wed, 13 Jun 2018 01:32:16 +0000 (09:32 +0800)]
rgw: rgwgc:process coredump in some special case。 Gc processes obja, objb, objc in order and pool of objb is deleted (obja and objc is in the same pool and pool exits). RGW will coredump as ctx->io_ctx_impl is an empty point during delete objc.
Fixes:http://tracker.ceph.com/issues/23199

Signed-off-by: zhaokun <develop@hikdata.com>
6 years agocommon: eradicate buffer_track_c_str in bufferlist. 25424/head
Radoslaw Zarzynski [Thu, 6 Dec 2018 18:04:37 +0000 (19:04 +0100)]
common: eradicate buffer_track_c_str in bufferlist.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #17789 from shashalu/fix-bucket-link-dm
Casey Bodley [Thu, 6 Dec 2018 20:31:58 +0000 (15:31 -0500)]
Merge pull request #17789 from shashalu/fix-bucket-link-dm

rgw: fix version bucket stats

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
6 years agoMerge pull request #21622 from tianshan/misc_es_fix
Casey Bodley [Thu, 6 Dec 2018 20:31:18 +0000 (15:31 -0500)]
Merge pull request #21622 from tianshan/misc_es_fix

rgw: some fix for es sync

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge pull request #24162 from zhangsw/cleanup-rgw-acl_op
Casey Bodley [Thu, 6 Dec 2018 20:30:26 +0000 (15:30 -0500)]
Merge pull request #24162 from zhangsw/cleanup-rgw-acl_op

rgw: remove repetitive conditional statement in RGWHandler_REST_Obj_S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24683 from linuxbox2/wip-v2-url-meta
Casey Bodley [Thu, 6 Dec 2018 20:30:04 +0000 (15:30 -0500)]
Merge pull request #24683 from linuxbox2/wip-v2-url-meta

rgw: handle S3 version 2 pre-signed urls with meta-data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25142 from ivancich/wip-rgw-reshard-cleanup
Casey Bodley [Thu, 6 Dec 2018 20:29:38 +0000 (15:29 -0500)]
Merge pull request #25142 from ivancich/wip-rgw-reshard-cleanup

rgw: reshard clean-up and associated commits

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #25406 from taoCH/wip-librgw-sync-user-regularly
Casey Bodley [Thu, 6 Dec 2018 20:28:47 +0000 (15:28 -0500)]
Merge pull request #25406 from taoCH/wip-librgw-sync-user-regularly

rgw_file: user info never synced since librgw init

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agoceph-volume tests.functional.simple add zap by osd id to xenial
Alfredo Deza [Thu, 6 Dec 2018 20:18:06 +0000 (15:18 -0500)]
ceph-volume tests.functional.simple add zap by osd id to xenial

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume tests.functional.simple add zap by osd id to centos7
Alfredo Deza [Thu, 6 Dec 2018 20:17:55 +0000 (15:17 -0500)]
ceph-volume tests.functional.simple add zap by osd id to centos7

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoceph-volume tests.lvm verify associated lvs by osd id+fsid behavior
Alfredo Deza [Thu, 6 Dec 2018 20:00:00 +0000 (15:00 -0500)]
ceph-volume tests.lvm verify associated lvs by osd id+fsid behavior

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agolibrbd: corrected usage of ImageState::open flag parameter 25428/head
Mykola Golub [Thu, 6 Dec 2018 19:34:56 +0000 (21:34 +0200)]
librbd: corrected usage of ImageState::open flag parameter

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agomgr/dashboard: Disable showing xi18n's progress 25427/head
Tiago Melo [Thu, 6 Dec 2018 18:53:10 +0000 (18:53 +0000)]
mgr/dashboard: Disable showing xi18n's progress

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoceph-volume: add tests for Device.lvm_size 25354/head
Andrew Schoen [Thu, 6 Dec 2018 18:45:10 +0000 (12:45 -0600)]
ceph-volume: add tests for Device.lvm_size

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: set a lvm_size property on the fakedevice fixture
Andrew Schoen [Thu, 6 Dec 2018 18:37:56 +0000 (12:37 -0600)]
ceph-volume: set a lvm_size property on the fakedevice fixture

This is so tests can continue to set sys_api['size'] and the code
can retrieve that as Device.lvm_size

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: create 12GB devices with virtualbox
Andrew Schoen [Thu, 6 Dec 2018 18:27:23 +0000 (12:27 -0600)]
ceph-volume: create 12GB devices with virtualbox

This increases the size of the HDD devices that virtualbox creates so
that they can pass the validator for filestore single type tests
locally.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: use Device.lvm_size in batch strategy validators
Andrew Schoen [Thu, 6 Dec 2018 16:49:03 +0000 (10:49 -0600)]
ceph-volume: use Device.lvm_size in batch strategy validators

This will validate the devices on the size that lvm will allow to be
used, not the raw physical size of the device.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: use Device.lvm_size in batch strategies
Andrew Schoen [Thu, 6 Dec 2018 15:56:58 +0000 (09:56 -0600)]
ceph-volume: use Device.lvm_size in batch strategies

We should show the user what the size of the device will be after lvm
creates a pv out of it. This way there isn't a discrepency between the
sizes that are reported to the user and what is actually created.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: adds a lvm_size property to util.Device
Andrew Schoen [Wed, 5 Dec 2018 15:43:28 +0000 (09:43 -0600)]
ceph-volume: adds a lvm_size property to util.Device

This will give us the size lvm should report because it takes into
account the 1GB physical extent size we set.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: batch mixed type scenarios have no need to calulate data size
Andrew Schoen [Tue, 4 Dec 2018 20:23:47 +0000 (14:23 -0600)]
ceph-volume: batch mixed type scenarios have no need to calulate data size

We know with a mixed type scenario the device used for data will be used
at 100% capacity. This means we do not need to be explict when asking
for the size of the data lvs, which avoids rounding errors with very
small device sizes.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: add /dev/nvme1n1 to filestore mixed type batch tests
Andrew Schoen [Fri, 30 Nov 2018 19:20:09 +0000 (13:20 -0600)]
ceph-volume: add /dev/nvme1n1 to filestore mixed type batch tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: set use_large_block_db in validate, not compute
Andrew Schoen [Fri, 30 Nov 2018 17:55:27 +0000 (11:55 -0600)]
ceph-volume: set use_large_block_db in validate, not compute

The self.use_large_block_db property was never getting set because
the block in compute was never called as block_db_size was reset in
validate if it was 0. We needed to set self.use_large_block_db in
validate instead of compute.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: set a 1G extent size when creating vgs
Andrew Schoen [Thu, 29 Nov 2018 19:44:07 +0000 (13:44 -0600)]
ceph-volume: set a 1G extent size when creating vgs

This allows us to create larger lvs than the default of 4m
and is easier to reason about when sizing the lvs as everythign is
reported as GBs.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: set block_db_size to 9GB in centos7 mixed type test
Andrew Schoen [Wed, 28 Nov 2018 16:10:24 +0000 (10:10 -0600)]
ceph-volume: set block_db_size to 9GB in centos7 mixed type test

This is to enable testing of the --block-db-size flag

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: use two NVME drives in centos7 mixed_type tests
Andrew Schoen [Wed, 28 Nov 2018 16:05:45 +0000 (10:05 -0600)]
ceph-volume: use two NVME drives in centos7 mixed_type tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: use extents instead of size when creating block.db lvs
Andrew Schoen [Tue, 27 Nov 2018 23:39:38 +0000 (17:39 -0600)]
ceph-volume: use extents instead of size when creating block.db lvs

In the batch command use extents instead of size when creating lvs. This
gives a more precise size and avoids rounding errors.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: create two NVME drives for testing
Andrew Schoen [Tue, 27 Nov 2018 23:34:10 +0000 (17:34 -0600)]
ceph-volume: create two NVME drives for testing

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: bz#1650306

6 years agoMerge pull request #25423 from p-na/wip-pna-fix-pool-edit
Lenz Grimmer [Thu, 6 Dec 2018 16:16:21 +0000 (17:16 +0100)]
Merge pull request #25423 from p-na/wip-pna-fix-pool-edit

mgr/dashboard: Fix renaming of pools

Reviewed-by: Laura Paduano <lpaduano@suse.com>
6 years agomon/PGMap: Partially unify 'ceph pg stat' output with 'ceph df' 19454/head
Igor Fedotov [Thu, 29 Nov 2018 13:56:08 +0000 (16:56 +0300)]
mon/PGMap: Partially unify 'ceph pg stat' output with 'ceph df'

Global stats parameter (like 'available' or 'total') are dumped under the
same names now).

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
6 years agopybind/diskprediction: rename raw_bytes_used field reference.
Igor Fedotov [Thu, 29 Nov 2018 12:32:18 +0000 (15:32 +0300)]
pybind/diskprediction: rename raw_bytes_used field reference.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
6 years agopybind/mgr/telegraf: rename raw_bytes_used field reference.
Igor Fedotov [Thu, 29 Nov 2018 12:26:47 +0000 (15:26 +0300)]
pybind/mgr/telegraf: rename raw_bytes_used field reference.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
6 years agoqa/mgr: rename raw_bytes_used field reference.
Igor Fedotov [Thu, 29 Nov 2018 12:22:53 +0000 (15:22 +0300)]
qa/mgr: rename raw_bytes_used field reference.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>