]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoscript/sepia_bt.sh: a script to prepare for debugging on teuthology@sepia 12012/head
Kefu Chai [Wed, 16 Nov 2016 04:07:54 +0000 (12:07 +0800)]
script/sepia_bt.sh: a script to prepare for debugging on teuthology@sepia

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11914 from tchaikov/wip-17857
Kefu Chai [Mon, 14 Nov 2016 16:02:40 +0000 (00:02 +0800)]
Merge pull request #11914 from tchaikov/wip-17857

ReplicatedPG::failed_push: release read lock on failure

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11919 from liewegas/wip-bluestore-cache-meta
Sage Weil [Mon, 14 Nov 2016 15:56:46 +0000 (09:56 -0600)]
Merge pull request #11919 from liewegas/wip-bluestore-cache-meta

os/bluestore: bluestore_cache_meta_ratio = .5

Reviewed-by: Mark Nelson <mnelson@redhat.com>
8 years agoos/bluestore: precondition enough to write two 256mb buffers 11919/head
Sage Weil [Mon, 14 Nov 2016 15:42:53 +0000 (10:42 -0500)]
os/bluestore: precondition enough to write two 256mb buffers

We now match the new bluestore_rocksdb_options.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: bluestore_cache_meta_ratio = .5
Sage Weil [Fri, 11 Nov 2016 16:09:55 +0000 (11:09 -0500)]
os/bluestore: bluestore_cache_meta_ratio = .5

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11842 from ceph/wip-cmake
Kefu Chai [Mon, 14 Nov 2016 14:08:36 +0000 (22:08 +0800)]
Merge pull request #11842 from ceph/wip-cmake

cmake: librbd cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoReplicatedPG::failed_push: release read lock on failure 11914/head
Kefu Chai [Fri, 11 Nov 2016 13:37:50 +0000 (21:37 +0800)]
ReplicatedPG::failed_push: release read lock on failure

and requeue the blocked ops.

Fixes: http://tracker.ceph.com/issues/17857
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake:librbd: move common to the end of linked libraries 11842/head
Kefu Chai [Mon, 14 Nov 2016 08:04:48 +0000 (16:04 +0800)]
cmake:librbd: move common to the end of linked libraries

so the linked libraries are able to find the symbols in libcommon.
and do not `list(APPEND librbd ...)` anymore, which is wrong and not
necessary. librbd does not depends on krbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: move ContextCompletion.cc into rbd_internal
Kefu Chai [Wed, 9 Nov 2016 05:11:13 +0000 (13:11 +0800)]
cmake: move ContextCompletion.cc into rbd_internal

- ContextCompletion.cc is used by TrimRequest.cc which is included by
  rbd_internal, it's more natural to put ContextCompletion.cc into
  rbd_internal also. as rbd_internal is the only consumer of this
  translation unit.
- librbd/internal.cc is not referencing any symbols from util.cc, so
  remove this include. and also, do not add
  $<TARGET_OBJECTS:common_util_obj> to librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: let rbd_internal depend on librbd-tp
Kefu Chai [Wed, 9 Nov 2016 04:10:03 +0000 (12:10 +0800)]
cmake: let rbd_internal depend on librbd-tp

as librbd/AioCompletion.cc includes "tracing/librbd.h", which is offered
by librbd-tp.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11906 from tchaikov/wip-11829
Kefu Chai [Mon, 14 Nov 2016 10:20:30 +0000 (18:20 +0800)]
Merge pull request #11906 from tchaikov/wip-11829

ceph-detect-init: FreeBSD introduction of bsdrc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoceph-detect-init: FreeBSD introduction of bsdrc 11906/head
Willem Jan Withagen [Tue, 8 Nov 2016 14:24:08 +0000 (15:24 +0100)]
ceph-detect-init: FreeBSD introduction of bsdrc

ceph-detect-init/ceph_detect_init/freebsd/__init__.py
    New file

ceph_detect_init/__init__.py: Only test FreeBSD after it is not Linux

    If we do it the other way around it will not work during testing on FreeBSD
    because it will always have platform.system() == FreeBSD
    So first test for Linux, and only then check to see if it is FreeBSD.

