Commit Graph

74278 Commits

Author SHA1 Message Date
xie xingguo
95b40849e9 os/bluestore: drop _open_alloc() from mkfs
This is useless as the fsck() process will do necessary validations later.
And dropping this can make mkfs slightly faster.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-22 13:52:14 +08:00
xie xingguo
3492d3b670 os/bluestore: prefix open_statfs with "_"
As it is an internal method only.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-22 13:52:14 +08:00
Mykola Golub
0d26ae3be0 Merge pull request #15317 from liupan1111/wip-fix-list
rbd-nbd: display pool/image/snap information in list output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-06-22 07:31:32 +03:00
Jos Collin
b4d17bf2ca Merge pull request #15803 from mikulely/cleanup-rgw_rados_doc
rgw: update function doc in rgw_rados.h  and rgw_rados.cc

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-06-22 04:27:29 +00:00
Sage Weil
4c8c3e93b0 Merge pull request #15261 from mychoxin/yuanxin_use_func
os/filestore: when print log, use __func__ instead of hard code function name

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-06-21 21:14:30 -05:00
Sage Weil
288f623878 Merge pull request #15354 from badone/wip-rados-ls-auth-fix
osd: Reverse order of op_has_sufficient_caps and do_pg_op

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-21 21:14:01 -05:00
Sage Weil
dd8fed575a Merge pull request #15649 from liewegas/wip-20274
osd/PrimaryLogPG: record prior_version for DELETE events

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-21 21:13:14 -05:00
Sage Weil
8d8f2c3dc3 Merge pull request #15601 from liewegas/wip-no-restful-cert
mgr: remove default cert; disable both restful and dashboard by default

Reviewed-by: Boris Ranto <branto@redhat.com>
2017-06-21 21:10:35 -05:00
Jiaying Ren
c61d12e729 rgw: update rgw_rados.h function doc
+ update system_obj_get_attr func comment
+ drop deprecated func comment for get_obj
+ update func comment for pool_iterate_begin

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-06-22 09:33:15 +08:00
Haomai Wang
49fe721073 Merge pull request #15755 from Adirl/wip-HUGEPAGES
msg/async/rdma: automatically set RDMAV_HUGEPAGES_SAFE according to conf

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-06-22 09:23:29 +08:00
Sage Weil
e5dd3a3ca2 qa/workunits/rest/test_mgr_rest_api: remove ruleset
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 21:17:14 -04:00
Sage Weil
647533f552 qa/suites/rados/rest/mgr-restful: configure cert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 21:09:58 -04:00
Sage Weil
025debbb9f pybind/mgr/restful: add 'restful restart' command
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 21:00:35 -04:00
Jason Dillaman
fee2ea1c1c Merge pull request #15757 from runsisi/wip-image-ts
librbd: add create timestamp metadata for image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-21 20:51:52 -04:00
Kefu Chai
720aea32bc Merge pull request #15444 from wjwithagen/wip-wjw-freebsd-termwidth
test: Make screencandy optional for FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-22 07:46:57 +08:00
Sage Weil
7879efdd6b osd/PGLog: ignore ERROR entires in _merge_object_divergent_entries
Sometimes ERROR log entries do not have prior_version.  Also,
they aren't actually updates and don't affect the object.

Fixes: http://tracker.ceph.com/issues/20274
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 18:25:47 -04:00
Sage Weil
b8a9ee8eb3 Merge pull request #15783 from liewegas/wip-20358
os/bluestore: move sharedblob to new collection in same shard
2017-06-21 16:01:51 -05:00
Sage Weil
41401c0ad7 Merge pull request #15785 from liewegas/wip-bluestore-fsck
qa/objectstore/bluestore*: fsck on mount

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-21 16:01:07 -05:00
Mykola Golub
039b74ddfb Merge pull request #15734 from dillaman/wip-librbd-image-remove
librbd: fix issues with image removal state machine

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-06-21 23:41:33 +03:00
Gregory Farnum
0e51ab1012 Merge pull request #15727 from ovh/bp-runtime-cfg-of-hb-inflator
osd, messages/MOSDPing: bunch of fixes related to ping inflation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-21 16:05:40 -04:00
Yuri Weinstein
88fe387614 Merge pull request #15723 from badone/wip-ceph-mon-startup-error-logging
mon: Log errors at startup

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-21 13:01:35 -07:00
Sage Weil
faa44ed3bc Merge pull request #15784 from liewegas/wip-thrash-cleanup
qa/tasks/ceph_manager: get osds all in after thrashing
2017-06-21 14:31:34 -05:00
Sage Weil
a6831381ad Merge pull request #15787 from liewegas/wip-19943-fix
ceph-objectstore-tool: do not populate snapmapper with missing clones

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-21 14:31:02 -05:00
Kefu Chai
b85e572109 Merge pull request #15813 from tchaikov/wip-cmake
cmake: do not add dependencies to INTERFACE library on cmake < 3.3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-06-22 00:57:17 +08:00
Sage Weil
a9ae65e71b pybind/mgr/restful: remove default path names for the cert
I don't think these are useful.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 12:32:52 -04:00
Sage Weil
4e4d81cd70 pybind/mgr/restful: do not start if no certificate is configured
This removes the default filename, by the way.  We also work around a
problem with make_server where it sets up the socket to listen before
checking for the cert, thereby making it problematic to rebind to the
port shortly thereafter when we do have a socket.  (SO_REUSEADDR would
be appropriate but there doesn't seem to be an easy way to make
make_server use it.)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 12:32:52 -04:00
Boris Ranto
4dc471ed60 restful: Introduce create-self-signed-cert command
This implements a create-self-signed-cert command for the ceph-mgr
restful interface.

