]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agocommon/options: long description for log_stderr_prefix 19869/head
Sage Weil [Tue, 9 Jan 2018 14:24:54 +0000 (08:24 -0600)]
common/options: long description for log_stderr_prefix

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #19791 into master
Patrick Donnelly [Tue, 9 Jan 2018 04:45:32 +0000 (20:45 -0800)]
Merge PR #19791 into master

* refs/pull/19791/head:
doc: misc fixes
doc: fix heading

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agodoc: misc fixes 19791/head
Jos Collin [Fri, 5 Jan 2018 06:21:00 +0000 (11:51 +0530)]
doc: misc fixes

misc fixes for best-practices.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19662 from tchaikov/wip-denc-cxx-17
Kefu Chai [Tue, 9 Jan 2018 03:34:15 +0000 (11:34 +0800)]
Merge pull request #19662 from tchaikov/wip-denc-cxx-17

denc: use constexpr-if to replace some SFINAE impls

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agodenc: use constexpr-if to replace some SFINAE impls 19662/head
Kefu Chai [Sat, 23 Dec 2017 08:56:53 +0000 (16:56 +0800)]
denc: use constexpr-if to replace some SFINAE impls

more readable this way IMO.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #19807 into master
Patrick Donnelly [Mon, 8 Jan 2018 22:27:36 +0000 (14:27 -0800)]
Merge PR #19807 into master

* refs/pull/19807/head:
mds: warn for mds_cache_memory_limit bug in doc

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agomds: warn for mds_cache_memory_limit bug in doc 19807/head
Patrick Donnelly [Fri, 5 Jan 2018 19:23:23 +0000 (11:23 -0800)]
mds: warn for mds_cache_memory_limit bug in doc

Fixes: http://tracker.ceph.com/issues/22599
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19657 from adamemerson/wip-hypermodern
Adam C. Emerson [Mon, 8 Jan 2018 21:31:57 +0000 (16:31 -0500)]
Merge pull request #19657 from adamemerson/wip-hypermodern

The Day Has Come!

Update language standard version to C++17 and remove backported standard library features.

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19823 from trociny/wip-ggate-list-xml
Jason Dillaman [Mon, 8 Jan 2018 21:18:41 +0000 (16:18 -0500)]
Merge pull request #19823 from trociny/wip-ggate-list-xml

rbd-ggate: make list command produce valid xml format output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19846 from fangyuxiangGL/compress-info
Casey Bodley [Mon, 8 Jan 2018 20:54:41 +0000 (15:54 -0500)]
Merge pull request #19846 from fangyuxiangGL/compress-info

rgw: make radosgw object stat RGW_ATTR_COMPRESSION dump readable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19732 from shinobu-x/using_find_primarylogpg
Yuri Weinstein [Mon, 8 Jan 2018 20:51:11 +0000 (12:51 -0800)]
Merge pull request #19732 from shinobu-x/using_find_primarylogpg

osd: Making use of find to reduce computational complexity

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19765 from liewegas/wip-force-backfill-cleanups
Yuri Weinstein [Mon, 8 Jan 2018 20:50:18 +0000 (12:50 -0800)]
Merge pull request #19765 from liewegas/wip-force-backfill-cleanups

qa: tolerate failure to force backfill

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19786 from dillaman/wip-osd-class-cap
Yuri Weinstein [Mon, 8 Jan 2018 20:49:51 +0000 (12:49 -0800)]
Merge pull request #19786 from dillaman/wip-osd-class-cap

osd: support class method whitelisting within caps

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years ago{common,osd,mds,rbd}: Remove unused captures 19657/head
Adam C. Emerson [Sat, 23 Dec 2017 00:36:09 +0000 (19:36 -0500)]
{common,osd,mds,rbd}: Remove unused captures

If we aren't referencing a variable, don't capture it. (This makes the
lambdas smaller, too, modulo Sufficiently Smart Compiler.)

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agodout: Remove VLA sanity check
Adam C. Emerson [Fri, 22 Dec 2017 23:44:57 +0000 (18:44 -0500)]
dout: Remove VLA sanity check