ceph-detect-init/tests/test_all.py: add tests for FreeBSD
ceph-detect-init/run-tox.sh: ReEnable to run test for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11844 from liupan1111/master
Kefu Chai [Mon, 14 Nov 2016 01:42:50 +0000 (09:42 +0800)]
Merge pull request #11844 from liupan1111/master

os/bluestore: speedup the performance of multi-replication flow by switc…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11799 from KerLiu/fixdupassignment
Kefu Chai [Mon, 14 Nov 2016 01:40:58 +0000 (09:40 +0800)]
Merge pull request #11799 from KerLiu/fixdupassignment

osd/OSDMap.cc: fix duplicated assignment for new_blacklist_entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11378 from ryneli/watch_notify_add_timeout
Kefu Chai [Mon, 14 Nov 2016 01:36:14 +0000 (09:36 +0800)]
Merge pull request #11378 from ryneli/watch_notify_add_timeout

librados: add timeout to watch/notify

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agolibrados: add timeout parameter to rados_watch 11378/head
Ryne Li [Mon, 10 Oct 2016 19:47:32 +0000 (15:47 -0400)]
librados: add timeout parameter to rados_watch

Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>
8 years agoMerge pull request #10221 from Yan-waller/yj-wip-testrados-0709
Kefu Chai [Sun, 13 Nov 2016 08:24:05 +0000 (16:24 +0800)]
Merge pull request #10221 from Yan-waller/yj-wip-testrados-0709

test/rados: remove unused bufferlist variable

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11941 from liewegas/wip-envlibrados
Kefu Chai [Sun, 13 Nov 2016 06:53:29 +0000 (14:53 +0800)]
Merge pull request #11941 from liewegas/wip-envlibrados

qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9357 from Aran85/wip-assert-build-push
Kefu Chai [Sun, 13 Nov 2016 06:41:14 +0000 (14:41 +0800)]
Merge pull request #9357 from Aran85/wip-assert-build-push

osd/PGBackend: build_push_op segment fault

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11800 from bassamtabbara/wip-make-leveldb-optional
Kefu Chai [Sun, 13 Nov 2016 06:39:11 +0000 (14:39 +0800)]
Merge pull request #11800 from bassamtabbara/wip-make-leveldb-optional

mon: support for building without leveldb + mon mkfs bug fix

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11664 from sysnote/wip-17719
Kefu Chai [Sun, 13 Nov 2016 06:38:10 +0000 (14:38 +0800)]
Merge pull request #11664 from sysnote/wip-17719

mon: fix "OSDs marked OUT wrongly after monitor failover"

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10196 from xiaoxichen/fix_16609
Kefu Chai [Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)]
Merge pull request #10196 from xiaoxichen/fix_16609

log/LogClient: fill seq & who for syslog and graylog

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoBlueStore: speedup the performance of multi-replication flow by 11844/head
Pan Liu [Wed, 9 Nov 2016 09:45:27 +0000 (17:45 +0800)]
BlueStore: speedup the performance of multi-replication flow by
switching the callback order in bluestore.

In Bluestore ack callback and commit callback are queued one by one in
the function "BlueStore;:_txc_finish_kv". Therefore, just only one callback
is needed to call, in order to improve performance. We do this by switching
the callback order in bluestore, and the callback work can be done in
sub_op_modify_commit and doesn't need to do it again in sub_op_modify_applied.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoMerge pull request #11805 from tchaikov/wip-deprecate-readdir-r
Sage Weil [Sat, 12 Nov 2016 13:35:58 +0000 (07:35 -0600)]
Merge pull request #11805 from tchaikov/wip-deprecate-readdir-r

deprecate readdir_r() with readdir()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11824 from xiexingguo/xxg-wip-kill-pg-splitting
Sage Weil [Sat, 12 Nov 2016 13:35:46 +0000 (07:35 -0600)]
Merge pull request #11824 from xiexingguo/xxg-wip-kill-pg-splitting

osd: kill PG_STATE_SPLITTING

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11874 from wido/osd-no-scrub-recovery
Sage Weil [Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)]
Merge pull request #11874 from wido/osd-no-scrub-recovery

osd: Add config option to disable new scrubs during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11880 from cbodley/wip-ms-type-random
Sage Weil [Sat, 12 Nov 2016 13:35:00 +0000 (07:35 -0600)]
Merge pull request #11880 from cbodley/wip-ms-type-random

