]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoos: do not inject read EIO on meta pool objects
Sage Weil [Sat, 17 Feb 2018 16:14:10 +0000 (10:14 -0600)]
os: do not inject read EIO on meta pool objects

Avoid EIO on, say, osdmaps until we fix
http://tracker.ceph.com/issues/23029

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest_filestore_idempotent_sequence: put txn object in each collection
Sage Weil [Fri, 16 Feb 2018 22:50:04 +0000 (16:50 -0600)]
test_filestore_idempotent_sequence: put txn object in each collection

The transactions are idependent in each collection/sequencer, so we
can't record to a single txn object with racing transactions.  Fix
it by doing one in each collection, and when reading the latest op,
use the highest txn value we see.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_objectstore: fix split ordering
Sage Weil [Mon, 12 Feb 2018 23:50:42 +0000 (17:50 -0600)]
ceph_test_objectstore: fix split ordering

We need to flush between split.  This requirement unfortunately
doesn't quite go away with the FileStore tracking.

Also, flush for each batch.  This is just because the test environment
may have a low open file ulimit.  (The old code did apply_transaction,
so it's functionally equivalent to this.)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: keep PG alive until the final onreadable context under old ch is done
Sage Weil [Fri, 9 Feb 2018 23:36:44 +0000 (17:36 -0600)]
osd/PG: keep PG alive until the final onreadable context under old ch is done

The onreadable completions go through a finisher; add a final event
in that stream that keeps the PG alive while prior events flush.

flush() isn't quite sufficient since it doesn't wait for the finisher
events to flush too--only for the actual apply to have happened.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: wait_for_apply on get_omap_iterator
Sage Weil [Mon, 12 Feb 2018 19:45:55 +0000 (13:45 -0600)]
os/filestore: wait_for_apply on get_omap_iterator

Note that we don't need to worry about the internal get_omap_iterator
callrs (e.g., omap_rmkeyrange) because the apply thread does these
ops sequentially and in order.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: flush ch before pg delete
Sage Weil [Fri, 9 Feb 2018 15:13:53 +0000 (09:13 -0600)]
osd/PG: flush ch before pg delete

Make sure SnapMapper's ContainerContexts don't outlive the mapper
itself.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-objectstore-tool: fix SnapMapper vs import
Sage Weil [Thu, 8 Feb 2018 17:16:22 +0000 (11:16 -0600)]
ceph-objectstore-tool: fix SnapMapper vs import

- keep mapper around for duration of import
- flush in-flight requests before tearing it down.  This is necessary
because the mapper still uses onreadable.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: remove last_updated_applied, op_applied()
Sage Weil [Thu, 8 Feb 2018 15:29:30 +0000 (09:29 -0600)]
osd/PG: remove last_updated_applied, op_applied()

No longer used or needed, yay!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PGBackend: drop on_applied callback for submit_transaction
Sage Weil [Wed, 7 Feb 2018 23:05:46 +0000 (17:05 -0600)]
osd/PGBackend: drop on_applied callback for submit_transaction

This removes a ton of tracking for ReplicatedBackend.  ECBackend needs
to keep most of it so that it can track in-flight applies on legacy
peer OSDs.  We can remove this post-nautilus.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PGBackend: remove on_applied() from interface
Sage Weil [Wed, 7 Feb 2018 23:03:13 +0000 (17:03 -0600)]
osd/PGBackend: remove on_applied() from interface

PrimaryLogPG calls it synchronously, on its own, after
submit_transaction.  That means the backends no longer need to
track it or call back to it.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: drop scrub machinery to wait for last_updated_applied
Sage Weil [Thu, 8 Feb 2018 14:51:23 +0000 (08:51 -0600)]
osd/PG: drop scrub machinery to wait for last_updated_applied

This is no longer needed--queued writes are immediately readable.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: clean out applied members of RepGather
Sage Weil [Wed, 7 Feb 2018 22:50:40 +0000 (16:50 -0600)]
osd/PrimaryLogPG: clean out applied members of RepGather

on_applied
rep_done (same as all_committed)
applies_with_commit (no longer relevant)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: drop repop_all_applied()
Sage Weil [Wed, 7 Feb 2018 22:45:54 +0000 (16:45 -0600)]
osd/PrimaryLogPG: drop repop_all_applied()

We don't need to eval_repop() since we know nothing has committed yet.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: remove obsolete comment in _delete_some()
Sage Weil [Wed, 7 Feb 2018 22:18:21 +0000 (16:18 -0600)]
osd/PG: remove obsolete comment in _delete_some()

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ECBackend: unify commit+applied msg; drop applied callback
Sage Weil [Sat, 27 Jan 2018 23:51:20 +0000 (17:51 -0600)]
osd/ECBackend: unify commit+applied msg; drop applied callback

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ReplicatedBackend: do applied work synchronously
Sage Weil [Sat, 27 Jan 2018 21:14:47 +0000 (15:14 -0600)]
osd/ReplicatedBackend: do applied work synchronously

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: call op_applied directly after queueing txn
Sage Weil [Sat, 27 Jan 2018 21:10:08 +0000 (15:10 -0600)]
osd/PrimaryLogPG: call op_applied directly after queueing txn

There is still more cleanup to be done, here!  Later.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: stop holding PG ref until on_applied on PG removal
Sage Weil [Sat, 27 Jan 2018 21:07:14 +0000 (15:07 -0600)]
osd/PG: stop holding PG ref until on_applied on PG removal

Not necessary--the backend should manage the lifecycle.  We just own
one ref anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: make C_DeleteMore called only once (on safe, not applied)
Sage Weil [Sat, 27 Jan 2018 21:06:05 +0000 (15:06 -0600)]
osd/PG: make C_DeleteMore called only once (on safe, not applied)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: drop C_UpdateLastRollbackInfoTrimmedToApplied
Sage Weil [Sat, 27 Jan 2018 21:00:02 +0000 (15:00 -0600)]
osd: drop C_UpdateLastRollbackInfoTrimmedToApplied

The variable can probably be removed as well, but leaving that for another
time.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PGBackend: drop on_local_applied_async
Sage Weil [Sat, 27 Jan 2018 19:48:14 +0000 (13:48 -0600)]
osd/PGBackend: drop on_local_applied_async

Unused!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: drop unnecessary OSDMap pinning
Sage Weil [Sat, 27 Jan 2018 19:45:41 +0000 (13:45 -0600)]
osd: drop unnecessary OSDMap pinning

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: remove ondisk_{read,write}_lock infra
Sage Weil [Sat, 27 Jan 2018 19:24:22 +0000 (13:24 -0600)]
osd/PrimaryLogPG: remove ondisk_{read,write}_lock infra

This is no longer needed.  FileStore was the only backend doing async
applies, and it now blocks until apply all on its own.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/ObjectStore: drop most queue_transactions() variants
Sage Weil [Sat, 27 Jan 2018 19:07:55 +0000 (13:07 -0600)]
os/ObjectStore: drop most queue_transactions() variants

Register completions on the Transaction(s) in the caller!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: synchronously open collection handles
Sage Weil [Sat, 13 Jan 2018 17:59:01 +0000 (11:59 -0600)]
osd: synchronously open collection handles

bluestore and memstore are the only backends to implement
open_collection, and both of them can issue a handle immediately
after queue_transaction.  Do that!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos: apply_transaction -> queue_transaction
Sage Weil [Mon, 29 Jan 2018 21:53:26 +0000 (15:53 -0600)]
os: apply_transaction -> queue_transaction

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: keep OpSequencers alive
Sage Weil [Tue, 30 Jan 2018 18:38:45 +0000 (12:38 -0600)]
os/filestore: keep OpSequencers alive

Prevent a collection delete + recreate sequence from allowing two
conflicting OpSequencers for the same collection to exist as this
can lead to racing async apply threads.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: more efficient waiter tracking
Sage Weil [Mon, 29 Jan 2018 23:26:33 +0000 (17:26 -0600)]
os/filestore: more efficient waiter tracking

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: wait_for_apply on read ops
Sage Weil [Sat, 27 Jan 2018 16:56:41 +0000 (10:56 -0600)]
os/filestore: wait_for_apply on read ops

On any read, wait for any updates to the object to apply first.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: track objects with writes being applied
Sage Weil [Sat, 27 Jan 2018 16:22:12 +0000 (10:22 -0600)]
os/filestore: track objects with writes being applied

Note that this is *slight* overkill in that a *source* object of a clone
will also appear in the applying map, even though it is not being
modified.  Given that those clone operations are normally coupled with
another transaction that does write (which is why we are cloning in the
first place) this should not make any difference.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19939 from liewegas/wip-osd-new-class
Sage Weil [Mon, 12 Feb 2018 17:17:14 +0000 (11:17 -0600)]
Merge pull request #19939 from liewegas/wip-osd-new-class

mon,osd: do not use crush_device_class file to initalize class for new osds

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20363 from dongbula/e-rados-get-put-command
Gregory Farnum [Mon, 12 Feb 2018 16:56:56 +0000 (08:56 -0800)]
Merge pull request #20363 from dongbula/e-rados-get-put-command

make rados get/put/append command help txt clear

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotools/rados: make rados get/put/append command help txt clearer 20363/head
lvshuhua [Thu, 8 Feb 2018 11:39:18 +0000 (19:39 +0800)]
tools/rados: make rados get/put/append command help txt clearer

Fixes: http://tracker.ceph.com/issues/22958
Signed-off-by: lvshuhua <lvshuhua@cmss.chinamobile.com>
7 years agoMerge pull request #20392 from adamemerson/wip-clangtastic-voyage
Kefu Chai [Mon, 12 Feb 2018 03:19:39 +0000 (11:19 +0800)]
Merge pull request #20392 from adamemerson/wip-clangtastic-voyage

cmake, test/fs, client: fix build with clang

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20379 from tchaikov/wip-test-fix-freebsd
Kefu Chai [Mon, 12 Feb 2018 03:17:22 +0000 (11:17 +0800)]
Merge pull request #20379 from tchaikov/wip-test-fix-freebsd

test/librados: s/invoke_result_t/result_of_t/

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #20360 from ifed01/wip-ifed-extents-cleanup
Kefu Chai [Mon, 12 Feb 2018 03:16:44 +0000 (11:16 +0800)]
Merge pull request #20360 from ifed01/wip-ifed-extents-cleanup

os/bluestore: cleanup around ExtentList, AllocExtent and bluestore_extent_t classes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20320 from rzarzynski/wip-common-md_config_cacher_t
Kefu Chai [Mon, 12 Feb 2018 03:15:37 +0000 (11:15 +0800)]
Merge pull request #20320 from rzarzynski/wip-common-md_config_cacher_t

common: introduce md_config_cacher_t

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20198 from wido/zabbix-health-checks
Kefu Chai [Mon, 12 Feb 2018 03:14:41 +0000 (11:14 +0800)]
Merge pull request #20198 from wido/zabbix-health-checks

mgr/zabbix: Implement health checks

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20378 from tchaikov/wip-os-perf-stat-in-ns
Kefu Chai [Sun, 11 Feb 2018 01:53:40 +0000 (09:53 +0800)]
Merge pull request #20378 from tchaikov/wip-os-perf-stat-in-ns

osd: check feature bits when encoding objectstore_perf_stat_t

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20275 from badone/wip-osdmonitor-unused-function
Kefu Chai [Sun, 11 Feb 2018 01:52:10 +0000 (09:52 +0800)]
Merge pull request #20275 from badone/wip-osdmonitor-unused-function

mon/OSDMonitor: Comment out unused function

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20371 from tchaikov/wip-admin_socket_output
Kefu Chai [Sun, 11 Feb 2018 01:51:04 +0000 (09:51 +0800)]
Merge pull request #20371 from tchaikov/wip-admin_socket_output

test/admin_socket_output: add --vstart=path/to/asok option

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #20227 from rzarzynski/wip-bs-final-aiocontexts
Kefu Chai [Sat, 10 Feb 2018 17:24:31 +0000 (01:24 +0800)]
Merge pull request #20227 from rzarzynski/wip-bs-final-aiocontexts

os/bluestore: mark derivatives of AioContext as final.

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20376 from dillaman/wip-22873
Mykola Golub [Sat, 10 Feb 2018 06:53:35 +0000 (08:53 +0200)]
Merge pull request #20376 from dillaman/wip-22873

librbd: auto-remove trash snapshots when image is deleted

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agobuild: Use the right experimental library 20392/head
Adam C. Emerson [Fri, 9 Feb 2018 21:16:43 +0000 (16:16 -0500)]
build: Use the right experimental library

Test whether we're building with libstdc++ or libc++.

Use stdc++filesystem if the former and c++experimental if the later.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years ago{client,test}: Explicitly initialize empty inode_t
Adam C. Emerson [Fri, 9 Feb 2018 17:51:31 +0000 (12:51 -0500)]
{client,test}: Explicitly initialize empty inode_t

Using an explicit {} initializer. This unbreaks Clang.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agolibrbd: auto-remove trash snapshots when image is deleted 20376/head
Jason Dillaman [Thu, 8 Feb 2018 22:12:00 +0000 (17:12 -0500)]
librbd: auto-remove trash snapshots when image is deleted

Fixes: http://tracker.ceph.com/issues/22873
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librados: s/invoke_result_t/result_of_t/ 20379/head
Kefu Chai [Fri, 9 Feb 2018 16:06:20 +0000 (00:06 +0800)]
test/librados: s/invoke_result_t/result_of_t/

to workaround buggy libc++ implementation. see
https://cplusplus.github.io/LWG/issue2807 . we should switch to
invoke_result_t once issue2807 is fixed in the latest release of
libc++.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoos/bluestore: cleanup around ExtentList class. 20360/head
Igor Fedotov [Wed, 7 Feb 2018 18:43:48 +0000 (21:43 +0300)]
os/bluestore: cleanup around ExtentList class.

Also move it out of bluestore_types.h.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agoos/bluestore: kill AllocExtent[Vector] to simplify code a bit
Igor Fedotov [Wed, 7 Feb 2018 18:18:34 +0000 (21:18 +0300)]
os/bluestore: kill AllocExtent[Vector] to simplify code a bit

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #20387 from ifed01/wip-ifed-fio-build-fix
Igor Fedotov [Fri, 9 Feb 2018 15:35:25 +0000 (18:35 +0300)]
Merge pull request #20387 from ifed01/wip-ifed-fio-build-fix

test/fio: fix build failure caused by sequencer replacement.

7 years agoMerge pull request #20043 from Rubab-Syed/configuration_setting_browser
John Spray [Fri, 9 Feb 2018 15:22:51 +0000 (15:22 +0000)]
Merge pull request #20043 from Rubab-Syed/configuration_setting_browser

mgr/dashboard: add configuration setting browser

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20389 from trociny/wip-cli_generic
Jason Dillaman [Fri, 9 Feb 2018 14:21:57 +0000 (09:21 -0500)]
Merge pull request #20389 from trociny/wip-cli_generic

qa/workunits/rbd: fix cli_generic test_purge for rbd default format 1

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/rbd/cli_generic: fix test_purge for rbd default format 1 20389/head
Mykola Golub [Fri, 9 Feb 2018 10:53:31 +0000 (12:53 +0200)]
qa/workunits/rbd/cli_generic: fix test_purge for rbd default format 1

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20364 from Songweibin/wip-fix-test-rbd
Mykola Golub [Fri, 9 Feb 2018 12:42:27 +0000 (14:42 +0200)]
Merge pull request #20364 from Songweibin/wip-fix-test-rbd

test/rbd: cli_generic fails if v1 image format or deep-flatten disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agotools/ceph-objectstore-tool: do not fail on lack of OI_ATTR for an 20387/head
Igor Fedotov [Fri, 9 Feb 2018 12:00:07 +0000 (15:00 +0300)]
tools/ceph-objectstore-tool: do not fail on lack of OI_ATTR for an
object.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agotest/fio: create superblock on mkfs to provide proper tools functioning
Igor Fedotov [Fri, 9 Feb 2018 11:58:15 +0000 (14:58 +0300)]
test/fio: create superblock on mkfs to provide proper tools functioning

E.g. ceph-objectstore-tool requires that

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agotest/fio: fix build failure caused by sequencer replacement.
Igor Fedotov [Fri, 9 Feb 2018 11:06:15 +0000 (14:06 +0300)]
test/fio: fix build failure caused by sequencer replacement.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #20372 from tchaikov/wip-mgr-doc
John Spray [Fri, 9 Feb 2018 09:51:09 +0000 (10:51 +0100)]
Merge pull request #20372 from tchaikov/wip-mgr-doc

doc/mgr: remove non user-facing code from doc

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomgr/zabbix: Implement health checks in Zabbix module 20198/head
Wido den Hollander [Wed, 31 Jan 2018 09:04:13 +0000 (10:04 +0100)]
mgr/zabbix: Implement health checks in Zabbix module

Should make it easier for users to see why the module is failing.

Signed-off-by: Wido den Hollander <wido@42on.com>
7 years agotest/rbd: cli_generic fails if v1 image format or deep-flatten disabled 20364/head
songweibin [Thu, 8 Feb 2018 11:48:51 +0000 (19:48 +0800)]
test/rbd: cli_generic fails if v1 image format or deep-flatten disabled

Fixes: http://tracker.ceph.com/issues/22950
Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge pull request #20382 from tchaikov/wip-fix-ftbfs-store-test
Kefu Chai [Fri, 9 Feb 2018 06:39:49 +0000 (14:39 +0800)]
Merge pull request #20382 from tchaikov/wip-fix-ftbfs-store-test

test/store_test: fix FTBFS as Sequencer is removed

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agocheck feature bits when encoding objectstore_perf_stat_t 20378/head
Kefu Chai [Tue, 23 Jan 2018 07:30:58 +0000 (15:30 +0800)]
check feature bits when encoding objectstore_perf_stat_t

OS_PERF_STAT_NS feature bit is added. it's sharing the same bit with
QOS_DMC.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest/store_test: fix FTBFS as Sequencer is removed 20382/head
Kefu Chai [Fri, 9 Feb 2018 05:05:19 +0000 (13:05 +0800)]
test/store_test: fix FTBFS as Sequencer is removed

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20294 from rzarzynski/wip-bs-drop-std_function
Kefu Chai [Fri, 9 Feb 2018 02:45:24 +0000 (10:45 +0800)]
Merge pull request #20294 from rzarzynski/wip-bs-drop-std_function

os/bluestore: avoid overhead of std::function in blob_t.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19232 from socketpair/precision
Kefu Chai [Fri, 9 Feb 2018 02:44:27 +0000 (10:44 +0800)]
Merge pull request #19232 from socketpair/precision

mgr: increase time resolution of Commit/Apply OSD latencies.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18804 from majianpeng/bluestore-collection-prealloc
Kefu Chai [Fri, 9 Feb 2018 02:43:24 +0000 (10:43 +0800)]
Merge pull request #18804 from majianpeng/bluestore-collection-prealloc

os/bluestore: Prealloc memory avoid realloc in list_collection.

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18494 from ifed01/wip-stupidalloc-fix2
Kefu Chai [Fri, 9 Feb 2018 02:42:43 +0000 (10:42 +0800)]
Merge pull request #18494 from ifed01/wip-stupidalloc-fix2

os/bluestore: do not assert if BlueFS rebalance is unable to allocate sufficient space

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18343 from shinobu-x/sk-remove-osdmap
Kefu Chai [Fri, 9 Feb 2018 02:41:50 +0000 (10:41 +0800)]
Merge pull request #18343 from shinobu-x/sk-remove-osdmap

mon/PGMap: Remove unnecessary header

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #19954 into master
Patrick Donnelly [Fri, 9 Feb 2018 02:17:15 +0000 (18:17 -0800)]
Merge PR #19954 into master

* refs/pull/19954/head:
test/encoding: refactor to avoid escaping shell magic
mds: minor refactor of SimpleLock
mds: track Capability in mempool
mds: move CInode container members to mempool
mds: move CDentry container members to mempool
mds: move CDir container members to mempool
mds: put MDSCacheObject compact_map in mempool
common: use size_t for object size
mds: convert to allocator agnostic string_view
mds: simplify initialization
compact_*: support mempool allocated containers

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoosd: PrimaryLogPG::do_osd_ops() uses md_config_cacher_t. 20320/head
Radoslaw Zarzynski [Mon, 5 Feb 2018 14:19:47 +0000 (15:19 +0100)]
osd: PrimaryLogPG::do_osd_ops() uses md_config_cacher_t.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #20007 from mogeb/steady-clock-librbd
Jason Dillaman [Fri, 9 Feb 2018 00:20:21 +0000 (19:20 -0500)]
Merge pull request #20007 from mogeb/steady-clock-librbd

librbd: use steady clock to measure elapsed time in AioCompletion

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20008 from mogeb/steady-clock-tools-rbd
Jason Dillaman [Fri, 9 Feb 2018 00:20:07 +0000 (19:20 -0500)]
Merge pull request #20008 from mogeb/steady-clock-tools-rbd

tools/rbd: use steady clock in bencher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20218 from shun-s/wip-speedup-diskusage-resize
Jason Dillaman [Fri, 9 Feb 2018 00:19:52 +0000 (19:19 -0500)]
Merge pull request #20218 from shun-s/wip-speedup-diskusage-resize

librbd: speed up object map disk usage and resize

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20311 from Songweibin/wip-group-snap-ls
Jason Dillaman [Fri, 9 Feb 2018 00:19:35 +0000 (19:19 -0500)]
Merge pull request #20311 from Songweibin/wip-group-snap-ls

rbd: do not show title if there is no group snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20349 from trociny/wip-22932
Jason Dillaman [Fri, 9 Feb 2018 00:19:12 +0000 (19:19 -0500)]
Merge pull request #20349 from trociny/wip-22932

rbd-mirror: fix potential infinite loop when formatting status message

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #20310 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:30:04 +0000 (13:30 -0800)]
Merge PR #20310 into master

* refs/pull/20310/head:
qa: adjust cephfs full test for kclient

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20148 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:05:26 +0000 (13:05 -0800)]
Merge PR #20148 into master

