Commit Graph

78175 Commits

Author SHA1 Message Date
Xie Xingguo
78acfcf05b Merge pull request #17368 from xiexingguo/wip-nice-data
mon/PGMap: nice numbers for 'data' section of 'ceph df' command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-14 18:25:24 +08:00
Patrick Donnelly
d929dae49b
Merge PR #17657 into master
* refs/remotes/upstream/pull/17657/head:
	mds: optimize MDCache::rejoin_scour_survivor_replicas()
	mds: fix MDSCacheObject::clear_replica_map
	mds: support limiting cache by memory
	common: refactor of lru
	mds: resolve unsigned coercion compiler warning
	common: use safer uint64_t for list size
	common: add bytes2str pretty print function
	mds: check if waiting is allocated before use
	mds: go back to compact_map for replicas
	mds: use mempool for cache objects
	mds: cleanup replica_map access
	common: add alloc_ptr smart pointer
	common: add warning on base class use of mempool
	common: use atomic uin64_t for counter

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-13 20:08:51 -07:00
Patrick Donnelly
f818905e0f
Merge PR #17689 into master
* refs/remotes/upstream/pull/17689/head:
	ceph: fix "stopping mds can't export subtree"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-13 18:29:20 -07:00
Patrick Donnelly
d89653dc56
Merge PR #17545 into master
* refs/remotes/upstream/pull/17545/head:
	client: fix request reference leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-09-13 18:29:18 -07:00
vasukulkarni
f1ffcaed6d Merge pull request #17700 from cbodley/wip-qa-smoke-s3tests
qa/smoke: add rgw crypto config for s3tests
2017-09-13 17:44:24 -07:00
Patrick Donnelly
a73ad7676a
Merge PR #17608 into master
* refs/remotes/upstream/pull/17608/head:
	doc/cephfs/posix: put posix notes in perspective

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-13 13:37:57 -07:00
Yuri Weinstein
796ca1235d Merge pull request #17641 from amitkumar50/cov-messages-12
messages: Initialization of variable beat

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-13 12:57:45 -07:00
Yuri Weinstein
1985345c9a Merge pull request #10460 from weiqiaomiao/wqm-wip-rgw-dellc
rgw: add tenant to shard_id in RGWDeleteLC::execute()

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2017-09-13 08:30:03 -07:00
Yuri Weinstein
06b8556f17 Merge pull request #17061 from shashalu/fix-rgw-lc
rgw: fix lc process only schdule the first item of lc objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: fang.yuxiang <fang.yuxiang@eisoo.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-09-13 08:28:24 -07:00
Casey Bodley
72b08e8f96 qa/smoke: add rgw crypto config for s3tests
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-09-13 11:22:28 -04:00
Yuri Weinstein
b7e9473e74 Merge pull request #17631 from joke-lee/RGW-CORS-Access-Control-Allow-Origin-HEADER
rgw: return 'Access-Control-Allow-Origin' header when the set bucket versioning through XMLHttpRequest

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-13 08:20:38 -07:00
Yuri Weinstein
e680ed47fc Merge pull request #17632 from joke-lee/RGW-CORS-Access-Control-Allow-Origin-HEADER-WEBSITE
rgw: return 'Access-Control-Allow-Origin' header when the set and delete bucket website through XMLHttpRequest

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-13 08:20:17 -07:00
Yuri Weinstein
ef188a6a15 Merge pull request #17663 from shashalu/fix-rgw-LCFilter
rgw: Fix closing tag for Prefix

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-13 08:19:33 -07:00
Sage Weil
2496470df3 Merge pull request #17543 from iliul/fix-dup-global-section
vstart.sh: Remove duplicate global section

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-13 09:38:19 -05:00
iliul
549c910715 vstart.sh: Remove duplicate global section
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-09-13 14:04:17 +00:00
Sage Weil
28c1ce209d Merge pull request #17544 from joelin/wip-delete-forgot-mark
msg: remove the ),it's redundant.

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2017-09-13 08:19:26 -05:00
Xie Xingguo
0e604b112e Merge pull request #17515 from xiexingguo/wip-data-digest
osd/PrimaryLogPG: do not set data digest for bluestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-13 18:31:10 +08:00
Yan, Zheng
d32a237604 mds: optimize MDCache::rejoin_scour_survivor_replicas()
avoid iterating dentries if dirfrag is non-auth

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-09-13 15:55:46 +08:00
Yan, Zheng
fd447405be mds: fix MDSCacheObject::clear_replica_map
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-09-13 15:54:45 +08:00
Nathan Cutler
07159477ee Merge pull request #17366 from smithfarm/wip-21176
build/ops: python-numpy-devel build dependency for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ewaznazari <Nazari@keyinternational.academy>
2017-09-13 09:05:01 +02:00
Jos Collin
c383f03b3e Merge pull request #17685 from ygtzf/HashIndex-clerical-error
os/filestore/HashIndex.h: fixed a typo in comment

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-13 05:29:35 +00:00
Haomai Wang
9bf9a4189a Merge pull request #17688 from TsaiJin/wip-fix-assert-bug
msg/asyc/rmda: fix the bug of assert when Infiniband::recv_msg receives disconnect message

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-09-12 22:25:26 -07:00
xie xingguo
5345afa5d5 osd/osd_types.h: default to no data/omap digest for new object
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-13 12:17:16 +08:00
xie xingguo
afcb617dc9 osd/PrimaryLogPG: do not generate data digest for BlueStore by default
BlueStore enables CRC by default, so this is a dup and gains
no more benefits.