msg: seed random engine used for ms_type="random"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11898 from liewegas/wip-filestore-hashindex
Sage Weil [Sat, 12 Nov 2016 13:34:41 +0000 (07:34 -0600)]
Merge pull request #11898 from liewegas/wip-filestore-hashindex

os/filestore/HashIndex: fix list_by_hash_* termination on reaching end

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install 11941/head
Sage Weil [Sat, 12 Nov 2016 13:30:59 +0000 (08:30 -0500)]
qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

On trusty we see

 WARNING: The following packages cannot be authenticated!
   librados-dev
 E: There are problems and -y was used without --force-yes

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11907 from badone/wip-pipe-socket-typos
Brad Hubbard [Sat, 12 Nov 2016 02:53:06 +0000 (12:53 +1000)]
Merge pull request #11907 from badone/wip-pipe-socket-typos

msg: Fix typos in socket creation error message

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11392 from Oloremo/keystone_docs
Yehuda Sadeh [Fri, 11 Nov 2016 23:40:47 +0000 (15:40 -0800)]
Merge pull request #11392 from Oloremo/keystone_docs

Update keystone doc about v3 options

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #11925 from ktdreyer/doc-infernalis-eol
Sage Weil [Fri, 11 Nov 2016 22:57:36 +0000 (16:57 -0600)]
Merge pull request #11925 from ktdreyer/doc-infernalis-eol

doc: add infernalis EOL date

8 years agodoc: add infernalis EOL date 11925/head
Ken Dreyer [Fri, 11 Nov 2016 22:44:18 +0000 (15:44 -0700)]
doc: add infernalis EOL date

Remove the estimated Infernalis EOL date, and add the actual EOL date.

As discussed on the ceph-devel mailing list, we decided to say that this
infernalis EOL date is the same date that we made the first Jewel
release available.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #11924 from liewegas/wip-balloc
Dan Mick [Fri, 11 Nov 2016 21:54:06 +0000 (13:54 -0800)]
Merge pull request #11924 from liewegas/wip-balloc

unittest_bit_alloc: fix type

Merging before make check because it clearly breaks the build and the build part is done
Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agounittest_bitalloc: fix type 11924/head
Sage Weil [Fri, 11 Nov 2016 21:12:10 +0000 (16:12 -0500)]
unittest_bitalloc: fix type

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11922 from liewegas/wip-mempool-bluestore
Sage Weil [Fri, 11 Nov 2016 20:29:19 +0000 (14:29 -0600)]
Merge pull request #11922 from liewegas/wip-mempool-bluestore

mempool: changes for bitmap allocator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge pull request #11920 from ifed01/wip-bluestore-tmp
Sage Weil [Fri, 11 Nov 2016 20:28:50 +0000 (14:28 -0600)]
Merge pull request #11920 from ifed01/wip-bluestore-tmp

os/bluestore: remove build warning in a better way

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomempool changes for bitmap allocator 11922/head
Ramesh Chander [Fri, 11 Nov 2016 20:08:33 +0000 (15:08 -0500)]
mempool changes for bitmap allocator

[with bstore_balloc -> bluestore_alloc rename by sage]

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoMerge pull request #11839 from liewegas/wip-mempool-buffer
Sage Weil [Fri, 11 Nov 2016 20:04:13 +0000 (14:04 -0600)]
Merge pull request #11839 from liewegas/wip-mempool-buffer

buffer: put buffers in buffer_{data,meta} mempools

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge pull request #11834 from liewegas/wip-bluestore-mempool
Sage Weil [Fri, 11 Nov 2016 20:03:43 +0000 (14:03 -0600)]
Merge pull request #11834 from liewegas/wip-bluestore-mempool

os/bluestore: move bluefs into its own mempool

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agobuffer: put data and metadata in a mempool 11839/head
Sage Weil [Wed, 9 Nov 2016 17:07:24 +0000 (12:07 -0500)]
buffer: put data and metadata in a mempool

Note that for raw_combined we leak some metadata into the data pool.

Also, we do not account for non-raw metadata or anything else in buffer.h,
as that would pollute the ABI and public interface.