This doesn't seem to be able to work for C++17 under both GCC and
Clang. Maybe there's a better way to do it. I might try routing
that argument through a constexpr function in the macro later.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Remove backport_std.h entirely
Adam C. Emerson [Fri, 22 Dec 2017 23:35:39 +0000 (18:35 -0500)]
common: Remove backport_std.h entirely

And use the experimental ostream joiner provided with the library.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Remove backported C++17 functions
Adam C. Emerson [Fri, 22 Dec 2017 22:30:08 +0000 (17:30 -0500)]
common: Remove backported C++17 functions

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Remove backported typedefs
Adam C. Emerson [Fri, 22 Dec 2017 21:41:58 +0000 (16:41 -0500)]
common: Remove backported typedefs

Since they're no longer needed.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agobuild: Bump language to C++17
Adam C. Emerson [Fri, 22 Dec 2017 20:04:17 +0000 (15:04 -0500)]
build: Bump language to C++17

Fix up all of the fallout from that.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19475 from ZVampirEM77/wip-em-copyobj-ret
Yuri Weinstein [Mon, 8 Jan 2018 16:57:53 +0000 (08:57 -0800)]
Merge pull request #19475 from ZVampirEM77/wip-em-copyobj-ret

rgw: add xml output header in RGWCopyObj_ObjStore_S3 response msg

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: scienceluo <luo.kexue@zte.com.cn>
7 years agoMerge pull request #19824 from qrGitHub/wip-rgw-useless-line3
Matt Benjamin [Mon, 8 Jan 2018 16:55:23 +0000 (11:55 -0500)]
Merge pull request #19824 from qrGitHub/wip-rgw-useless-line3

rgw: drop useless type conversion

7 years agoMerge pull request #19570 from yaozongyou/rgw-remove-unused-variable
Yuri Weinstein [Mon, 8 Jan 2018 16:55:10 +0000 (08:55 -0800)]
Merge pull request #19570 from yaozongyou/rgw-remove-unused-variable

cls/rgw: remove unused variable bl

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: make radosgw object stat RGW_ATTR_COMPRESSION dump readable 19846/head
fang yuxiang [Mon, 8 Jan 2018 16:54:55 +0000 (00:54 +0800)]
rgw: make radosgw object stat RGW_ATTR_COMPRESSION dump readable

Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
7 years agoMerge pull request #19575 from Liuchang0812/rgw-tier-type-check
Yuri Weinstein [Mon, 8 Jan 2018 16:54:23 +0000 (08:54 -0800)]
Merge pull request #19575 from Liuchang0812/rgw-tier-type-check

rgw: proper error message when tier_type does not exist

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19582 from qrGitHub/wip-rgw-redundant-readingAttrs
Yuri Weinstein [Mon, 8 Jan 2018 16:53:19 +0000 (08:53 -0800)]
Merge pull request #19582 from qrGitHub/wip-rgw-redundant-readingAttrs

rgw: remove get_system_obj_attrs in function RGWDeleteLC::execute and RGWDeleteCORS::execute

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19676 from qrGitHub/wip-rgw-redundant-compare
Yuri Weinstein [Mon, 8 Jan 2018 16:52:25 +0000 (08:52 -0800)]
Merge pull request #19676 from qrGitHub/wip-rgw-redundant-compare

rgw: remove redundant signature compare in LocalEngine::authenticate

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19678 from yaozongyou/rgw-civetweb-status-code
Yuri Weinstein [Mon, 8 Jan 2018 16:51:35 +0000 (08:51 -0800)]
Merge pull request #19678 from yaozongyou/rgw-civetweb-status-code

rgw: log the right http status code in civetweb frontend's access log

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #19687 from qrGitHub/wip-rgw-bucketPolicy-invalidEffect
Yuri Weinstein [Mon, 8 Jan 2018 16:49:51 +0000 (08:49 -0800)]
Merge pull request #19687 from qrGitHub/wip-rgw-bucketPolicy-invalidEffect

rgw: put bucket policy panics RGW process

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19700 from qrGitHub/wip-rgw-optimize-function
Yuri Weinstein [Mon, 8 Jan 2018 16:49:18 +0000 (08:49 -0800)]
Merge pull request #19700 from qrGitHub/wip-rgw-optimize-function