* refs/pull/20148/head:
mds: reset connection's priv when marking down connection
mds: fix session reference leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20155 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:05:19 +0000 (13:05 -0800)]
Merge PR #20155 into master

* refs/pull/20155/head:
osdc/Journaler: make sure flush() writes enough data

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20190 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:05:12 +0000 (13:05 -0800)]
Merge PR #20190 into master

* refs/pull/20190/head:
mon: allow removal of tier of ec overwritable pool

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
7 years agoMerge PR #20200 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:05:05 +0000 (13:05 -0800)]
Merge PR #20200 into master

* refs/pull/20200/head:
client: add cap_dirtier_uid/gid to CapSnap

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge PR #20246 into master
Patrick Donnelly [Thu, 8 Feb 2018 21:04:54 +0000 (13:04 -0800)]
Merge PR #20246 into master

* refs/pull/20246/head:
mds: remove extra 0x in ino prints
mds: print inode number not CInode ptr

7 years agomon/OSDMonitor: accept crush_device_class in 'osd new' json input 19939/head
Sage Weil [Fri, 12 Jan 2018 23:10:11 +0000 (17:10 -0600)]
mon/OSDMonitor: accept crush_device_class in 'osd new' json input

If provided, set the OSD device_class at OSD creation time.  This is
simpler than writing a file that the OSD has to read in and use to
set its initial device class, and also avoids a bit of sticky state
at the OSD that will make it keep trying to reset its device class on
startup if it ever gets cleared.