Drop the namespace ceph in buffer.cc (which serves no real purpose) as it
confuses the MEMPOOL_DEFINE_* macros (they cannot be used inside a
namespace).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: add [de]allocate_aligned
Sage Weil [Tue, 8 Nov 2016 23:50:37 +0000 (18:50 -0500)]
mempool: add [de]allocate_aligned

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: move pg logs into osd mempool
Sage Weil [Tue, 8 Nov 2016 22:31:34 +0000 (17:31 -0500)]
osd: move pg logs into osd mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: move peering evt into pool
Sage Weil [Mon, 17 Oct 2016 18:20:10 +0000 (14:20 -0400)]
osd/PG: move peering evt into pool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: move ReplicatedPG into mempool
Sage Weil [Mon, 17 Oct 2016 18:19:52 +0000 (14:19 -0400)]
osd: move ReplicatedPG into mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: create an osd mempool
Sage Weil [Tue, 8 Nov 2016 22:37:37 +0000 (17:37 -0500)]
mempool: create an osd mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: attach mempool asok commands to all ccts
Sage Weil [Tue, 8 Nov 2016 22:29:03 +0000 (17:29 -0500)]
mempool: attach mempool asok commands to all ccts

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: move to libcommon
Sage Weil [Tue, 8 Nov 2016 21:37:25 +0000 (16:37 -0500)]
mempool: move to libcommon

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoinclude/mempool: align shard_t to cacheline
Sage Weil [Wed, 9 Nov 2016 16:12:44 +0000 (11:12 -0500)]
include/mempool: align shard_t to cacheline

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoinclude/mempool: adjust factory name
Sage Weil [Wed, 9 Nov 2016 16:07:51 +0000 (11:07 -0500)]
include/mempool: adjust factory name

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: drop unused factory type
Sage Weil [Wed, 9 Nov 2016 15:15:35 +0000 (10:15 -0500)]
mempool: drop unused factory type

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoinclude/mempool: fix allocate() debug_mode check
Sage Weil [Fri, 11 Nov 2016 19:59:30 +0000 (14:59 -0500)]
include/mempool: fix allocate() debug_mode check

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #7784 from ceph/wip-da-SCA-20160219
Sage Weil [Fri, 11 Nov 2016 19:36:45 +0000 (13:36 -0600)]
Merge pull request #7784 from ceph/wip-da-SCA-20160219

Coverity and SCA fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11830 from adamemerson/wip-crush-unlocked
Sage Weil [Fri, 11 Nov 2016 19:35:05 +0000 (13:35 -0600)]
Merge pull request #11830 from adamemerson/wip-crush-unlocked

crush: remove the crush_lock

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11910 from xiexingguo/xxg-wip-bluestore-1111
Sage Weil [Fri, 11 Nov 2016 18:28:24 +0000 (12:28 -0600)]
Merge pull request #11910 from xiexingguo/xxg-wip-bluestore-1111

os/bluestore: some more cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: remove build warning in a better way 11920/head
Igor Fedotov [Fri, 11 Nov 2016 17:22:18 +0000 (20:22 +0300)]
os/bluestore: remove build warning in a better way

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11915 from ifed01/wip-bluestore-fix-test
Sage Weil [Fri, 11 Nov 2016 15:34:56 +0000 (09:34 -0600)]
Merge pull request #11915 from ifed01/wip-bluestore-fix-test

os/test/store_test: fix legacy bluestore cache settings application

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11905 from xiexingguo/xxg-wip-kill-boost-warn
Sage Weil [Fri, 11 Nov 2016 15:30:54 +0000 (09:30 -0600)]
Merge pull request #11905 from xiexingguo/xxg-wip-kill-boost-warn

os/bluestore: fix compiler warnings

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11896 from ifed01/wip-bluestore-cleanup
Sage Weil [Fri, 11 Nov 2016 15:01:12 +0000 (09:01 -0600)]
Merge pull request #11896 from ifed01/wip-bluestore-cleanup

os/bluestore: cleanup around Blob::ref_map

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11710 from ceph/wip-jlayton-fsync
John Spray [Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)]
Merge pull request #11710 from ceph/wip-jlayton-fsync

Fix long stalls when calling ceph_fsync()

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11293 from liewegas/wip-mon-markout
Kefu Chai [Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)]
Merge pull request #11293 from liewegas/wip-mon-markout

