]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomon/MgrMonitor: add 'mgr dump [epoch]' command 15158/head
Sage Weil [Thu, 18 May 2017 16:05:13 +0000 (12:05 -0400)]
mon/MgrMonitor: add 'mgr dump [epoch]' command

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge branch pull request #13551 from pritha-srivastava/wip-rgw-role-tenant
Adam C. Emerson [Thu, 18 May 2017 14:20:31 +0000 (10:20 -0400)]
Merge branch pull request #13551 from pritha-srivastava/wip-rgw-role-tenant

rgw: Replaced rgw userid with tenant in ARN for Roles.
rgw: Adding roles under the scope of tenants.
rgw: Added code for Role input validation.
rgw: Added code to fetch a role by its id.
rgw: Added code to allow tenant name as part of role name also.
rgw: Better reporting of missing input values in case of radosgw-admin
     commands for Roles.

Reviewed-By: Adam C. Emerson <aemerson@redhat.com>
8 years agoMerge pull request #15152 from guihecheng/rgw_file-extra-rele
Jos Collin [Thu, 18 May 2017 13:48:00 +0000 (19:18 +0530)]
Merge pull request #15152 from guihecheng/rgw_file-extra-rele

rgw_file: removed extra rele() on fs in rgw_umount()

8 years agoMerge pull request #15142 from bassam/pr-ccache-s-files
Kefu Chai [Thu, 18 May 2017 10:38:12 +0000 (18:38 +0800)]
Merge pull request #15142 from bassam/pr-ccache-s-files

cmake: workaound ccache issue with .S assembly files

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorgw_file: fix extra rele on fs in close 15152/head
Gui Hecheng [Tue, 16 May 2017 08:05:35 +0000 (16:05 +0800)]
rgw_file: fix extra rele on fs in close

We got exactly a refcnt=0 after rele in close,
no need to rele twice.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agoMerge pull request #15137 from theanalyst/rgw/cleanup/header-drop
Kefu Chai [Thu, 18 May 2017 10:18:41 +0000 (18:18 +0800)]
Merge pull request #15137 from theanalyst/rgw/cleanup/header-drop

rgw: drop using std ns in header files and other cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15145 from zealoussnow/wip-0518
Loic Dachary [Thu, 18 May 2017 10:06:50 +0000 (12:06 +0200)]
Merge pull request #15145 from zealoussnow/wip-0518

mailmap: Leo Zhang infomation and affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #15143 from minshenglin/fix_broken_link
Kefu Chai [Thu, 18 May 2017 07:40:26 +0000 (15:40 +0800)]
Merge pull request #15143 from minshenglin/fix_broken_link

doc: fix broken link in erasure-code.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomailmap: Leo Zhang infomation and affiliation 15145/head
Leo Zhang [Thu, 18 May 2017 04:19:14 +0000 (12:19 +0800)]
mailmap: Leo Zhang infomation and affiliation

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
8 years agodoc: fix broken link in erasure-code.rst 15143/head
MinSheng Lin [Wed, 17 May 2017 09:46:08 +0000 (17:46 +0800)]
doc: fix broken link in erasure-code.rst

Fixes: http://tracker.ceph.com/issues/19972
Signed-off-by: MinSheng Lin <minsheng.l@inwinstack.com>
8 years agocmake: workaound ccache issue with .S assembly files 15142/head
Bassam Tabbara [Thu, 18 May 2017 00:41:16 +0000 (17:41 -0700)]
cmake: workaound ccache issue with .S assembly files

when building with -DWITH_CCACHE=ON recent versions of ccache
(for example 3.3.3) seem to mangle object files from the cache
for source files that have a .S extension. This seems similar
but unrelated to PR #14633. The workaround here is to rename .S
files to .s (lower case).

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoMerge branch 'wip-sts-authorization'
Adam C. Emerson [Wed, 17 May 2017 20:06:23 +0000 (16:06 -0400)]
Merge branch 'wip-sts-authorization'

Merge pull request #14307 from adamemerson/wip-sts-authorization

