]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Greg Farnum [Fri, 26 May 2017 05:14:38 +0000 (22:14 -0700)]
osd: shutdown our reserver_finisher earlier in the process
This finisher thread has a lot of callbacks which can hold PGRefs. Make
sure we drain them out before checking that all the PGs have finished
and have no outstanding references.
Moving this should be safe; we've already stopped the op thread et al
and the only things still running are the OSDService's objecter_finisher,
recovery_request_timer, and snap_sleep_timer (which has definitely been emptied
by the time we get here as it's synchronously cleared out on PG shutdown).
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Fri, 26 May 2017 04:52:49 +0000 (21:52 -0700)]
osd: Reset() the snaptrimmer on shutdown
We were failing to exit various wait states which held PGRefs. Error!
Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 24 May 2017 03:11:27 +0000 (20:11 -0700)]
osd: make sure we drop Backoff PGRefs on shutdown
Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Thu, 25 May 2017 01:43:34 +0000 (18:43 -0700)]
osd: print out pg debug ref counts on acquire/drop
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 24 May 2017 07:36:00 +0000 (00:36 -0700)]
osd: repair the PG_DEBUG_REFS build
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Wed, 24 May 2017 07:19:51 +0000 (00:19 -0700)]
osd: use PGRef instead of boost::intrusive_ptr<PG> everywhere
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Kefu Chai [Fri, 19 May 2017 04:53:57 +0000 (12:53 +0800)]
Merge pull request #15148 from zealoussnow/wip-spec
build: move bash_completion.d/ceph to ceph-common
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 19 May 2017 02:56:12 +0000 (10:56 +0800)]
Merge pull request #15160 from bassam/pr-system-boost
cmake: fix boost components for WITH_SYSTEM_BOOST
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jos Collin [Fri, 19 May 2017 02:35:29 +0000 (08:05 +0530)]
Merge pull request #15107 from guihecheng/rgw_file-cleanup
rgw: use pre-defined calls to replace raw flag operation
Gui Hecheng [Tue, 16 May 2017 01:43:08 +0000 (09:43 +0800)]
rgw_file: use pre-defined calls to replace raw flag operation
Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
Jason Dillaman [Fri, 19 May 2017 00:28:57 +0000 (20:28 -0400)]
Merge pull request #15053 from dillaman/wip-librbd-blkin
blkin: librbd trace hooks
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Jason Dillaman [Sat, 13 May 2017 02:34:33 +0000 (22:34 -0400)]
blkin: rbd object map update traces
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 11 May 2017 15:30:51 +0000 (11:30 -0400)]
blkin: initial trace hooks for IO path
To collect blkin traced for RBD, set the "rbd blkin trace all"
configuration parameter to true.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 11 May 2017 00:55:04 +0000 (20:55 -0400)]
blkin: add config variable rbd_blkin_trace_all
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 May 2017 23:50:51 +0000 (19:50 -0400)]
blkin: improved objecter trace events
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 May 2017 20:43:44 +0000 (16:43 -0400)]
blkin: librados should start new child trace
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 May 2017 18:37:39 +0000 (14:37 -0400)]
blkin: improve trace visibility into object cacher
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Victor Araujo [Sun, 4 Sep 2016 22:48:33 +0000 (00:48 +0200)]
blkin: pass trace information to object cacher
Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 May 2017 20:09:16 +0000 (16:09 -0400)]
common/zipkin_trace: added missing include for encoding
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 11 May 2017 00:40:19 +0000 (20:40 -0400)]
test/librados_test_stub: add new aio_operate overloads for tracing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 18 May 2017 20:15:54 +0000 (13:15 -0700)]
Merge pull request #10736 from oliveiradan/SebastienHan_config_diff_get_fr
common/ceph_context: 'config diff get' option added
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Thu, 18 May 2017 20:12:45 +0000 (13:12 -0700)]
Merge pull request #14914 from neha-ojha/wip-mon-crushtype-health-warn
mon: add crush type down health warnings
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 18 May 2017 18:29:40 +0000 (13:29 -0500)]
Merge pull request #15086 from joscollin/wip-cleanup-redundant-headers-1
common: Remove redundant includes
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Thu, 18 May 2017 18:29:26 +0000 (13:29 -0500)]
Merge pull request #15109 from tchaikov/wip-mgrmon-send-digests-using-ticks
mon/MgrMonitor: send digests only if is_active()
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 18 May 2017 18:28:30 +0000 (13:28 -0500)]
Merge pull request #15116 from liewegas/wip-bluestore-aio-warning
os/bluestore/KernelDevice: helpful warning when aio limit exhausted
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Sage Weil [Thu, 18 May 2017 18:28:14 +0000 (13:28 -0500)]
Merge pull request #15117 from liewegas/wip-luminous-legacy-check
qa/suites/rados/thrash: make sure osds have map before legacy scrub
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 18 May 2017 18:28:02 +0000 (13:28 -0500)]
Merge pull request #15120 from liewegas/wip-ec-buffer
osd: reduce buffer pinning from EC entries
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 18 May 2017 18:27:50 +0000 (13:27 -0500)]
Merge pull request #15121 from ivancich/wip-remove-an-unnecessary-loop
osd/pglog: remove loop through empty collection
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 18 May 2017 18:27:25 +0000 (13:27 -0500)]
Merge pull request #15124 from cbodley/wip-osd-swap
osd: fix argument-dependent lookup of swap()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Thu, 18 May 2017 18:26:57 +0000 (13:26 -0500)]
Merge pull request #15138 from liewegas/wip-list-objects-more
ceph_test_rados_api_list: more fix LibRadosListNP.ListObjectsError
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Bassam Tabbara [Thu, 18 May 2017 07:32:59 +0000 (00:32 -0700)]
cmake: fix boost components for WITH_SYSTEM_BOOST
when using WITH_SYSTEM_BOOST dont set header-only packages
for BOOST_COMPONENTS. On some distros these packages dont
exist.
Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Kefu Chai [Thu, 18 May 2017 16:06:35 +0000 (00:06 +0800)]
Merge pull request #15126 from batrick/i19934
qa: silence upgrade test failure
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Thu, 18 May 2017 15:51:23 +0000 (11:51 -0400)]
Merge pull request #15037 from trociny/wip-19875
librbd: optimize copy-up to add hints only once to object op
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 18 May 2017 15:50:44 +0000 (11:50 -0400)]
Merge pull request #15085 from runsisi/wip-fix-trashlist
librbd: do not raise an error if trash list returns -ENOENT
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 18 May 2017 15:50:27 +0000 (11:50 -0400)]
Merge pull request #15134 from runsisi/wip-fix-trashpy
pybind/rbd: fix crash if more than 1024 images in trash bin
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
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>
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()
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>
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>
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>
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>
Leo Zhang [Thu, 18 May 2017 09:22:11 +0000 (17:22 +0800)]
build: move bash_completion.d/ceph from debian/ceph-base.install to debian/ceph-common.install
when only ceph-common is installed, can also use ceph completion
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
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>
Leo Zhang [Thu, 18 May 2017 06:17:17 +0000 (14:17 +0800)]
build: move bash_completion.d/ceph to ceph-common
When only ceph-common is installed, can also use ceph completion
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Sage Weil [Wed, 17 May 2017 15:55:42 +0000 (11:55 -0400)]
ceph_test_rados_api_list: more fix LibRadosListNP.ListObjectsError
Follow-on to
d7e6e8d60309e4800389b36f786b633d0ca2ec07 ; we need to
make sure the client gets the updated osdmap.
Fixes: http://tracker.ceph.com/issues/19963
Signed-off-by: Sage Weil <sage@redhat.com>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
runsisi [Wed, 17 May 2017 11:58:19 +0000 (19:58 +0800)]
rbd: remove unnecessary -ENOENT check for rbd cli
Signed-off-by: runsisi <runsisi@zte.com.cn>
runsisi [Mon, 15 May 2017 07:50:47 +0000 (15:50 +0800)]
librbd: translate error -ENOENT to 0 for list APIs
Signed-off-by: runsisi <runsisi@zte.com.cn>
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>
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>
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>
Sage Weil [Wed, 17 May 2017 13:38:51 +0000 (09:38 -0400)]
os/bluestore/KernelDevice: helpful warning when aio limit exhausted
Suggested-by: Dan Van Der Ster <daniel.vanderster@cern.ch>
Signed-off-by: Sage Weil <sage@redhat.com>
runsisi [Wed, 17 May 2017 12:46:43 +0000 (20:46 +0800)]
pybind/rbd: fix crash if more than 1024 images in trash bin
Signed-off-by: runsisi <runsisi@zte.com.cn>
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>
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>
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>
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>
Jos Collin [Mon, 15 May 2017 11:52:01 +0000 (17:22 +0530)]
common: Remove redundant includes
Fixes: http://tracker.ceph.com/issues/19883 (Partially)
Signed-off-by: Jos Collin <jcollin@redhat.com>
Casey Bodley [Tue, 16 May 2017 22:18:47 +0000 (18:18 -0400)]
osd: fix argument-dependent lookup of swap()
because include/types.h has a 'using namespace std', the call to
::swap() had previously been selecting overloads from namespace std. but
once any other swap() functions are present in the global namespace,
argument-dependent lookup [1] will not consider those from std
for example, when common/sstring.hh has been included, its global swap()
function is the only overload considered, so calls to ::swap() result in
errors like this:
/home/cbodley/ceph/src/osd/osd_types.h: In member function ‘void ObjectModDesc::swap(ObjectModDesc&)’:
/home/cbodley/ceph/src/osd/osd_types.h:3135:56: error: no matching function for call to ‘swap(bool&, bool&)’
::swap(other.can_local_rollback, can_local_rollback);
^
/home/cbodley/ceph/src/common/sstring.hh:589:6: note: candidate: template<class char_type, class size_type, size_type max_size> void swap(basic_sstring<char_type, size_type, Max>&, basic_sstring<char_type, size_type, Max>&)
void swap(basic_sstring<char_type, size_type, max_size>& x,
^
/home/cbodley/ceph/src/common/sstring.hh:589:6: note: template argument deduction/substitution failed:
/home/cbodley/ceph/src/osd/osd_types.h:3135:56: note: mismatched types ‘basic_sstring<char_type, size_type, Max>’ and ‘bool’
::swap(other.can_local_rollback, can_local_rollback);
adding a `using std::swap;` to the calling scope and removing :: from
the call to `swap()` allows argument-dependent lookup to resolve the
overloads in both namespaces
[1] http://en.cppreference.com/w/cpp/language/adl
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Patrick Donnelly [Tue, 16 May 2017 22:43:57 +0000 (18:43 -0400)]
qa: silence upgrade test failure
The new fs setting standby_count_wanted is only avialable in luminous. Upgrade
tests were tripping on this.
Fixes: http://tracker.ceph.com/issues/19934
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Tue, 16 May 2017 21:31:07 +0000 (17:31 -0400)]
osd/PGLog: avoid pinning large buffers with ObjectModDesc
Accidentally removed by
5e0ec06376f832d32a6b1af390f925a59b03798f .
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 16 May 2017 21:33:48 +0000 (17:33 -0400)]
osd: encode snaps more efficiently
1- encode into a sized buffer.
2- do not needlessly copy the set<> to a vector<> before encoding.
set<> and vector<> encode identically. Since we are converting from sorted
set<> to unsorted vector<>, the order doesn't change either.
Signed-off-by: Sage Weil <sage@redhat.com>
Neha Ojha [Tue, 16 May 2017 18:57:10 +0000 (11:57 -0700)]
mon: add test for crush type down health warnings
Signed-off-by: Neha Ojha <nojha@redhat.com>
J. Eric Ivancich [Tue, 16 May 2017 20:35:47 +0000 (16:35 -0400)]
osd/pglog: Remove loop through empty collection.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
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>
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>
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>
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>
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>
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>
Sage Weil [Tue, 16 May 2017 19:10:09 +0000 (15:10 -0400)]
mon/OSDMonitor: introduce debug option to allow filestore for ec overwrites
Signed-off-by: Sage Weil <sage@redhat.com>
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>
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>
Sage Weil [Tue, 16 May 2017 16:28:40 +0000 (12:28 -0400)]
qa/suites/rados/thrash: make sure osds have map before legacy scrub
The OSDs must have a map reflecting the require_luminous flag in order
for the legacy conversion to happen. A quick rados bench should ensure
that.
Signed-off-by: Sage Weil <sage@redhat.com>
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>
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>