mon: preserve osd weight when marking osd out, then in

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/test/store_test: fix legacy bluestore cache settings application 11915/head
root [Fri, 11 Nov 2016 13:46:37 +0000 (13:46 +0000)]
os/test/store_test: fix legacy bluestore cache settings application

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: make Blob::ref_map private 11896/head
Igor Fedotov [Thu, 10 Nov 2016 13:17:48 +0000 (16:17 +0300)]
os/bluestore: make Blob::ref_map private

Signed-off-by: Igor Fedotov <ifedotov@minratis.com>
8 years agoos/bluestore: start using Blob::get_ref over the code
Igor Fedotov [Tue, 8 Nov 2016 17:58:17 +0000 (20:58 +0300)]
os/bluestore: start using Blob::get_ref over the code

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoclient: rename flush_caps() with no arguments to flush_caps_sync() 11710/head
Jeff Layton [Thu, 10 Nov 2016 11:30:27 +0000 (06:30 -0500)]
client: rename flush_caps() with no arguments to flush_caps_sync()

Per Greg's recommendation, change the name of this function to better
indicate what it does now that we always request a journal flush on
the last cap flush.

Also, add a comment above the function to better explain why we do this.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoclient: request journal flush after flushing caps in syncfs
Jeff Layton [Wed, 9 Nov 2016 14:36:07 +0000 (09:36 -0500)]
client: request journal flush after flushing caps in syncfs

Ensure that we ask the MDS to flush the journal on the last cap flush
from sync_fs and umount codepaths.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agomds: only update change_attr and btime when client sets appropriate feature flags
Jeff Layton [Wed, 9 Nov 2016 14:36:07 +0000 (09:36 -0500)]
mds: only update change_attr and btime when client sets appropriate feature flags

The kernel client lags the userland code a bit, and feature support for
addr2 is not quite ready. Still, we want to allow the client to set the
new flags field in a cap request before then so it can get better fsync
performance.

When we go to update the cap fields, grab the features from the peer,
and verify that the appropriate flags are set before we apply updates
to the btime and change_attr.

Also, just have the function return early if dirty is 0, since it's
a no-op in that case, and turn the comment above the function into
an assertion.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoclient: wire up the CHECK_CAPS_SYNCHRONOUS flag
Jeff Layton [Wed, 9 Nov 2016 14:36:07 +0000 (09:36 -0500)]
client: wire up the CHECK_CAPS_SYNCHRONOUS flag

Ensure that the client will request an immediate journal flush from the
MDS when we'll end up waiting on the flush response. This patch should
fix the fsync codepath, but we may need something similar for syncfs.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoclient: change no_delay flag to a flags field
Jeff Layton [Wed, 9 Nov 2016 14:36:07 +0000 (09:36 -0500)]
client: change no_delay flag to a flags field

In a later patch, we'll want to have the client set the sync flag in
the cap flush, to hint to the MDS that it should process it immediately.

We could add a second bool, but let's instead do what the kernel client
does which is to have a flags field. With that, the existing no_delay
bool becomes CHECK_CAPS_NODELAY.

We'll add other flags in subsequent patches.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agomds: do mds log flush if CLIENT_CAPS_SYNC is set
Jeff Layton [Fri, 11 Nov 2016 11:28:29 +0000 (06:28 -0500)]
mds: do mds log flush if CLIENT_CAPS_SYNC is set

If the client has set the sync flag in a cap update, then it
is indicating that it's waiting on the reply. Ensure that we flush
the journal in that case.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
8 years agoMerge pull request #11790 from jcsp/wip-mclientcaps
John Spray [Fri, 11 Nov 2016 11:10:49 +0000 (12:10 +0100)]
Merge pull request #11790 from jcsp/wip-mclientcaps

client: remove unneeded layout on MClientCaps

Reviewed-by: Jeff Layton <jlayton@redhat.com>
8 years agoMerge pull request #11789 from jcsp/wip-17798
John Spray [Fri, 11 Nov 2016 11:10:21 +0000 (12:10 +0100)]
Merge pull request #11789 from jcsp/wip-17798

mds: require MAY_SET_POOL to set pool_ns

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11783 from jcsp/wip-17796
John Spray [Fri, 11 Nov 2016 11:09:57 +0000 (12:09 +0100)]
Merge pull request #11783 from jcsp/wip-17796

mds: enable rmxattr on pool_namespace attrs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11739 from SUSE/wip-17747
John Spray [Fri, 11 Nov 2016 11:09:26 +0000 (12:09 +0100)]
Merge pull request #11739 from SUSE/wip-17747