common: Add make_unique
submodule: Tencent's RapidJSON library
common: Add ISO-8601 Date Support
rgw: Add is_identity to AuthApplier class
rgw: Move globbing flags to header
buffer: Make the use of static areas more convenient
rgw: Add basic support for IAM policies
rgw: Build bucket permission and environment in req_state
rgw: Verify policies as WELL as ACLs
rgw: RESTful bucket policy ops
rgw: Write documentation for bucket policies

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
8 years agorgw: Write documentation for bucket policies 14307/head
Adam C. Emerson [Mon, 3 Apr 2017 22:03:00 +0000 (18:03 -0400)]
rgw: Write documentation for bucket policies

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: RESTful bucket policy ops
Adam C. Emerson [Wed, 8 Mar 2017 21:31:18 +0000 (16:31 -0500)]
rgw: RESTful bucket policy ops

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: Verify policies as WELL as ACLs
Adam C. Emerson [Thu, 6 Apr 2017 23:11:30 +0000 (19:11 -0400)]
rgw: Verify policies as WELL as ACLs

Only hook into object/bucket checks for now. Once we have STS (giving
us Roles) or User/Group policies it will make sense to hook into
those, too.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: Build bucket permission and environment in req_state
Adam C. Emerson [Wed, 25 Jan 2017 15:19:43 +0000 (10:19 -0500)]
rgw: Build bucket permission and environment in req_state

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: Add basic support for IAM policies
Adam C. Emerson [Tue, 9 Aug 2016 16:28:07 +0000 (12:28 -0400)]
rgw: Add basic support for IAM policies

This support is currently incomplete but should provide a starting
point.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agobuffer: Make the use of static areas more convenient
Adam C. Emerson [Mon, 1 May 2017 20:59:36 +0000 (16:59 -0400)]
buffer: Make the use of static areas more convenient

Make three wrapper functions to tidy up the process of making a
bufferlist holding a single static buffer.

The lack of any decent handling of const in buffer::list makes me wax
wroth, but it's a bit much to fix right now.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: Move globbing flags to header
Adam C. Emerson [Mon, 27 Feb 2017 19:00:56 +0000 (14:00 -0500)]
rgw: Move globbing flags to header

So they can be used when calling the function

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agorgw: Add is_identity to AuthApplier class
Adam C. Emerson [Mon, 13 Feb 2017 21:53:18 +0000 (16:53 -0500)]
rgw: Add is_identity to AuthApplier class

Eventually this will allow us to match all authentication information
against all specified principals in a policy.

Right now it handles users and wildcards.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agocommon: Add ISO-8601 Date Support
Adam C. Emerson [Wed, 5 Oct 2016 22:02:48 +0000 (18:02 -0400)]
common: Add ISO-8601 Date Support

For parsing and unparsing from ceph::real_time.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agosubmodule: Tencent's RapidJSON library
Adam C. Emerson [Thu, 28 Jul 2016 17:35:08 +0000 (13:35 -0400)]
submodule: Tencent's RapidJSON library

This is a high performance, MIT licensed JSON parsing library. It
provides a SAX interface so that I can compile an S3 policy without
building up a JSONObject tree in the middle that gets thrown away.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agocommon: Add make_unique
Adam C. Emerson [Tue, 3 May 2016 22:11:55 +0000 (18:11 -0400)]
common: Add make_unique

There are parts of C++14 that are both useful and easy to
implement. This is one of them.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
8 years agoMerge pull request #13731 from liewegas/wip-19119
Sage Weil [Wed, 17 May 2017 15:43:18 +0000 (10:43 -0500)]
Merge pull request #13731 from liewegas/wip-19119

PendingReleaseNotes: warning about 'osd rm ...' and #19119

8 years agoPendingReleaseNotes: warning about 'osd rm ...' and #19119 13731/head
Sage Weil [Wed, 1 Mar 2017 19:18:44 +0000 (13:18 -0600)]
PendingReleaseNotes: warning about 'osd rm ...' and #19119

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

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14873 from liewegas/wip-bluefs-position
Sage Weil [Wed, 17 May 2017 15:29:52 +0000 (10:29 -0500)]
Merge pull request #14873 from liewegas/wip-bluefs-position

os/bluestore: put bluefs in the middle of the shared device

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14902 from liewegas/wip-upmap
Sage Weil [Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)]
Merge pull request #14902 from liewegas/wip-upmap

osd/OSDMap: improve upmap calculation

Reviewed-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #14933 from liewegas/wip-asok-schema
Sage Weil [Wed, 17 May 2017 15:29:09 +0000 (10:29 -0500)]
Merge pull request #14933 from liewegas/wip-asok-schema