Note that we now ignore json input fields we don't understand, so remove
a test case.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc/mgr: remove none user-facing code from doc 20372/head
Kefu Chai [Thu, 8 Feb 2018 17:47:35 +0000 (01:47 +0800)]
doc/mgr: remove none user-facing code from doc

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest/test_admin_socket_output: allow different asok directory 20371/head
Kefu Chai [Thu, 8 Feb 2018 11:09:25 +0000 (19:09 +0800)]
test/test_admin_socket_output: allow different asok directory

the asok files are not necessary located in ./out, actually, they are
put in $TMPDIR/ceph-asok.$random_stuff .

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest/admin_socket_output: no need to create a copy of fs::path
Kefu Chai [Thu, 8 Feb 2018 11:08:36 +0000 (19:08 +0800)]
test/admin_socket_output: no need to create a copy of fs::path

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20367 from ceph/simple-custom-cluster
Alfredo Deza [Thu, 8 Feb 2018 13:48:41 +0000 (08:48 -0500)]
Merge pull request #20367 from ceph/simple-custom-cluster

ceph-volume: adds custom cluster name support to simple

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume: use a custom cluster name in simple functional tests 20367/head
Andrew Schoen [Thu, 8 Feb 2018 13:09:57 +0000 (07:09 -0600)]
ceph-volume: use a custom cluster name in simple functional tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20305 from xiexingguo/wip-more-balancer-fixes
Xie Xingguo [Thu, 8 Feb 2018 04:30:46 +0000 (12:30 +0800)]
Merge pull request #20305 from xiexingguo/wip-more-balancer-fixes

