]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
Yehuda Sadeh [Fri, 27 Jul 2018 23:22:12 +0000 (16:22 -0700)]
rgw: more lifecycle code cleanup and tooling
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 27 Jul 2018 23:21:33 +0000 (16:21 -0700)]
rgw: lifecycle utility coroutine
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 27 Jul 2018 23:21:09 +0000 (16:21 -0700)]
rgw: pubsub: have sub name as event oid prefix
dest should be unique for each subscription
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 27 Jul 2018 23:18:19 +0000 (16:18 -0700)]
rgw-admin: add a new lc get command
Useful for debugging lifecycle issues
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 27 Jul 2018 18:32:38 +0000 (11:32 -0700)]
rgw: lifecycle code cleanup
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 26 Jul 2018 00:50:37 +0000 (17:50 -0700)]
rgw: pubsub: create notif via REST api sets dest bucket
This got lost somewhere in the refactoring work
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 26 Jul 2018 00:49:43 +0000 (17:49 -0700)]
rgw: coroutine set_state() also sets retcode
Generally recode is needed for the caller, but current might need it too.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Wed, 25 Jul 2018 22:41:42 +0000 (15:41 -0700)]
rgw: pubsub: adjust event encoding
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Wed, 25 Jul 2018 20:35:42 +0000 (13:35 -0700)]
test_json_formattable: extend for formattable encoding
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Wed, 25 Jul 2018 20:35:15 +0000 (13:35 -0700)]
common/ceph_json: formattable encoding fixes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 23 Jul 2018 23:43:06 +0000 (16:43 -0700)]
rgw: pubsub: events hold a generic formattable
Instead of encoding specific object store events, make it
hold a generic formattable struct, so that pubsub can be
used in the future for registering other event types.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 23 Jul 2018 23:39:30 +0000 (16:39 -0700)]
common/formatter: json formattable is now also a formatter
This way we can construct a formattable structure by encoding
objects into it.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 9 Jul 2018 22:20:03 +0000 (15:20 -0700)]
rgw-admin: pubsub: use effective conf
the effective conf has the defaults set if needed
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 6 Jul 2018 19:53:36 +0000 (12:53 -0700)]
rgw: cleanups and data structure changes, api changes
split user topics and bucket topics, can have multiple buckets per topic
and multiple topics per bucket. Buckets don't hold subscription info.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 6 Jul 2018 00:41:55 +0000 (17:41 -0700)]
rgw: pubsub: override basic rest handler callbacks
these shouldn't do anything there.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 6 Jul 2018 00:39:58 +0000 (17:39 -0700)]
rgw: pubsub: doesn't support quota
Check if handler supports quota, pubsub doesn't.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 6 Jul 2018 00:37:00 +0000 (17:37 -0700)]
rgw: sync module instance specifies whether user writes supported
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 5 Jul 2018 04:09:14 +0000 (21:09 -0700)]
rgw: pubsub: REST api
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 5 Jul 2018 18:46:27 +0000 (11:46 -0700)]
rgw: add args.get_int()
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Wed, 4 Jul 2018 00:26:51 +0000 (17:26 -0700)]
rgw-admin: pubsub: pull sub, rm event
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 23:01:16 +0000 (16:01 -0700)]
rgw: pubsub: store event in bucket index
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 22:37:41 +0000 (15:37 -0700)]
rgw: pubsub config fixes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 21:43:44 +0000 (14:43 -0700)]
rgw: pubsub: multiple fixes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 21:43:16 +0000 (14:43 -0700)]
rgw: data sync: add start_sync() callback
The existing init_sync() is only called when the sync is first initialized,
need a call for whenever sync runs.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 18:39:39 +0000 (11:39 -0700)]
rgw: pubsub: fetch user subs
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 3 Jul 2018 03:31:34 +0000 (20:31 -0700)]
rgw-admin: pubsub related new commands
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 2 Jul 2018 23:57:23 +0000 (16:57 -0700)]
rgw: define pubsub user structures
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 2 Jul 2018 03:20:01 +0000 (20:20 -0700)]
rgw: fetch topics via a cr, other changes
this will allow fetching topics info from rados, so that we
don't need to hold in in memory.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 2 Jul 2018 01:07:58 +0000 (18:07 -0700)]
rgw: pubsub: more events coverage
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sun, 1 Jul 2018 23:46:13 +0000 (16:46 -0700)]
rgw: introduce cr singleton, use for subscriptions init
Prevent concurrent initalizations of the same subscription
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sun, 1 Jul 2018 05:07:22 +0000 (22:07 -0700)]
rgw: pubsub fixes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 23:39:04 +0000 (16:39 -0700)]
rgw: pubsub config cleanup
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 23:36:09 +0000 (16:36 -0700)]
rgw: register pubsub sync module
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 04:10:10 +0000 (21:10 -0700)]
rgw: distribution of events to subscriptions
more work required
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 03:37:35 +0000 (20:37 -0700)]
rgw: pubsub: message storage functionality
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 02:16:37 +0000 (19:16 -0700)]
rgw: new cr for simple object put
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Sat, 30 Jun 2018 01:38:08 +0000 (18:38 -0700)]
rgw_admin: new object put command
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 29 Jun 2018 22:40:27 +0000 (15:40 -0700)]
rgw: easy data access helper class
Only does put object right now.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 29 Jun 2018 04:10:40 +0000 (21:10 -0700)]
rgw: pubsub: subscription init and more
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 29 Jun 2018 00:23:11 +0000 (17:23 -0700)]
rgw: new utility crs
- get user info
- create bucket
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 29 Jun 2018 00:22:50 +0000 (17:22 -0700)]
rgw: trivial const changes
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 29 Jun 2018 00:22:23 +0000 (17:22 -0700)]
rgw: async cr template for crs that return data
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 28 Jun 2018 22:26:30 +0000 (15:26 -0700)]
rgw: create user cr
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 28 Jun 2018 22:26:07 +0000 (15:26 -0700)]
rgw: template helper for async crs
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 28 Jun 2018 22:20:52 +0000 (15:20 -0700)]
rgw: user tools don't require formatter
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 28 Jun 2018 22:20:30 +0000 (15:20 -0700)]
rgw: create a dummy flusher
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 26 Jun 2018 23:02:14 +0000 (16:02 -0700)]
rgw: initial pub sub work
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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
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>