John Spray
a1fd258ad2
Merge pull request #11211 from ceph/wip-no-recordlock-test
...
test: temporarily remove fork()ing flock tests
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-17 13:04:41 +02:00
John Spray
4270f1adef
Merge pull request #11440 from ceph/wip-jlayton-linkref
...
client: don't take extra target inode reference in ll_link
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-17 12:37:47 +02:00
John Spray
371aeb5279
Merge pull request #11421 from ceph/wip-jlayton-cephfs
...
Small pile of random cephfs fixes and cleanup
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-17 12:36:22 +02:00
Brad Hubbard
842a1527a8
Merge pull request #11515 from badone/wip-find_best_info-typos
...
osd: Fix typos in PG::find_best_info
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
2016-10-17 14:48:13 +10:00
Brad Hubbard
125f90ba18
osd: Fix typos in PG::find_best_info
...
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-17 13:30:58 +10:00
Sage Weil
d6557a1f70
Merge pull request #11513 from badone/clear_primary_state-typo
...
osd: fix typo in PG::clear_primary_state
2016-10-16 21:27:15 -05:00
Sage Weil
894807b9a3
Merge pull request #11514 from xiexingguo/xxg-wip-bluestore-1015
...
os/bluestore: formatting nits
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-16 21:27:00 -05:00
Brad Hubbard
adc51df69d
osd: fix typo in PG::clear_primary_state
...
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-17 08:12:34 +10:00
Kefu Chai
2eb89c8a9c
Merge pull request #11443 from wjwithagen/wip-wjw-freebsd-cmake-options
...
do_freebsd.sh: Set options for debug building.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-16 22:10:48 +08:00
Willem Jan Withagen
ec16ced98d
./do_freebsd.sh: remove pipe to get correct return value
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-10-16 14:28:07 +02:00
Haomai Wang
21d5f49b1f
Merge pull request #11430 from wjwithagen/wip-wjw-freebsd-EventKqueue
...
FreeBSD/EventKqueue.{h,cc} Added code to restore events on (thread)fork
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-10-16 11:52:53 +08:00
Sage Weil
b0c86510fd
Merge pull request #11284 from liewegas/wip-mon-osdmap-features
...
mon/OSDMonitor: encode full osdmaps with features all OSDs can understand
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-15 21:54:35 -05:00
Sage Weil
cbfdfe60df
Merge pull request #11401 from liewegas/wip-mgr-keys
...
auth: tolerate missing MGR keys during upgrade
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-15 21:52:33 -05:00
Sage Weil
16fda71354
auth/cephx: do not re-request *only* the MGR key
...
If we request a bunch of service keys, we may not get
back a MGR key because of an in-progress upgrade. If we
have everything we need except for just the MGR key, do
not bother re-requesting it. Instead just continue and
we'll re-request it later when the secrets rotate.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-15 22:51:27 -04:00
Sage Weil
bf0dc6dbdb
mon/MonClient: do not request MGR key from pre-kraken mons
...
If we do, the older mon will return EPERM.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-15 22:51:27 -04:00
Jeff Layton
23956dea83
client: don't take extra target inode reference in ll_link
...
For the life of me, I can't figure out where this reference is ever put.
We usually take a reference like this when there is an Inode **
parameter that we'll return to the caller. ll_link doesn't have one of
those, so as best I can tell this reference is just leaked.
Zheng however says that FUSE will eventually put this reference via
ll_forget. I still don't quite get how that works, but the other callers
clearly do not handle this correctly. Change the code to only make the
fuse code take this extra reference.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2016-10-15 19:31:46 -04:00
Willem Jan Withagen
9eeb491f00
src/msg/async/EventKqueue: refactor and add test_thread_change()
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-10-15 13:09:51 +02:00
Willem Jan Withagen
a534069cf4
src/msg/async/EventKqueue.cc: adjust logging levels.
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-10-15 13:04:36 +02:00
Willem Jan Withagen
4e3ed5ad04
src/msg/async/EventKqueue.{h,cc} Added code to restore events on (thread)fork
...
According the FreeBSD man page of kqueue(), the kq-descriptors become invalid
upon fork. It looks like the same happens when a kq-handle is created and then
a thread is created.
So we keep a list of assigned events with each kq-handle and when the handle
has beccome invalid, we recreated the kq-handle and the events that go with it.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-10-15 13:04:36 +02:00
Kefu Chai
754ad16eae
Merge pull request #11276 from tchaikov/wip-17400
...
tools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db
Tested-by: Huawen Ren <ren.huanwen@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-15 11:50:54 +08:00
xie xingguo
03ec4be89a
os/bluestore: narrow scope of local variables
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-15 10:57:06 +08:00
xie xingguo
7f74c84290
os/bluestore: formatting nits
...
Remove dupilicated semicolon, 80 chars etc.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-15 10:50:03 +08:00
Sage Weil
b5a191528c
Merge pull request #11339 from liewegas/wip-mon-stuck
...
mon/PGMap: PGs can be stuck more than one thing
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-14 15:04:50 -05:00
Sage Weil
392fa14c06
auth/cephx: tolerate missing rotating keys
...
During an upgrade, we may have a client requesting an
MGR service key but not have one in the database yet,
either because we *just* upgraded and haven't generated
one yet, or because the leader mon hasn't been upgraded
yet.
Fix this by silently tolerating a missing key as long as
one or more other service keys were present and we have
something to give to the client.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-14 14:41:44 -04:00
Sage Weil
d620aad662
Merge pull request #11398 from ifed01/wip-bluestore-rmcoll-fix
...
os/bluestore: fix remove_collection to properly detect collection e…
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 13:41:26 -05:00
Sage Weil
cfcfe9633d
Merge pull request #11493 from atheism/rgw-rgw_rados-fix-specifier
...
rgw: rgw_rados.cc fix shard_num format for snprintf
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 11:14:27 -05:00
Sage Weil
e04155b4f0
Merge pull request #11496 from stiopaa1/mds_infotableAddOverride
...
mds/InfoTable.h: add override to virtual functs
2016-10-14 11:13:55 -05:00
Michal Jarzabek
14f3054370
mds/InfoTable.h: add override to virtual functs
...
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-14 16:32:09 +01:00
Igor Fedotov
620b0dc79d
os/bluestore: fix remove_collection to properly detect collection's empty
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 15:01:29 +00:00
Jeff Layton
e3958efcbb
client: no need to check mask before calling _getattr in statx
...
If the mask is zero, then the cap check will succeed, "yes" will be
true and we'll end up returning quickly from _getattr anyway.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2016-10-14 11:00:33 -04:00
Sage Weil
07d1943597
Merge pull request #11483 from liewegas/wip-bluestore-cleanups
...
os/bluestore: a few cleanups
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-14 09:37:15 -05:00
Sage Weil
38d63c1231
Merge pull request #11445 from ifed01/wip-fix-isal
...
compressor/ZLibCompressor: fix broken isal-l
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 09:33:36 -05:00
Sage Weil
c9ab0cb407
Merge pull request #11495 from yuyuyu101/wip-fix-list
...
bluestore: set next object as ghobject_t::get_max() when start.hobj.i…
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 09:27:31 -05:00
Haomai Wang
ddb378de22
bluestore: set next object as ghobject_t::get_max() when start.hobj.is_max()
...
Signed-off-by: Haomai Wang <haomai@xsky.com>
Signed-off-by: Xinze Chi <xinze@xsky.com>
2016-10-14 22:17:22 +08:00
Sage Weil
f32bb09322
Merge pull request #11491 from xiexingguo/xxg-wip-fs-1014
...
os/filestore: fix potential result code overwriting
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 09:14:59 -05:00
Sage Weil
166d15430c
Merge pull request #11482 from ifed01/wip-bluestore-gc-fixes2
...
os/bluestore: GC infra refactor, more UTs and GC range calculation fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-14 09:13:28 -05:00
Sage Weil
e6d024eb8a
os/bluestore: fix warning
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-14 10:12:14 -04:00
Igor Fedotov
d04eee8795
Merge pull request #11490 from xiexingguo/xxg-wip-bluestore-1014
...
os/bluestore: use iterator for erase() method directly
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 17:01:58 +03:00
xie xingguo
7a16de7402
os/bluestore: use iterator for erase() method directly
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-14 21:51:13 +08:00
Igor Fedotov
f331597fba
common/compressor/ZLibCompressor: add a config option to specify compression level
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 13:44:47 +00:00
Igor Fedotov
47c44a2cb7
os/blustore: fix compile warning
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 12:39:37 +00:00
Igor Fedotov
21b3958f95
os/bluestore: fix GC gc_end_offset miscalculation
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 12:39:35 +00:00
Igor Fedotov
389d3eb33d
os/bluestore: isolate GC stuff to be able to cover it with UT
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-14 12:29:25 +00:00
John Spray
e7137254c4
Merge pull request #11487 from batrick/cephfs-gid
...
cephfs: add gid to asok status
Reviewed-by: John Spray <john.spray@redhat.com>
2016-10-14 12:06:58 +02:00
John Spray
9aacef47b7
Merge pull request #11357 from batrick/i17518
...
mds: use parse_filesystem in parse_role to handle exceptions and reuse parsing code
Reviewed-by: John Spray <john.spray@redhat.com>
2016-10-14 12:04:28 +02:00
John Spray
6e820c347b
Merge pull request #11380 from stiopaa1/mds_snapserver_addOverrideToVirt
...
mds/SnapServer.h: add override to virtual functs
Reviewed-by: John Spray <john.spray@redhat.com>
2016-10-14 10:49:15 +02:00
John Spray
91d9cfe1cc
Merge pull request #11402 from stiopaa1/mds_fsmapRemoveUnneededUseCount
...
mds/FSMap.cc: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-14 10:48:26 +02:00
John Spray
a15daf131b
Merge pull request #11435 from stiopaa1/mds_damageTableMoveSharePtr
...
mds/DamageTable.cc: move shared ptrs
Reviewed-by: John Spray <john.spray@redhat.com>
2016-10-14 10:47:18 +02:00
Weibing Zhang
bf21c5a7b8
rgw: rgw_rados.cc fix shard_num format for snprintf
...
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
2016-10-14 16:17:42 +08:00
John Spray
1f3d96c501
test: temporarily disable fork()'ing tests
...
Fixes: http://tracker.ceph.com/issues/16556
Signed-off-by: John Spray <john.spray@redhat.com>
2016-10-14 08:57:47 +01:00