common/perf_counters: make schema more friendly and update docs

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14967 from tchaikov/wip-faster-cull
Sage Weil [Wed, 17 May 2017 15:28:49 +0000 (10:28 -0500)]
Merge pull request #14967 from tchaikov/wip-faster-cull

mgr: optimize DaemonStateIndex::cull() a little bit

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15002 from dachary/wip-19836-crush-pre-luminous
Sage Weil [Wed, 17 May 2017 15:26:06 +0000 (10:26 -0500)]
Merge pull request #15002 from dachary/wip-19836-crush-pre-luminous

crush: encode can override weights with weight set

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15031 from tchaikov/wip-drop-unused-opts
Sage Weil [Wed, 17 May 2017 15:25:25 +0000 (10:25 -0500)]
Merge pull request #15031 from tchaikov/wip-drop-unused-opts

config_opts: drop unused opts

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15043 from tchaikov/wip-19884
Sage Weil [Wed, 17 May 2017 15:24:50 +0000 (10:24 -0500)]
Merge pull request #15043 from tchaikov/wip-19884

ceph-detect-init: detect init system by poking the system

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #15059 from liewegas/wip-mon-kvtype
Sage Weil [Wed, 17 May 2017 15:24:19 +0000 (10:24 -0500)]
Merge pull request #15059 from liewegas/wip-mon-kvtype

mon: fix mon_keyvaluedb application

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15032 from tchaikov/wip-doc-opts
John Wilkins [Wed, 17 May 2017 15:04:29 +0000 (08:04 -0700)]
Merge pull request #15032 from tchaikov/wip-doc-opts

doc: add descriptions for mon/mgr options

Reviewed-by: John Wilkins <jowilkin@redhat.com>
8 years agorgw: drop expat header in a couple of files 15137/head
Abhishek Lekshmanan [Wed, 17 May 2017 14:16:13 +0000 (16:16 +0200)]
rgw: drop expat header in a couple of files

Since it is already a part of rgw_xml
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agorgw: drop using namespace std in header files
Abhishek Lekshmanan [Wed, 17 May 2017 14:13:54 +0000 (16:13 +0200)]
rgw: drop using namespace std in header files

We're still having the include in include/type.h, so just sweeping
things under the rug for now

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #15127 from tchaikov/wip-vstart-mgr-debug-ms
John Spray [Wed, 17 May 2017 11:18:15 +0000 (12:18 +0100)]
Merge pull request #15127 from tchaikov/wip-vstart-mgr-debug-ms

vstart: "debug_ms=1" for mgr by default

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15103 from drunkard/master
Kefu Chai [Wed, 17 May 2017 09:00:56 +0000 (17:00 +0800)]
Merge pull request #15103 from drunkard/master

doc: minor fixes in radosgw/

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15080 from hikycool/master
Kefu Chai [Wed, 17 May 2017 08:54:42 +0000 (16:54 +0800)]
Merge pull request #15080 from hikycool/master

doc: update the usage of 'ceph-deploy purge'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agovstart: "debug_ms=1" for mgr by default 15127/head
Kefu Chai [Wed, 17 May 2017 02:31:26 +0000 (10:31 +0800)]
vstart: "debug_ms=1" for mgr by default

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15087 from liewegas/wip-thrash-ec
Yuri Weinstein [Tue, 16 May 2017 20:20:34 +0000 (13:20 -0700)]
Merge pull request #15087 from liewegas/wip-thrash-ec

qa/suites/rados: fix ec thrashing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15072 from liewegas/wip-crush-swap-bucket
Yuri Weinstein [Tue, 16 May 2017 20:19:59 +0000 (13:19 -0700)]
Merge pull request #15072 from liewegas/wip-crush-swap-bucket

mon,crush: add 'osd crush swap-bucket' command

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15069 from tchaikov/wip-inttypes-cleanup
Yuri Weinstein [Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)]
Merge pull request #15069 from tchaikov/wip-inttypes-cleanup

int_types.h: remove hacks to workaround old systems

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #15057 from liewegas/wip-osd-choose-cleanup
Yuri Weinstein [Tue, 16 May 2017 20:17:37 +0000 (13:17 -0700)]
Merge pull request #15057 from liewegas/wip-osd-choose-cleanup