rgw: optimize function RGWHandler::do_init_permissions

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19710 from qrGitHub/wip-rgw-optimize-function2
Yuri Weinstein [Mon, 8 Jan 2018 16:46:54 +0000 (08:46 -0800)]
Merge pull request #19710 from qrGitHub/wip-rgw-optimize-function2

rgw: optimize function abort_bucket_multiparts

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19772 from fangyuxiangGL/quota
Yuri Weinstein [Mon, 8 Jan 2018 16:46:22 +0000 (08:46 -0800)]
Merge pull request #19772 from fangyuxiangGL/quota

rgw: update quota is inconsistent at add/del object with compression

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19773 from chuang-he/fix_create_form_headers
Yuri Weinstein [Mon, 8 Jan 2018 16:46:02 +0000 (08:46 -0800)]
Merge pull request #19773 from chuang-he/fix_create_form_headers

rgw: fix the return type is wrong

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19431 from wido/mgr-pg-status
John Spray [Mon, 8 Jan 2018 16:13:56 +0000 (16:13 +0000)]
Merge pull request #19431 from wido/mgr-pg-status

mgr/dashboard: Fix PG status coloring

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19294 from myoungwon/wip-manifest-ref-flush
Sage Weil [Mon, 8 Jan 2018 14:55:47 +0000 (08:55 -0600)]
Merge pull request #19294 from myoungwon/wip-manifest-ref-flush

osd: flush operations for chunked objects

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19428 from tchaikov/wip-erasure-cleanup
Kefu Chai [Mon, 8 Jan 2018 11:51:10 +0000 (19:51 +0800)]
Merge pull request #19428 from tchaikov/wip-erasure-cleanup

erasure-code: use std::count() instead

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #19777 from tchaikov/wip-rpm-fix-upgrade
Kefu Chai [Mon, 8 Jan 2018 11:07:48 +0000 (19:07 +0800)]
Merge pull request #19777 from tchaikov/wip-rpm-fix-upgrade

rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
7 years agorgw: drop useless type conversion 19824/head
Bingyin Zhang [Mon, 8 Jan 2018 01:02:29 +0000 (09:02 +0800)]
rgw: drop useless type conversion

* variable 'max_buckets' is already 'uint64_t', so the type conversion is useless.

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agoMerge pull request #18827 from TaewoongKim/anticipation_timeout
Eric Ivancich [Sun, 7 Jan 2018 15:49:18 +0000 (10:49 -0500)]
Merge pull request #18827 from TaewoongKim/anticipation_timeout

osd: Make dmclock's anticipation timeout be configurable

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: myoungwon oh <omwmw@sk.com>
7 years agoMerge pull request #19704 from trociny/wip-nbd-format
Jason Dillaman [Sun, 7 Jan 2018 14:04:35 +0000 (09:04 -0500)]
Merge pull request #19704 from trociny/wip-nbd-format

rbd-nbd: output format support for list-mapped command

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19722 from Songweibin/wip-rbd-import
Jason Dillaman [Sun, 7 Jan 2018 13:56:41 +0000 (08:56 -0500)]
Merge pull request #19722 from Songweibin/wip-rbd-import

rbd: replace positional_path parameter with arg_index in get_path()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: fix ObjectContextRef leak 19294/head
myoungwon oh [Fri, 5 Jan 2018 07:28:57 +0000 (16:28 +0900)]
osd: fix ObjectContextRef leak

To avoid ObjectContextRef leak, drop ObjectContextRef
before send a flush request to low tier

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoosd: fix updating wrong object size
myoungwon oh [Fri, 22 Dec 2017 11:05:34 +0000 (20:05 +0900)]
osd: fix updating wrong object size

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoosd: use stop_block() if the object is blocked
myoungwon oh [Thu, 7 Dec 2017 07:32:32 +0000 (16:32 +0900)]
osd: use stop_block() if the object is blocked

This commit prevents double free in finish_flush()
(stop_block() -> cancel_flush())

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agosrc/test: remove version check and add data alignment for chunk_read test
myoungwon oh [Tue, 5 Dec 2017 06:54:03 +0000 (15:54 +0900)]
src/test: remove version check and add data alignment for chunk_read test

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agosrc/test: add chunked object unit test
myoungwon oh [Tue, 5 Dec 2017 06:52:49 +0000 (15:52 +0900)]
src/test: add chunked object unit test

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoosd: add ordered flag if the object is flushing
myoungwon oh [Tue, 5 Dec 2017 07:12:56 +0000 (16:12 +0900)]
osd: add ordered flag if the object is flushing

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoosd: add flush() for the chunked object.
myoungwon oh [Tue, 20 Jun 2017 11:38:18 +0000 (20:38 +0900)]
osd: add flush() for the chunked object.