mds: remove "--journal-check" help text

8 years agoMerge pull request #11692 from stiopaa1/mds_flock_addConstToMemFun
John Spray [Fri, 11 Nov 2016 11:07:46 +0000 (12:07 +0100)]
Merge pull request #11692 from stiopaa1/mds_flock_addConstToMemFun

mds/flock: add const to member functions

8 years agoMerge pull request #11545 from majianpeng/osdc-objectcache-fix-bug
John Spray [Fri, 11 Nov 2016 11:06:53 +0000 (12:06 +0100)]
Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug

osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoosd: Add config option to disable new scrubs during recovery 11874/head
Wido den Hollander [Wed, 9 Nov 2016 14:24:02 +0000 (15:24 +0100)]
osd: Add config option to disable new scrubs during recovery

The osd_scrub_during_recovery config option allows for configuring
if the OSD will schedule a new scrub while recovery is active.

When set to false no new scrubs will be initiated by the OSD while
there are recovery threads active on that OSD.

Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agoMerge pull request #10853 from wido/docs-mon-pool-settings
Kefu Chai [Fri, 11 Nov 2016 09:36:28 +0000 (17:36 +0800)]
Merge pull request #10853 from wido/docs-mon-pool-settings

doc: Add MON docs about pool flags and pool removal config settings

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: Add MON docs about pool flags and pool removal config settings 10853/head
Wido den Hollander [Thu, 25 Aug 2016 05:56:15 +0000 (07:56 +0200)]
doc: Add MON docs about pool flags and pool removal config settings

Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agomsg: Fix typos in socket creation error message 11907/head
Brad Hubbard [Fri, 11 Nov 2016 06:30:14 +0000 (16:30 +1000)]
msg: Fix typos in socket creation error message

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoos/bluestore: remove dead assert 11910/head
xie xingguo [Fri, 11 Nov 2016 03:43:15 +0000 (11:43 +0800)]
os/bluestore: remove dead assert

This assert will never fire, hence it can be safely removed.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: make Extent deleter as independent disposer
xie xingguo [Fri, 11 Nov 2016 03:05:05 +0000 (11:05 +0800)]
os/bluestore: make Extent deleter as independent disposer

Duplicated definition of lambas of same function is not good.
Also switching ExtentMap::rm() to use the new disposer to
keep pace with others.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: fix compiler warnings 11905/head
xie xingguo [Fri, 11 Nov 2016 02:18:36 +0000 (10:18 +0800)]
os/bluestore: fix compiler warnings

As follows:

/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp: In member function ‘bool BlueStore::ExtentMap::encode_some(uint32_t, uint32_t, ceph::bufferlist&, unsigned int*)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/build/boost/include/boost/intrusive/pointer_plus_bits.hpp:76:7: warning: ‘dummy’ is used uninitialized in this function [-Wuninitialized]
       n = pointer(uintptr_t(p) | (uintptr_t(n) & Mask));
       ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/os/bluestore/BlueStore.cc:1779:10: note: ‘dummy’ was declared here
   Extent dummy(offset);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11902 from ceph/wip-krbd-mons-fix
Jason Dillaman [Thu, 10 Nov 2016 23:24:48 +0000 (18:24 -0500)]
Merge pull request #11902 from ceph/wip-krbd-mons-fix

krbd: kernel client expects ip[:port], not an entity_addr_t

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11903 from dmick/master
Sage Weil [Thu, 10 Nov 2016 22:48:18 +0000 (16:48 -0600)]
Merge pull request #11903 from dmick/master

README: hint at where to look to diagnose test failures

8 years agoREADME: hint at where to look to diagnose test failures 11903/head
Dan Mick [Thu, 10 Nov 2016 22:43:41 +0000 (14:43 -0800)]
README: hint at where to look to diagnose test failures

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #11895 from xiexingguo/xxg-wip-bluestore-blob-range
Sage Weil [Thu, 10 Nov 2016 22:39:38 +0000 (16:39 -0600)]
Merge pull request #11895 from xiexingguo/xxg-wip-bluestore-blob-range

os/bluestore: readability improvements and doxygen fix

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11900 from linuxbox2/fix-civetweb-link
Sage Weil [Thu, 10 Nov 2016 22:29:35 +0000 (16:29 -0600)]
Merge pull request #11900 from linuxbox2/fix-civetweb-link