osd/PG: drop pre-firefly compat_mode for choose_*_acting

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #15042 from badone/wip-redundant-headers-3
Yuri Weinstein [Tue, 16 May 2017 20:16:43 +0000 (13:16 -0700)]
Merge pull request #15042 from badone/wip-redundant-headers-3

common: Remove redundant includes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14989 from liewegas/wip-19877
Yuri Weinstein [Tue, 16 May 2017 20:13:36 +0000 (13:13 -0700)]
Merge pull request #14989 from liewegas/wip-19877

osd: fix past_intervals base case by adding epoch_pool_created to pg_history_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15113 from trociny/wip-unittest_librbd-cleanup
Jason Dillaman [Tue, 16 May 2017 18:05:38 +0000 (14:05 -0400)]
Merge pull request #15113 from trociny/wip-unittest_librbd-cleanup

test/librbd: unit tests cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15093 from dillaman/wip-19929
Mykola Golub [Tue, 16 May 2017 16:40:38 +0000 (19:40 +0300)]
Merge pull request #15093 from dillaman/wip-19929

librbd: reacquire lock should update lock owner client id

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #10690 from ceph/wip-rgw-polymorphic-errors
Casey Bodley [Tue, 16 May 2017 15:54:27 +0000 (11:54 -0400)]
Merge pull request #10690 from ceph/wip-rgw-polymorphic-errors

rgw: polymorphic error codes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15096 from jcsp/wip-journalrepair-test
John Spray [Tue, 16 May 2017 15:11:57 +0000 (16:11 +0100)]
Merge pull request #15096 from jcsp/wip-journalrepair-test

qa: simplify TestJournalRepair

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #15110 from tchaikov/wip-build-using-cmake
Sage Weil [Tue, 16 May 2017 14:20:50 +0000 (09:20 -0500)]
Merge pull request #15110 from tchaikov/wip-build-using-cmake

doc: use do_cmake.sh instead of `cmake ..`

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15023 from tchaikov/wip-cmdparse-constness
Kefu Chai [Tue, 16 May 2017 14:19:40 +0000 (22:19 +0800)]
Merge pull request #15023 from tchaikov/wip-cmdparse-constness

cmdparse: more constness

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15112 from jcsp/wip-19940
Sage Weil [Tue, 16 May 2017 13:43:18 +0000 (08:43 -0500)]
Merge pull request #15112 from jcsp/wip-19940

ceph-create-keys: update client.admin if it already exists

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15097 from linuxbox2/wip-rgwfile-write3
Matt Benjamin [Tue, 16 May 2017 13:07:09 +0000 (09:07 -0400)]
Merge pull request #15097 from linuxbox2/wip-rgwfile-write3

rgw_file: v3: fix write-timer action

8 years agotest/librbd: make unit tests pass when cache is disabled 15113/head
Mykola Golub [Tue, 16 May 2017 12:35:27 +0000 (14:35 +0200)]
test/librbd: make unit tests pass when cache is disabled

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agotest/librbd: TestMockImageRemoveRequest gmock warnings
Mykola Golub [Tue, 16 May 2017 12:34:22 +0000 (14:34 +0200)]
test/librbd: TestMockImageRemoveRequest gmock warnings

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agodoc: add hyperlink on ACL settings 15103/head
Drunkard Zhang [Tue, 16 May 2017 12:32:29 +0000 (20:32 +0800)]
doc: add hyperlink on ACL settings

The link listed at bottom but never used, I think it's missed by author.

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
8 years agoceph-create-keys: update client.admin if it already exists 15112/head
John Spray [Tue, 16 May 2017 12:28:48 +0000 (13:28 +0100)]
ceph-create-keys: update client.admin if it already exists

This means that anyone who de-privileges their client.admin
user will find that it gets resets with full privileges again.
This is necessary because we cannot distinguish between an old
key and a deliberately de-privileged key, and it's okay because
this is the admin key, it's meant to have access to everything.

Fixes: http://tracker.ceph.com/issues/19940
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agodoc: typo fixes in doc/radosgw/multisite
Drunkard Zhang [Tue, 16 May 2017 12:20:49 +0000 (20:20 +0800)]
doc: typo fixes in doc/radosgw/multisite

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
8 years agodoc: use do_cmake.sh instead of `cmake ..` 15110/head
Kefu Chai [Tue, 16 May 2017 10:53:50 +0000 (18:53 +0800)]
doc: use do_cmake.sh instead of `cmake ..`