If all chunks are dirty, the cheunked object will be flushed

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoosd: set dirty flag if chunks are overwritten
myoungwon oh [Sat, 2 Dec 2017 12:41:57 +0000 (21:41 +0900)]
osd: set dirty flag if chunks are overwritten

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agorbd-ggate: make list command produce valid xml format output 19823/head
Mykola Golub [Wed, 3 Jan 2018 16:41:01 +0000 (18:41 +0200)]
rbd-ggate: make list command produce valid xml format output

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #17010 from jgibson/bugfix-rgw-s3-policy-ip-address-condition
Adam C. Emerson [Sun, 7 Jan 2018 07:07:55 +0000 (02:07 -0500)]
Merge pull request #17010 from jgibson/bugfix-rgw-s3-policy-ip-address-condition

rgw: S3 Bucket Policy Conditions IpAddress and NotIpAddress do not work

Reviewed-By: Adam C. Emerson <aemerson@redhat.com>
Reviewed-By: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #19354 from shinobu-x/osd_atomic
Yuri Weinstein [Sat, 6 Jan 2018 17:29:52 +0000 (09:29 -0800)]
Merge pull request #19354 from shinobu-x/osd_atomic

osd: Use specializations, typedefs instead

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #19549 from bi-shun/brotli-compressor
Yuri Weinstein [Sat, 6 Jan 2018 17:28:58 +0000 (09:28 -0800)]
Merge pull request #19549 from bi-shun/brotli-compressor

compressor: Add Brotli Compressor

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19564 from kungf/list_bucket_osd
Yuri Weinstein [Sat, 6 Jan 2018 17:28:22 +0000 (09:28 -0800)]
Merge pull request #19564 from kungf/list_bucket_osd

mon/OSDMonitor: list osd tree in named bucket

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19816 from tchaikov/wip-22596
Sage Weil [Sat, 6 Jan 2018 16:25:12 +0000 (10:25 -0600)]
Merge pull request #19816 from tchaikov/wip-22596

qa/standalone: remove osd-map-max-advance related tests

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agorpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 19777/head
Kefu Chai [Thu, 4 Jan 2018 08:08:25 +0000 (16:08 +0800)]
rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is the rpm's counterpart of debian/control changes related to the
ceph-{osdomap,kvstore,monstore}-tool feature move. see #19328 and #19356.
the commit introducing this move is 6dba25e. and

$ git describe 6dba25e
v12.2.2-8-g6dba25e39d

so the first release that have this change is 12.2.2-8. in other words,
ceph-{base,osd,mon} >= 12.2.2.8 cannot co-exist with ceph-test < 12.2.2-8
in the same system. so we let ceph-test Requires ceph-common with the
same version. and since ceph-{osd,mon} Requires ceph-base with the same
version, and ceph-base Requires ceph-common with the same version, so by
tiering ceph-test with ceph-common with the same version, we enforce
this restriction.

Fixes: http://tracker.ceph.com/issues/22558
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/standalone: remove osd-map-max-advance related tests 19816/head
Kefu Chai [Sat, 6 Jan 2018 11:38:57 +0000 (19:38 +0800)]
qa/standalone: remove osd-map-max-advance related tests

this setting was removed in 8967b73

Fixes: http://tracker.ceph.com/issues/22596
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19808 from cbodley/wip-boost-1.66
Kefu Chai [Sat, 6 Jan 2018 03:35:44 +0000 (11:35 +0800)]
Merge pull request #19808 from cbodley/wip-boost-1.66

cmake: update minimum boost version to 1.66

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19358 from taoCH/wip-librgw-multitenancy
Matt Benjamin [Fri, 5 Jan 2018 20:49:14 +0000 (15:49 -0500)]
Merge pull request #19358 from taoCH/wip-librgw-multitenancy

librgw: export multitenancy support