It is designed so that it will try to restart the module once the cert
is created.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-06-21 12:32:49 -04:00
Casey Bodley
81f85d74b2 Merge pull request #15060 from shashalu/fix-slo-dlo-range
rgw: fix SLO/DLO range requests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-21 12:12:38 -04:00
Sage Weil
be5e6e3662 Merge pull request #15791 from liewegas/wip-20360
Revert "qa: do not restrict valgrind runs to centos"
2017-06-21 10:55:53 -05:00
Kefu Chai
96b2016489 cmake: do not add dependencies to INTERFACE library on cmake < 3.3
otherwise we will have

add_dependencies Cannot add target-level dependencies to INTERFACE
library

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-21 23:34:51 +08:00
Sage Weil
1e7cd3550c Merge pull request #13683 from liewegas/wip-crush-rulesets
crush: detect and (usually) fix ruleset != rule id

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-06-21 08:45:42 -05:00
Matt Benjamin
7873c48eb1 Merge pull request #15789 from linuxbox2/wip-nfs-doc
RGW NFS: add nfs.rst to doc/radosgw
(override because make check fail [missing selinux policy help file] unrelated)
2017-06-21 09:20:40 -04:00
Matt Benjamin
30383502a2 RGW NFS: add nfs.rst to doc/radosgw
This document contains sections by John Wilkins <jowilkin@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-06-21 08:37:52 -04:00
John Spray
170fc31ae1 Merge pull request #15255 from david-z/wip-mgr-fsstatus
pybind/mgr/fsstatus: use mds_mem.dn as dentry counter

Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-21 07:46:02 -04:00
John Spray
20a4762869 Merge pull request #15621 from mingshuaiwang/master
mds: mds perf item 'l_mdl_expos' always behind journaler

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-06-21 07:32:09 -04:00
John Spray
32ff1de9f2 Merge pull request #15662 from renhwztetecs/renhw-wip-client-trim_cache
client: call the lru_remove() twice,when trim cache

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-06-21 07:31:27 -04:00
John Spray
623e8b2a13 Merge pull request #15715 from jcsp/wip-jt-rmapply
tools/cephfs: remove `apply` mode of cephfs-journal-tool

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-21 07:30:53 -04:00
John Spray
21ed003ccf Merge pull request #15779 from renhwztetecs/renhw-wip-client-dentry
client: fix Dentry::dump

Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-21 07:30:34 -04:00
lu.shasha
9eec1b4ef9 rgw: fix SLO/DLO range requests
Sending any SLO/DLO range requests will retrun InvalidRange error. SLO/DLO should call range_to_ofs after got object size instead of read_op.prepare() to deal with negative offsets.

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-06-21 09:28:24 +08:00
Sage Weil
503de20927 Merge pull request #15728 from majianpeng/bluefs-remove-memcopy-for-continue-memory
os/bluestore/BlueFS: Rebuild memcopy for bufferlist::page_aligned_app…

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-20 16:53:45 -05:00
Sage Weil
a9b363cdaf unittest_bufferlist: test page_aligned_appender
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-21 07:09:04 +08:00
Jianpeng Ma
717809fafc os/bluestore/BlueFS: replace claim_append with claim_append_piecewise to reduce memory copy.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-06-21 07:08:18 +08:00
Jianpeng Ma
434656c610 common/buffer: add function bufferlist::claim_append_piecewise(list& bl).
This only useful for bl is bufferlist::page_aligned_appender. Using
this function can remove memcopy for continue ptrs.
Because page_aligned_appender::flush will split a ptr into two or
more ptrs. For this case, rebuild_aligned_size_and_memory can't handle,
it  will rebuild.

For example
a=bl.get_page_aligned_appender(1);
a.append(3K)
a.flush();
t.claim_append(bl);
a.append(1K);
a.flush();
t.claim_append(bl);

dst.claim_append(t);
//3K and 1K ptr are continue in memory. But they are two ptrs..
dst.is_aligned_size_and_memory(4096,4096) is false.

We add new function claim_append_piecewise() to specially
handle this case.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-06-21 07:04:51 +08:00
Sage Weil
abad4772e0 osd: replicated_ruleset -> replicated_rule
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:45:59 -04:00
Sage Weil
fcc8069786 pybind/mgr/restful: remove default of 127.0.0.1
i.e., disabled until explicitly enabled by an admin

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:25:05 -04:00
Sage Weil
015bc3f5c5 pybind/mgr/dashboard: remove default of 127.0.0.1
i.e., disabled until explicitly enabled by an admin.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:25:05 -04:00
Sage Weil
de026f15f8 ceph.spec,debian: remove auto-generated self-signed mgr restful cert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:25:05 -04:00
Sage Weil
aa76cf7488 Revert "qa: do not restrict valgrind runs to centos"
This reverts commit 5923961465.

See http://tracker.ceph.com/issues/20360

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:14:52 -04:00
Casey Bodley
2edd33c1a7 Merge pull request #15260 from shashalu/fix-secondary-zonegroup-cors
rgw: update bucket cors in secondary zonegroup should forward to master

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-20 16:54:08 -04:00
Sage Weil
853a54a7e5 Merge pull request #15709 from jcsp/wip-dashboard-loglast
mgr/dashboard: load log lines on startup, split out audit log

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-20 15:25:30 -05:00