user could be confused at seeing errors like:

src/CMakeLists.txt:644 (add_subdirectory): The source directory /src/lua
does not contain a CMakeLists.txt file.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15094 from fullerdj/wip-djf-19893
John Spray [Tue, 16 May 2017 09:51:55 +0000 (10:51 +0100)]
Merge pull request #15094 from fullerdj/wip-djf-19893

qa/cephfs: Fix for test_data_scan

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14938 from michaelsevilla/f19362
John Spray [Tue, 16 May 2017 09:45:34 +0000 (10:45 +0100)]
Merge pull request #14938 from michaelsevilla/f19362

mds: add perf counters for file system operations

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15018 from ukernel/wip-19890
John Spray [Tue, 16 May 2017 09:15:03 +0000 (10:15 +0100)]
Merge pull request #15018 from ukernel/wip-19890

pybind: fix open flags calculation

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14769 from ukernel/wip-19755
John Spray [Tue, 16 May 2017 09:13:58 +0000 (10:13 +0100)]
Merge pull request #14769 from ukernel/wip-19755

osdc/Filer: truncate large file party by party

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agodoc: change reference to internal link
Drunkard Zhang [Tue, 16 May 2017 08:14:36 +0000 (16:14 +0800)]
doc: change reference to internal link

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
8 years agorgw: Searching for error codes and dumping output based on protocol flags. 10690/head
Pritha Srivastava [Tue, 6 Dec 2016 09:18:20 +0000 (14:48 +0530)]
rgw: Searching for error codes and dumping output based on protocol flags.

The previous commit uses dynamic allocation to search for s3/ swift specific
error codes and dump the results. In order to avoid dynamic allocation,
we are making use of protocol flags to achieve the above.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
8 years agopolymorphic error codes.
Marcus Watts [Tue, 3 Nov 2015 00:43:36 +0000 (19:43 -0500)]
polymorphic error codes.

make set_req_state_err a method of req_state

get rid of params.perr; it's never used

rgw - polymorphic error object.

polymorphic error object: this way sts, which has additional error fields,
and its own xml format for how errors should be produced, can overload
the base rgw_err class.

STL fixup: use real mappings for error mappings, not a linear search.
insubstantiate error mappings exactly once in src/rgw/rgw_common.cc, instead
of multiple copies from every source file that includes src/rgw/rgw_http_errors.h.

remove dump_errno(s, err) - it was never used, and the code looked bogus.

move rgw_http_error_to_errno from header to rgw_rest_client.cc,
the only place it's used.
move rgw_http_status_code and http_codes to rgw_rest.cc,
the only place it's used.

base class (rgw_err) implements s3 errors; swift & sts errors use
the base class and overlay their own additional error codes to
the ones recognized by the base class.

For a while, I was trying to just have a "generic" abort_early() that
used dump_more.  Now, I have an op aware form that works the old way.
I would like the http routines to known less about "op" structures,
which is why I'm making this distinction.

Splitting up generic and s3 flavors of some things:
rgw_rest_init() - split into s3 and generic forms.
end_header: s3 vs generic forms: generic form uses dump_more.
abort_early: s3 vs generic forms: generic form uses dump_more, error_content.

And fixing some mistakes from the merge:
Fixup: should not have deleted dump_errno() local storage forms.
Fixup:RGWRESTFlusher  - take a dump_more to make it generic.
Fixup: need RGWRESTOp::send_response()

Move swift_err up; use it in bulkdelete_respond
I Think I don't need s->prot_flags when using swift_err.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
8 years agorgw_file: v3: fix write-timer action 15097/head
Matt Benjamin [Mon, 15 May 2017 21:30:29 +0000 (17:30 -0400)]
rgw_file: v3: fix write-timer action

For now, unify with v4 write-on-close path, by calling
RGWFileHandle::close() on write-timer expire, since it will
call write_finish() as a side-effect.

Fixes: http://tracker.ceph.com/issues/19932
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #15052 from batrick/i19734
John Spray [Mon, 15 May 2017 21:31:27 +0000 (22:31 +0100)]
Merge pull request #15052 from batrick/i19734

