RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
92,839 Commits 226 Branches 396 Tags 1.7 GiB
68f52c486a
Commit Graph

92839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
68f52c486a
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>
 2018-12-11 19:42:13 +08:00
Kefu Chai
329f72dfb8
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>
 2018-12-11 19:41:11 +08:00
Kefu Chai
b88de88059
Merge pull request #25404 from ptozys/master 
async/dpdk: when enable dpdk, multiple message queue defect

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2018-12-11 14:21:22 +08:00
Kefu Chai
7582f0b5fe
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>
 2018-12-11 11:48:35 +08:00
Kefu Chai
3a83bb2ed5
Merge pull request #25298 from smanjara/wip-rgw-import 
qa/rgw: add missing import line

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-12-11 09:35:22 +08:00
Alfredo Deza
1ceef08d07
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>
 2018-12-10 12:27:37 -05:00
Alfredo Deza
5f72143d3f
Merge pull request #25354 from ceph/wip-rm37409 
ceph-volume: test with multiple NVME drives

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2018-12-10 11:56:16 -05:00
Lenz Grimmer
2dd184346a
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>
 2018-12-10 17:25:10 +01:00
Lenz Grimmer
a8d23bc970
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>
 2018-12-10 16:19:05 +01:00
Sebastian Wagner
8d459de570
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>
 2018-12-10 16:04:56 +01:00
Mykola Golub
7d1c7ec331 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>
 2018-12-10 13:50:46 +00:00
Jianpeng Ma
4d0001fd6f 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 (fbea0e658a) 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>
 2018-12-10 21:12:10 +08:00
Stephan Müller
19b039c28e 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>
 2018-12-10 12:37:03 +01:00
Kefu Chai
fb48a775b5
Merge pull request #24790 from sileht/doc-fix 
doc/mgr/dashboard: fix typo in mgr ssl setup

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-12-10 19:16:02 +08:00
Lenz Grimmer
84f25b025d
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>
 2018-12-10 10:05:33 +01:00
Kefu Chai
4a9082d33b 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>
 2018-12-10 15:57:31 +08:00
Kefu Chai
1b8c1a14d0 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>
 2018-12-10 15:56:33 +08:00
Kefu Chai
cc5ff30e98
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>
 2018-12-10 15:21:23 +08:00
Kefu Chai
09da420161
Merge pull request #25420 from majianpeng/buffer-repeated-condtion 
common/buffer: remove repeated condtion-check.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-12-10 15:18:44 +08:00
Kefu Chai
df0fa55c35
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>
 2018-12-10 15:17:43 +08:00
Kefu Chai
c147b2c163
Merge pull request #25439 from p-na/pna-wip-cleanup 
mgr/dashboard: Remove unused code

Reviewed-by: Stephan Müller <smueller@suse.com>
 2018-12-10 15:16:09 +08:00
Sage Weil
cc9968dacc 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>
 2018-12-08 11:16:57 -06:00
Mehdi Abaakouk
2d7ed8ad15 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>
 2018-12-08 15:11:35 +01:00
Jos Collin
6672ffef2b
Merge pull request #25312 from falcon78921/wip-doc-37451 
doc: broken link on troubleshooting-mon page

Reviewed-by: Jos Collin <jcollin@redhat.com>
 2018-12-08 11:12:50 +05:30
James McClune
ca05e45696 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>
 2018-12-07 23:15:43 -05:00
Kefu Chai
c1660ad10c
Merge pull request #25410 from dragonylffly/rb 
tools/rados: fix memory leak in error path

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-12-08 11:57:20 +08:00
Kefu Chai
a7608b175f
Merge pull request #25393 from Aran85/fix-agent-state 
osd: avoid using null agent_state

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-12-08 11:54:54 +08:00
Kefu Chai
057060fc13
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>
 2018-12-08 11:47:59 +08:00
Patrick Donnelly
115a2645f1
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>
 2018-12-07 10:57:36 -08:00
Patrick Donnelly
4b9327bfca
Merge PR #25270 into master 
* refs/pull/25270/head:
	mds: use uniform write handler for PQ

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2018-12-07 10:56:25 -08:00
Patrick Donnelly
7518b52c31
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>
 2018-12-07 10:54:46 -08:00
Patrick Donnelly
9789f37fa5
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>
 2018-12-07 10:53:44 -08:00
Alfredo Deza
d3c0058911 ceph-volume tests.functional.batch symlink test_zap to all batch scenarios 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 13:52:44 -05:00
Patrick Donnelly
4432aa5f26
Merge PR #24748 into master 
* refs/pull/24748/head:
	qa: use 6h timeout for pjd test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-12-07 10:50:57 -08:00
Alfredo Deza
25843b7629 ceph-volume tests.functional.batch add test_zap yaml to tox.ini 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 12:30:27 -05:00
Alfredo Deza
6b8f0d483a ceph-volume tests.functional.batch create a separate test_zap playbook 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 12:30:27 -05:00
Alfredo Deza
73bb17f79a ceph-volume lvm.zap update success message for OSD IDs 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 12:30:27 -05:00
Alfredo Deza
acbf7c9b2a doc/man/ceph-volume add zapping by osd-id examples 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 12:30:27 -05:00
Alfredo Deza
f82304f4b5 doc/ceph-volume add zapping by osd-id examples 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-12-07 12:30:27 -05:00
Nathan Cutler
a58a29e0bf
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>
 2018-12-07 18:22:29 +01:00
Casey Bodley
358fd01385
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>
 2018-12-07 11:53:30 -05:00
Sage Weil
eef391d380 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>
 2018-12-07 09:50:13 -06:00
Sage Weil
3e4a638c93 ceph-volume: Micron SSDs don't include vendor name in ID_SERIAL 
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-12-07 09:50:13 -06:00
Sage Weil
3a4ebc60ed 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>
 2018-12-07 09:50:13 -06:00
Sage Weil
c967dbf81f ceph-volume: update get_device_id to match in-tree implementation 
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-12-07 09:50:13 -06:00
Sage Weil
e9c3441b68 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>
 2018-12-07 09:50:13 -06:00
Nathan Cutler
c1083b2f4f 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>
 2018-12-07 16:16:42 +01:00
Patrick Nawracay
e704c1b4aa mgr/dashboard: Remove unused code 
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
 2018-12-07 09:34:51 +00:00
Mykola Golub
af96e16271
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>
 2018-12-07 10:19:24 +02:00
Jan Fajerski
73caf0a816
Merge pull request #25234 from jan--f/prometheus-add-iface-objstore-metadata 
mgr/prometheus: add interface and objectstore to osd metadata
 2018-12-07 09:13:23 +01:00