7 years agocmake: add WITH_BOOST_CONTEXT option 19808/head
Casey Bodley [Sun, 26 Nov 2017 20:46:26 +0000 (15:46 -0500)]
cmake: add WITH_BOOST_CONTEXT option

adds a more specific option for this boost::context dependency, which was
previously only used by the radosgw beast frontend. see
http://tracker.ceph.com/issues/20048 for more background

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocmake: remove Beast submodule and include path
Casey Bodley [Tue, 19 Dec 2017 03:23:53 +0000 (22:23 -0500)]
cmake: remove Beast submodule and include path

the beast library is included in boost 1.66

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: update beast frontend for boost 1.66
Casey Bodley [Tue, 5 Dec 2017 19:43:06 +0000 (14:43 -0500)]
rgw: update beast frontend for boost 1.66

Fixes: http://tracker.ceph.com/issues/22600
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19806 from cbodley/wip-common-escape
Casey Bodley [Fri, 5 Jan 2018 19:29:23 +0000 (14:29 -0500)]
Merge pull request #19806 from cbodley/wip-common-escape

common: add streaming interfaces for json/xml escaping

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocmake: update minimum boost version to 1.66
Casey Bodley [Mon, 18 Dec 2017 18:03:35 +0000 (13:03 -0500)]
cmake: update minimum boost version to 1.66

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocommon: add streaming interfaces for json/xml escaping 19806/head
Casey Bodley [Fri, 5 Jan 2018 17:36:18 +0000 (12:36 -0500)]
common: add streaming interfaces for json/xml escaping

adds stream output operators that escape json/xml strings without having
to allocate a separate output buffer

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agotest: EscapeJson.Utf8 uses json instead of xml
Casey Bodley [Thu, 4 Jan 2018 22:35:34 +0000 (17:35 -0500)]
test: EscapeJson.Utf8 uses json instead of xml

the xml version does not escape the \n, while json does

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agotest: use hex string literals
Casey Bodley [Thu, 4 Jan 2018 22:34:15 +0000 (17:34 -0500)]
test: use hex string literals

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19279 from taoCH/wip-fix-librgw-shutdown-err
Yuri Weinstein [Fri, 5 Jan 2018 16:42:12 +0000 (08:42 -0800)]
Merge pull request #19279 from taoCH/wip-fix-librgw-shutdown-err

librgw: fix shutdown err with resources uncleaned

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #19394 from zhangsw/cleanup-rgw-datasync-lease_cr
Yuri Weinstein [Fri, 5 Jan 2018 16:41:42 +0000 (08:41 -0800)]
Merge pull request #19394 from zhangsw/cleanup-rgw-datasync-lease_cr

rgw: lease_cr->go_down is called twice, remove the needless one.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19725 from shinobu-x/osd_max_object_size
Kefu Chai [Fri, 5 Jan 2018 16:02:28 +0000 (00:02 +0800)]
Merge pull request #19725 from shinobu-x/osd_max_object_size

osd,os/bluestore: Display current size of osd_max_object_size

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19718 from ifed01/wip-ifed-freelist-cleanup
Kefu Chai [Fri, 5 Jan 2018 15:59:58 +0000 (23:59 +0800)]
Merge pull request #19718 from ifed01/wip-ifed-freelist-cleanup

os/bluestore: refactor FreeListManager to get clearer view on the number

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18324 from Jeegn-Chen/wip-bucket-quota-api
Casey Bodley [Fri, 5 Jan 2018 15:52:30 +0000 (10:52 -0500)]
Merge pull request #18324 from Jeegn-Chen/wip-bucket-quota-api

rgw: Admin API Support for bucket quota change

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19719 from shinobu-x/bluestore_extentmap_dup
Kefu Chai [Fri, 5 Jan 2018 15:50:29 +0000 (23:50 +0800)]
Merge pull request #19719 from shinobu-x/bluestore_extentmap_dup

bluestore: BlueStore::ExtentMap::dup impl

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19698 from Liuchang0812/cleanup-ceph-tool
Kefu Chai [Fri, 5 Jan 2018 15:43:30 +0000 (23:43 +0800)]
Merge pull request #19698 from Liuchang0812/cleanup-ceph-tool

ceph: add the right bracket to watch-channel argument in the help message

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19660 from cfanz/tmp
Kefu Chai [Fri, 5 Jan 2018 15:35:54 +0000 (23:35 +0800)]
Merge pull request #19660 from cfanz/tmp