mds: use debug_mds for most subsys

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoqa: simplify TestJournalRepair 15096/head
John Spray [Mon, 15 May 2017 21:23:42 +0000 (17:23 -0400)]
qa: simplify TestJournalRepair

This was sending lots of metadata ops to MDSs to persuade
them to migrate some subtrees, but that was flaky.  Use
the shiny new rank pinning functionality instead.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoqa/cephfs: Fix for test_data_scan 15094/head
Douglas Fuller [Mon, 15 May 2017 18:57:11 +0000 (14:57 -0400)]
qa/cephfs: Fix for test_data_scan

Don't assume that test_data_scan will be run on exactly 2 MDS nodes.

Fixes: http://tracker.ceph.com/issues/19893
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
8 years agoMerge pull request #15091 from ceph/luminous
Sage Weil [Mon, 15 May 2017 17:47:42 +0000 (12:47 -0500)]
Merge pull request #15091 from ceph/luminous

merge v12.0.2 release tag

8 years agomds: add perf counters for file system operations 14938/head
Michael Sevilla [Wed, 3 May 2017 16:05:56 +0000 (09:05 -0700)]
mds: add perf counters for file system operations

Shows the types of operations that clients are doing by adding counters to the
spot where the MDS responds to clients. This avoids counting operations that
were restarted while waiting for locks or for metadata to load.  Does not
support per-client activity. This is the first step towards comprehensive
performance tracking in the file system.

Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>
8 years agoMerge pull request #15079 from ztczll/master
Kefu Chai [Mon, 15 May 2017 16:25:01 +0000 (00:25 +0800)]
Merge pull request #15079 from ztczll/master

mailmap: ztczll affiliation

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agolibrbd: reacquire lock should update lock owner client id 15093/head
Jason Dillaman [Mon, 15 May 2017 16:12:12 +0000 (12:12 -0400)]
librbd: reacquire lock should update lock owner client id

Fixes: http://tracker.ceph.com/issues/19929
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/suites/rados/threas-erasure-code-*: fix luminous facet 15087/head
Sage Weil [Mon, 15 May 2017 14:22:25 +0000 (10:22 -0400)]
qa/suites/rados/threas-erasure-code-*: fix luminous facet

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/suites/rados/thrash-erasure-code-overwrites: fix
Sage Weil [Mon, 15 May 2017 14:21:58 +0000 (10:21 -0400)]
qa/suites/rados/thrash-erasure-code-overwrites: fix

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15081 from tchaikov/wip-fio-readme
Casey Bodley [Mon, 15 May 2017 14:03:24 +0000 (10:03 -0400)]
Merge pull request #15081 from tchaikov/wip-fio-readme

fio: update README.md so only the fio ceph engine is built

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agodoc/dev/perf_counters: update docs for new friendly properties 14933/head
Sage Weil [Mon, 15 May 2017 03:04:37 +0000 (22:04 -0500)]
doc/dev/perf_counters: update docs for new friendly properties

Note that histograms are not yet documented.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: rename histogram adder method
Sage Weil [Wed, 3 May 2017 13:25:45 +0000 (08:25 -0500)]
common/perf_counters: rename histogram adder method

Specifically, it's a u64 counter histogram.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: make 'perf schema' more friendly
Sage Weil [Wed, 3 May 2017 13:24:45 +0000 (08:24 -0500)]
common/perf_counters: make 'perf schema' more friendly

The raw bits are pretty hard to interpret and the documentation isn't
super easy to find.  Expose a string description instead.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/perf_counters: histograms are counters
Sage Weil [Wed, 3 May 2017 02:11:35 +0000 (21:11 -0500)]
common/perf_counters: histograms are counters

The histogram is a histogram of counters (not guages), so set the COUNTER
bit.  (This only matters because we expose and document the bits of the
type, for better for for worse.)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: require force flag is swap-bucket alg types differ 15072/head
Sage Weil [Mon, 15 May 2017 02:17:12 +0000 (21:17 -0500)]
mon/OSDMonitor: require force flag is swap-bucket alg types differ

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: add crush_alg_name
Sage Weil [Mon, 15 May 2017 02:16:56 +0000 (21:16 -0500)]
crush: add crush_alg_name

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: add 'osd crush swap-bucket' command
Sage Weil [Fri, 12 May 2017 21:40:00 +0000 (17:40 -0400)]
mon/OSDMonitor: add 'osd crush swap-bucket' command