Turn this off by default, which is good for performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-13 12:17:16 +08:00
Yan, Zheng
c294051987 ceph: fix "stopping mds can't export subtree"
caused by commit
790c34138f "Make standby-replay mds avoid initiating subtree export"

Fixes: http://tracker.ceph.com/issues/21378
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-09-13 11:40:37 +08:00
Jos Collin
52d09e8c1b Merge pull request #17687 from yonghengdexin735/wip-zzz-error
common: fix typo deamon in comments

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-13 03:39:23 +00:00
Patrick Donnelly
06c94de584
mds: support limiting cache by memory
This introduces two config parameters:

    mds_cache_memory_limit: Sets the soft maximum of the cache to the given
    byte count. (Like mds_cache_size, this doesn't actually limit the maximum
    size of the cache. It just dictates the steady-state size.)

    mds_cache_reservation: This replaces mds_health_cache_threshold everywhere
    except the Beacon heartbeat sent to the mons. The idea here is to specify a
    reservation of memory (5% by default) for operations and the MDS tries to
    always maintain that reservation. So, the MDS will recall caps from clients
    when it begins dipping into its reservation of memory.

mds_cache_size still limits the cache by Inode count but is now by-default 0
(i.e. unlimited). The new preferred way of specifying cache limits is by memory
size. The default is 1GB.

