Commit Graph

60020 Commits

Author SHA1 Message Date
Sage Weil
ae1564df93 include/mempool: align shard_t to cacheline
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-11 14:59:53 -05:00
Sage Weil
08222300c5 include/mempool: adjust factory name
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-11 14:59:53 -05:00
Sage Weil
bd601c648d mempool: drop unused factory type
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-11 14:59:53 -05:00
Sage Weil
38f61af44a include/mempool: fix allocate() debug_mode check
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-11 14:59:53 -05:00
Sage Weil
53fb099d1e Merge pull request #7784 from ceph/wip-da-SCA-20160219
Coverity and SCA fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-11 13:36:45 -06:00
Sage Weil
a1303ce419 Merge pull request #11830 from adamemerson/wip-crush-unlocked
crush: remove the crush_lock

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-11 13:35:05 -06:00
Sage Weil
26a3dae292 Merge pull request #11910 from xiexingguo/xxg-wip-bluestore-1111
os/bluestore: some more cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-11 12:28:24 -06:00
Igor Fedotov
86c360fc90 os/bluestore: remove build warning in a better way
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-11 20:22:18 +03:00
Sage Weil
80fcdf85ea 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>
2016-11-11 09:34:56 -06:00
Sage Weil
758272bd60 Merge pull request #11905 from xiexingguo/xxg-wip-kill-boost-warn
os/bluestore: fix compiler warnings

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-11 09:30:54 -06:00
Sage Weil
abf5588e9e Merge pull request #11896 from ifed01/wip-bluestore-cleanup
os/bluestore: cleanup around Blob::ref_map

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-11 09:01:12 -06:00
John Spray
6b2dc4ac73 Merge pull request #11710 from ceph/wip-jlayton-fsync
Fix long stalls when calling ceph_fsync()

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-11 15:29:15 +01:00
Kefu Chai
36bf16d073 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>
2016-11-11 22:00:39 +08:00
root
736c1edddf os/test/store_test: fix legacy bluestore cache settings application
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-11 13:46:37 +00:00
Igor Fedotov
0edfc9ebe4 os/bluestore: make Blob::ref_map private
Signed-off-by: Igor Fedotov <ifedotov@minratis.com>
2016-11-11 15:53:26 +03:00
Igor Fedotov
a729a01a4f os/bluestore: start using Blob::get_ref over the code
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-11 15:53:26 +03:00
Jeff Layton
a374166c68 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>
2016-11-11 06:28:50 -05:00
Jeff Layton
ccdd778c88 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>
2016-11-11 06:28:50 -05:00
Jeff Layton
cdd2220abb 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>
2016-11-11 06:28:50 -05:00
Jeff Layton
826b30aa28 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>
2016-11-11 06:28:50 -05:00
Jeff Layton
0df562a8e1 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>
2016-11-11 06:28:47 -05:00
Jeff Layton
93954d0e99 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>
2016-11-11 06:28:29 -05:00
Nathan Cutler
5e2f05ef7d doc: drop --journal-check from ceph-mds man page
References: http://tracker.ceph.com/issues/17747
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-11-11 12:21:29 +01:00
John Spray
c88c395938 Merge pull request #11790 from jcsp/wip-mclientcaps
client: remove unneeded layout on MClientCaps

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2016-11-11 12:10:49 +01:00
John Spray
d5bea25b50 Merge pull request #11789 from jcsp/wip-17798
mds: require MAY_SET_POOL to set pool_ns

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-11 12:10:21 +01:00
John Spray
36905d7caf Merge pull request #11783 from jcsp/wip-17796
mds: enable rmxattr on pool_namespace attrs 

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-11 12:09:57 +01:00
John Spray
babbfbc8e1 Merge pull request #11739 from SUSE/wip-17747
mds: remove "--journal-check" help text
2016-11-11 12:09:26 +01:00
John Spray
52efd27aec Merge pull request #11692 from stiopaa1/mds_flock_addConstToMemFun
mds/flock: add const to member functions
2016-11-11 12:07:46 +01:00
John Spray
ff9b388f15 Merge pull request #11545 from majianpeng/osdc-objectcache-fix-bug
osdc: After write try merge bh.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-11 12:06:53 +01:00
Wido den Hollander
33f1f60778
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>
2016-11-11 11:53:50 +01:00
Kefu Chai
b581df1778 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>
2016-11-11 17:36:28 +08:00
Wido den Hollander
61bf31f847
doc: Add MON docs about pool flags and pool removal config settings
Signed-off-by: Wido den Hollander <wido@42on.com>
2016-11-11 10:00:27 +01:00
Michal Jarzabek
d3bbcffa38 mds/MDCache.h: remove unused functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-11-11 08:14:39 +00:00
Brad Hubbard
6cc6aca053 msg: Fix typos in socket creation error message
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-11-11 16:30:14 +10:00
xie xingguo
5bfe679b67 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>
2016-11-11 13:53:31 +08:00
xie xingguo
b32cbcd78f 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>
2016-11-11 13:53:16 +08:00
Dongsheng Yang
d2705be626 rbd-mirror: remove unused comment
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-11-10 23:40:19 -05:00
xie xingguo
ef084317ab 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>
2016-11-11 10:18:36 +08:00
Jason Dillaman
626432160d 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>
2016-11-10 18:24:48 -05:00
Michal Jarzabek
1b266ee3b0 mds/ScrubHeader.h: pass string by const reference
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-11-10 22:49:26 +00:00
Sage Weil
2b63a5d71a Merge pull request #11903 from dmick/master
README: hint at where to look to diagnose test failures
2016-11-10 16:48:18 -06:00
Dan Mick
f81a47dbe3 README: hint at where to look to diagnose test failures
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-11-10 14:43:41 -08:00
Sage Weil
fcb8d754eb 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>
2016-11-10 16:39:38 -06:00
Sage Weil
c78545a051 Merge pull request #11900 from linuxbox2/fix-civetweb-link
cmake: replace civetweb symlink w/file copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-11-10 16:29:35 -06:00
Ilya Dryomov
480c71a7ad krbd: kernel client expects ip[:port], not an entity_addr_t
Commit 2ee1b9a408 ("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>
2016-11-10 22:37:17 +01:00
Dan Mick
6754d97983 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>
2016-11-10 13:01:33 -08:00
Matt Benjamin
d9e5ad5e92 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>
2016-11-10 14:44:27 -05:00
Sage Weil
c5180262a0 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 921c4586f1.

Fixes: http://tracker.ceph.com/issues/17859
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-10 13:56:24 -05:00
Sage Weil
5944838ce4 vstart.sh: allow pool deletion
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-10 11:48:19 -05:00
Sage Weil
573e5b060e qa/workunits/ceph-helpers.sh: allow pool deletes
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-10 11:43:41 -05:00