Swap contents of two crush buckets.  Do it safely by default so that
the origin bucket has to be an orphan (unless forced).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: implement swap_bucket
Sage Weil [Fri, 12 May 2017 21:39:14 +0000 (17:39 -0400)]
crush: implement swap_bucket

Swap contents between buckets.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15048 from trociny/wip-19907
Jason Dillaman [Mon, 15 May 2017 12:43:55 +0000 (08:43 -0400)]
Merge pull request #15048 from trociny/wip-19907

rbd-mirror: resolve admin socket path names collision

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15026 from ukernel/wip-19891
John Spray [Mon, 15 May 2017 12:21:52 +0000 (13:21 +0100)]
Merge pull request #15026 from ukernel/wip-19891

qa/suites/fs: reserve more space for mds in full tests

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15039 from ukernel/wip-19903
John Spray [Mon, 15 May 2017 12:18:09 +0000 (13:18 +0100)]
Merge pull request #15039 from ukernel/wip-19903

client: fix UserPerm::gid_in_group()

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15035 from batrick/quiet-mds-grow-shrink
John Spray [Mon, 15 May 2017 12:17:38 +0000 (13:17 +0100)]
Merge pull request #15035 from batrick/quiet-mds-grow-shrink

qa: silence spurious insufficient standby health warnings

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #14991 from ukernel/wip-19828
John Spray [Mon, 15 May 2017 12:16:35 +0000 (13:16 +0100)]
Merge pull request #14991 from ukernel/wip-19828

mds: fix use-after-free in Locker::file_update_finish()

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14978 from cernceph/dvanders_quota
John Spray [Mon, 15 May 2017 12:16:09 +0000 (13:16 +0100)]
Merge pull request #14978 from cernceph/dvanders_quota

client: client_quota no longer optional

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agodoc: update the usage of 'ceph-deploy purge' 15080/head
Yu Shengzuo [Mon, 15 May 2017 03:35:28 +0000 (03:35 +0000)]
doc: update the usage of 'ceph-deploy purge'

Now it refuses to purge data directly before remove ceph package.
So update the order between commands when using it.

Signed-off-by: Yu Shengzuo <yu.shengzuo@99cloud.net>
8 years agofio: update README.md so only the fio ceph engine is built 15081/head
Kefu Chai [Mon, 15 May 2017 08:13:21 +0000 (16:13 +0800)]
fio: update README.md so only the fio ceph engine is built

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15044 from lixiaoy1/master
Kefu Chai [Mon, 15 May 2017 08:10:09 +0000 (16:10 +0800)]
Merge pull request #15044 from lixiaoy1/master

test/fio_ceph_objectstore: fix fio plugin build failure by engine_data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomailmap:ztczll affiliation 15079/head
zhanglei [Mon, 15 May 2017 07:13:37 +0000 (03:13 -0400)]
mailmap:ztczll affiliation

Signed-off-by: zhanglei <243290414@qq.com>
8 years agoMerge pull request #15076 from atheism/atheism-mailmap
Sage Weil [Mon, 15 May 2017 03:06:47 +0000 (22:06 -0500)]
Merge pull request #15076 from atheism/atheism-mailmap

mailmap: Weibing Zhang mailmap affiliation

8 years agoMerge pull request #15007 from ztczll/master
Sage Weil [Mon, 15 May 2017 02:50:37 +0000 (21:50 -0500)]
Merge pull request #15007 from ztczll/master

test/objectstore/: Check put_ref return value

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #15021 from runsisi/wip-fix-writefull
Sage Weil [Mon, 15 May 2017 02:50:09 +0000 (21:50 -0500)]
Merge pull request #15021 from runsisi/wip-fix-writefull

osd/PrimayLogPG: update modified range to include the whole object size for write_full op

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15046 from ukernel/wip-osdmap-encode
Sage Weil [Mon, 15 May 2017 02:49:21 +0000 (21:49 -0500)]
Merge pull request #15046 from ukernel/wip-osdmap-encode

osd/OSDMap: bump encoding version for require_min_compat_client

Reviewed-by: Sage Weil <sage@redhat.com>