Fixes: http://tracker.ceph.com/issues/20594
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1464976

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 20:02:41 -07:00
Jin Cai
f2969b5d74 msg/asyc/rmda: fix the bug of assert when Infiniband::recv_msg receives
disconnect message

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>
2017-09-13 10:37:23 +08:00
yonghengdexin735
fc5ac9ea69 common:fix error word
Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
2017-09-13 10:22:08 +08:00
Sage Weil
e4b1942cb7 Merge pull request #17613 from smithfarm/wip-12056
doc: document include/ipaddr.h

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-12 21:12:50 -05:00
Sage Weil
c1a6fe52d3 Merge pull request #17644 from Vogtinator/readme-vstart
README: Improve vstart.sh usage
2017-09-12 21:03:42 -05:00
yaoguotao
e612d9506e os/filestore/HashIndex.h: fixed a clerical error
Signed-off-by: yaoguotao <yaoguot@gmail.com>
2017-09-12 21:59:53 -04:00
Sage Weil
25ba984310 Merge pull request #17654 from yuyuyu101/wip-spdk-doc
doc/bluestore: add SPDK usage for bluestore

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-12 18:56:25 -05:00
Sage Weil
c959911ce2 Merge pull request #17658 from ukernel/wip-cephfs-seekdir
doc/cephfs/posix: remove stale information for seekdir

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-12 18:54:29 -05:00
Sage Weil
a98b37a7a0 Merge pull request #17669 from ygtzf/parameter-default-value-error
doc: update default value of parameter mon_subscribe_interval

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-12 18:39:14 -05:00
Sage Weil
dd84417c61 Merge pull request #17672 from FrankYu/master
doc: the client inputs the pool name instead of pool ID

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-09-12 18:36:59 -05:00
Patrick Donnelly
f48113f50f
Merge PR #17679 into master
* refs/remotes/upstream/pull/17679/head:
	qa: get asok path from ceph.conf
	qa: use config_path property instead of literal

Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-12 15:56:32 -07:00
Patrick Donnelly
bc3a00af0f
qa: get asok path from ceph.conf
The asok path was recently moved to /tmp to resolve unix path too long errors.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:52:54 -07:00
Patrick Donnelly
f95798b3ad
qa: use config_path property instead of literal
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:50:33 -07:00
Patrick Donnelly
12d615b3c5
common: refactor of lru
Avoids an unnecessary "max" size of the LRU which was used to calculate the
midpoint. Instead, just dynamically move the LRUObjects between top and bottom
on-the-fly.

This change is necessary for a cache which which does not limit by the number
of objects but by some other metric. (In this case, memory.)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:24 -07:00
Patrick Donnelly
0c2032c287
mds: resolve unsigned coercion compiler warning
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:24 -07:00
Patrick Donnelly
0ddd260a32
common: use safer uint64_t for list size
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:23 -07:00
Patrick Donnelly
7fff24e10e
common: add bytes2str pretty print function
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:23 -07:00
Patrick Donnelly
055020ce80
mds: check if waiting is allocated before use
This prevents accidental allocation of the map.

Also, privatize the variable to protect from this in child classes.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:23 -07:00
Patrick Donnelly
5d67b5cc57
mds: go back to compact_map for replicas
Zheng observed that an alloc_ptr doesn't really work in this case since any
call to get_replicas() will cause the map to be allocated, nullifying the
benefit. Use a compact_map until a better solution can be written. (This means
that the map will be allocated outside the mempool.)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:23 -07:00
Patrick Donnelly
e035b64fcb
mds: use mempool for cache objects
The purpose of this is to allow us to track memory usage by cached objects so
we can limit cache size based on memory available/allocated to the MDS.

This commit is a first step: it adds CInode, CDir, and CDentry to the mempool
but not all of the containers in these classes (e.g. std::map). However,
MDSCacheObject has been changed to allocate its containers through the mempool
by converting compact_* containers to the std versions offered through mempool
via the new alloc_ptr.

(A compact_* class simply wraps a pointer to the std:: version to reduce memory
usage of an object when the container is only occasionally used. The alloc_ptr
allows us to achieve the same thing explicitly with only a little handholding:
when all entries in the wrapped container are deleted, the caller must call
alloc_ptr.release().)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:23 -07:00
Patrick Donnelly
d1b6cadd6c
mds: cleanup replica_map access
The gymnastics protecting the map failed as the code evolved. Just expose it
normally with a getter.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:22 -07:00
Patrick Donnelly
5fa557d271
common: add alloc_ptr smart pointer
This ptr is like a unique_ptr except it allocates the underlying object on
access. The idea being that we can save memory if the object is only needed
sometimes.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-12 15:46:12 -07:00
Tamilarasi Muthamizhan
4d8971e1c8 Merge pull request #17650 from ceph/wip-ceph-deploy-fix
qa/tests: Fix get_system_type failure due to invalid remote name
2017-09-12 15:07:24 -07:00
Mykola Golub
30c92d0a17 Merge pull request #17636 from dillaman/wip-21319
rbd: clean up warnings when mirror commands used on non-setup pool

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-12 21:17:19 +03:00