pybind/mgr/balancer: more specific command outputs

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20355 from luomuyao/typo
Xie Xingguo [Thu, 8 Feb 2018 03:41:48 +0000 (11:41 +0800)]
Merge pull request #20355 from luomuyao/typo

rgw: fix a typo in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agotest/encoding: refactor to avoid escaping shell magic 19954/head
Patrick Donnelly [Thu, 8 Feb 2018 00:03:48 +0000 (16:03 -0800)]
test/encoding: refactor to avoid escaping shell magic

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: minor refactor of SimpleLock
Patrick Donnelly [Wed, 24 Jan 2018 23:32:18 +0000 (15:32 -0800)]
mds: minor refactor of SimpleLock

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: track Capability in mempool
Patrick Donnelly [Wed, 24 Jan 2018 18:34:20 +0000 (10:34 -0800)]
mds: track Capability in mempool

Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: move CInode container members to mempool
Patrick Donnelly [Tue, 16 Jan 2018 02:30:59 +0000 (18:30 -0800)]
mds: move CInode container members to mempool

Partial-fix: http://tracker.ceph.com/issues/21402

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoos/bluestore: avoid overhead of std::function in blob_t. 20294/head
Radoslaw Zarzynski [Sun, 4 Feb 2018 04:45:43 +0000 (05:45 +0100)]
os/bluestore: avoid overhead of std::function in blob_t.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agorgw: fix a typo in comment 20355/head
luomuyao [Thu, 8 Feb 2018 01:02:50 +0000 (09:02 +0800)]
rgw: fix a typo in comment

Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
7 years agomon/OSDMonitor: Remove unused functions 20275/head
Brad Hubbard [Sat, 3 Feb 2018 01:56:26 +0000 (11:56 +1000)]
mon/OSDMonitor: Remove unused functions

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #20161 from tchaikov/wip-20086
Josh Durgin [Wed, 7 Feb 2018 22:43:59 +0000 (14:43 -0800)]
Merge pull request #20161 from tchaikov/wip-20086

test/librados: be more tolerant with timed lock tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #20173 from liewegas/wip-os-ch
Josh Durgin [Wed, 7 Feb 2018 22:04:08 +0000 (14:04 -0800)]
Merge pull request #20173 from liewegas/wip-os-ch

os: unify Sequencer and CollectionHandle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoceph-volume: set conf.cluster name during simple activate
Andrew Schoen [Wed, 7 Feb 2018 20:42:24 +0000 (14:42 -0600)]
ceph-volume: set conf.cluster name during simple activate

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20144 from adamemerson/wip-cache-register
Adam C. Emerson [Wed, 7 Feb 2018 18:46:18 +0000 (13:46 -0500)]
Merge pull request #20144 from adamemerson/wip-cache-register

Cache Register!

Provide the ability to examine and delete elements from the cache.

rgw: Add cache introspection and manipulation

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>