cmake: replace civetweb symlink w/file copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agokrbd: kernel client expects ip[:port], not an entity_addr_t 11902/head
Ilya Dryomov [Thu, 10 Nov 2016 21:37:17 +0000 (22:37 +0100)]
krbd: kernel client expects ip[:port], not an entity_addr_t

Commit 2ee1b9a4084f ("krbd.cc: don't rely on MonMap internal members")
inadvertently dropped .get_sockaddr() call, breaking rbd map.  Fix it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoMerge pull request #11897 from liewegas/wip-pool-delete
Dan Mick [Thu, 10 Nov 2016 21:01:33 +0000 (13:01 -0800)]
Merge pull request #11897 from liewegas/wip-pool-delete

tests: fix tests vs pool deletion

The default changed to disallow pool delete as of #11665; the tests assume it's allowed.
Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agocmake: replace civetweb symlink w/file copy 11900/head
Matt Benjamin [Thu, 10 Nov 2016 19:27:56 +0000 (14:27 -0500)]
cmake: replace civetweb symlink w/file copy

Intended to remove an apparent race.  The two effects are
1. replace top-level command callouts w/file builtins
2. do them in the src/rgw sub-cmake

This is cleaner, and ideally avoids the race.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoos/filestore/HashIndex: fix list_by_hash_* termination on reaching end 11898/head
Sage Weil [Thu, 10 Nov 2016 18:56:24 +0000 (13:56 -0500)]
os/filestore/HashIndex: fix list_by_hash_* termination on reaching end

If we set *next to max, then the caller (a few lines up) doesn't terminate
the loop and will keep trying to list objects in every following hash
dir until it reaches the end of the collection.  In fact, if we have an
end bound we will never to an efficient listing unless we hit the max
first.

For one user, this was causing OSD suicides when scrub ran because it
wasn't able to list all objects before the timeout.  In general, this would
cause scrub to stall a PG for a long time and slow down requests.

Broken by refactor in 921c4586f165ce39c17ef8b579c548dc8f6f4500.

Fixes: http://tracker.ceph.com/issues/17859
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agovstart.sh: allow pool deletion 11897/head
Sage Weil [Thu, 10 Nov 2016 16:48:19 +0000 (11:48 -0500)]
vstart.sh: allow pool deletion

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits/ceph-helpers.sh: allow pool deletes
Sage Weil [Thu, 10 Nov 2016 16:43:41 +0000 (11:43 -0500)]
qa/workunits/ceph-helpers.sh: allow pool deletes

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11894 from xiexingguo/xxg-wip-bluestore-1110
Sage Weil [Thu, 10 Nov 2016 15:18:16 +0000 (09:18 -0600)]
Merge pull request #11894 from xiexingguo/xxg-wip-bluestore-1110

os/bluestore: speed up omap-key generation for same onode(the read paths)

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11893 from xiexingguo/xxg-wip-bluestore-fix-clear
Sage Weil [Thu, 10 Nov 2016 15:13:12 +0000 (09:13 -0600)]
Merge pull request #11893 from xiexingguo/xxg-wip-bluestore-fix-clear

os/bluestore: fix potential memory leak

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11892 from tchaikov/wip-move-context
Kefu Chai [Thu, 10 Nov 2016 14:38:50 +0000 (22:38 +0800)]
Merge pull request #11892 from tchaikov/wip-move-context

Context: std::move the callback param in FunctionContext's ctor

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoos/bluestore: doxygen fixes 11895/head
xie xingguo [Thu, 10 Nov 2016 11:40:20 +0000 (19:40 +0800)]
os/bluestore: doxygen fixes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11889 from trociny/wip-vstart-bashism
Kefu Chai [Thu, 10 Nov 2016 12:04:59 +0000 (20:04 +0800)]
Merge pull request #11889 from trociny/wip-vstart-bashism

vstart.sh: fix bashism in the script

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11601 from ceph/wip-ms-async-keepalive2
Kefu Chai [Thu, 10 Nov 2016 11:55:34 +0000 (19:55 +0800)]
Merge pull request #11601 from ceph/wip-ms-async-keepalive2

msg/async/AsyncConnection: dispatch write handler on keepalive2

Reviewed-by: Haomai Wang <haomai@xsky.com>