include/encoding: fix compat version error message

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19654 from yaozongyou/test-fix-memory-leak
Kefu Chai [Fri, 5 Jan 2018 15:16:06 +0000 (23:16 +0800)]
Merge pull request #19654 from yaozongyou/test-fix-memory-leak

test: fix unittest memory leak to silence valgrind

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19598 from jcsp/wip-22457
Kefu Chai [Fri, 5 Jan 2018 15:15:04 +0000 (23:15 +0800)]
Merge pull request #19598 from jcsp/wip-22457

packaging: explicit jinja2 dependency for dashboard

Reviewed-by: Wido den Hollander <wido@42on.com>
7 years agoMerge pull request #19792 from joscollin/wip-doc-cephfs
Nathan Cutler [Fri, 5 Jan 2018 14:58:36 +0000 (15:58 +0100)]
Merge pull request #19792 from joscollin/wip-doc-cephfs

doc: add mount.fuse.ceph to index

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: fix typo 19792/head
Jos Collin [Fri, 5 Jan 2018 14:07:31 +0000 (19:37 +0530)]
doc: fix typo

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: add mount.fuse.ceph to index
Jos Collin [Fri, 5 Jan 2018 07:11:37 +0000 (12:41 +0530)]
doc: add mount.fuse.ceph to index

Added mount.fuse.ceph to index.rst

Fixes: http://tracker.ceph.com/issues/22595
Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agorgw: update quota is inconsistent at add/del object with compression 19772/head
fang yuxiang [Thu, 4 Jan 2018 03:45:48 +0000 (11:45 +0800)]
rgw: update quota is inconsistent at add/del object with compression

Fixes: http://tracker.ceph.com/issues/22568
Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
7 years agodoc: fix heading
Jos Collin [Fri, 5 Jan 2018 05:54:23 +0000 (11:24 +0530)]
doc: fix heading

Fixed 'Which kernel version?' heading not having brown color background.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19559 from liu-chunmei/fix_dpdk_bug_base_spdk
Haomai Wang [Fri, 5 Jan 2018 03:58:53 +0000 (11:58 +0800)]
Merge pull request #19559 from liu-chunmei/fix_dpdk_bug_base_spdk

osd: fix dpdk runtime issue based on spdk/dpdk libarary

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agodoc: Add usage doc for individual bucket quota Admin API 18324/head
Jeegn Chen [Thu, 4 Jan 2018 07:59:00 +0000 (07:59 +0000)]
doc: Add usage doc for individual bucket quota Admin API

Add usage doc for a new Admin API for individual bucket quota management

Fixes: http://tracker.ceph.com/issues/21811
Signed-off-by: Jeegn Chen <jeegnchen@gmail.com>
7 years agodoc/rados: document new class method whitelisting cap syntax 19786/head
Jason Dillaman [Thu, 4 Jan 2018 21:56:51 +0000 (16:56 -0500)]
doc/rados: document new class method whitelisting cap syntax

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: caps now support whitelisting execution of class methods
Jason Dillaman [Thu, 4 Jan 2018 21:52:00 +0000 (16:52 -0500)]
osd: caps now support whitelisting execution of class methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: fix dpdk runtime issue based on spdk/dpdk libarary 19559/head
chunmei Liu [Sat, 16 Dec 2017 18:45:32 +0000 (10:45 -0800)]
osd: fix dpdk runtime issue based on spdk/dpdk libarary

1.misunderstand mbuf_overhead before, so correct it.
2.spdk/dpdk library will set refcnt, so needn't set it here.
3.avoid dpdk library modification. when create memory pool set elt_size as
mbuf_overhead + mbuf_data_size to avoid dpdk library check size assert.
4. call rte_pktmbuf_prefree_seg to set mbuf->next = null avoid dpdk/lib
modification .
5. use memzon to allocate mbuf data part, so these data buf can be
processes the same way as mbuf allocated by mempool create.

Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
7 years agoosd: track class methods when evaluating caps
Jason Dillaman [Thu, 4 Jan 2018 21:05:06 +0000 (16:05 -0500)]
osd: track class methods when evaluating caps

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #19766 into master
Patrick Donnelly [Thu, 4 Jan 2018 19:31:19 +0000 (11:31 -0800)]
Merge PR #19766 into master

* refs/pull/19766/head:
mds: fix typo

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19756 from shinobu-x/objecter_unique_lock
Gregory Farnum [Thu, 4 Jan 2018 17:58:20 +0000 (09:58 -0800)]
Merge pull request #19756 from shinobu-x/objecter_unique_lock

osdc: Do not use lock_guard as unique_lock

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoRevert "Merge PR #19369 into master"
Patrick Donnelly [Thu, 4 Jan 2018 17:41:06 +0000 (09:41 -0800)]
Revert "Merge PR #19369 into master"

This reverts commit 3189ba19a779e4a54265aa831a57d686a7911187, reversing
changes made to b7620de0200bdbac6a1a7abbdfbafd8b43d7bf47.

Despite the change in json format being positive, the unfortunate side-effect
is that it broke upgrade testing (because the QA framework must handle the
transition of mdsmap["info"] to a list from object) and the ceph-mgr.

Fixes: http://tracker.ceph.com/issues/22527
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19763 from tchaikov/wip-cmake
Sage Weil [Thu, 4 Jan 2018 17:11:49 +0000 (11:11 -0600)]
Merge pull request #19763 from tchaikov/wip-cmake

cmake: pass static linkflags to the linker who links libcommon

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoadmin/build-doc: support renamed python2 RPMs
Jason Dillaman [Thu, 4 Jan 2018 14:55:16 +0000 (09:55 -0500)]
admin/build-doc: support renamed python2 RPMs

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19780 from tchaikov/wip-22266
Sage Weil [Thu, 4 Jan 2018 14:32:36 +0000 (08:32 -0600)]
Merge pull request #19780 from tchaikov/wip-22266

tools/ceph_monstore_tool: include mgrmap in initial paxos epoch

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agotools/ceph_monstore_tool: include mgrmap in initial paxos epoch 19780/head
Kefu Chai [Thu, 4 Jan 2018 05:06:52 +0000 (13:06 +0800)]
tools/ceph_monstore_tool: include mgrmap in initial paxos epoch

before this change, the "mgr" map is not included paxos, thus why the
peon mon fails to have the mgr map after it is sync'ed with its leader.
and hence there is chance that ceph-mgr is unable to get a mgr map from
the monitor it is connected to.

Fixes: http://tracker.ceph.com/issues/22266
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: pass static linkflags to the linker who links libcommon 19763/head
Kefu Chai [Wed, 3 Jan 2018 13:43:51 +0000 (21:43 +0800)]
cmake: pass static linkflags to the linker who links libcommon

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorgw: Add URL format support for bucket quota modification
Jeegn Chen [Thu, 14 Dec 2017 08:08:49 +0000 (08:08 +0000)]
rgw: Add URL format support for bucket quota modification

Allow admin to change the quota of a individual bucket through Admin API
with params in URL

Fixes: http://tracker.ceph.com/issues/21811
Signed-off-by: Jeegn Chen <jeegnchen@gmail.com>
7 years agorgw: Admin API Support for bucket quota change
Jeegn Chen [Mon, 16 Oct 2017 09:46:39 +0000 (17:46 +0800)]
rgw: Admin API Support for bucket quota change

Allow admin to change the quota of a individual bucket through Admin API

Fixes: http://tracker.ceph.com/issues/21811
Signed-off-by: Jeegn Chen <jeegnchen@gmail.com>
7 years agorgw: fix the return type is wrong 19773/head
hechuang [Wed, 3 Jan 2018 07:45:53 +0000 (15:45 +0800)]
rgw: fix the return type is wrong

invalid acl header will also be successful

Signed-off-by: hechuang <hechuang@xsky.com>
7 years agorbd: replace positional_path parameter with arg_index in get_path() 19722/head
songweibin [Thu, 4 Jan 2018 05:23:28 +0000 (13:23 +0800)]
rbd: replace positional_path parameter with arg_index in get_path()

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agomds: fix typo 19766/head
dongdong tao [Wed, 3 Jan 2018 14:40:34 +0000 (22:40 +0800)]
mds: fix typo

Signed-off-by: dongdong tao <tdd21151186@gmail.com>