]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Adam C. Emerson [Wed, 16 Nov 2016 22:13:52 +0000 (17:13 -0500)]
bluestore: Fix warning in pool allocator
Since we're not allocating anything, we should return nullptr and mark
the function noexcept. (Functions not marked noexcept are not allowed to
return nullptr.)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Fri, 11 Nov 2016 17:35:52 +0000 (12:35 -0500)]
test: Suppress least surprising warning in the world
Something called infinite_recursion_test_impl recurses...infinitely!
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Thu, 10 Nov 2016 19:56:17 +0000 (14:56 -0500)]
rbd: Move template specialization declaration before include
The include file was implicitly specializing instantiating the
template.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Thu, 10 Nov 2016 19:25:18 +0000 (14:25 -0500)]
rbd: Fix invalid type inferences
These are big and ugly and could be made ever so much nicer with a C++14
compatibility header providing the *_t variation of the type traits
templates.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 23:05:48 +0000 (18:05 -0500)]
rbd: Move operator overload into namespace of type
So overload resolution can find it.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 21:57:17 +0000 (16:57 -0500)]
rbd: Fix likely typos that should be assignments
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 21:56:49 +0000 (16:56 -0500)]
os: Use delete[] to free things allocated with new[]
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 21:36:23 +0000 (16:36 -0500)]
kvs: ObjectWriteOPerations can't be in a VLA
Variable length arrays can only contain Plain Old data
types. ObjectOperation has a virtual destructor and is thus not Plain
Old Data.
We could also get rid of ObjectOperation's virtual destructor, since it
has no other virtual functions.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 21:07:32 +0000 (16:07 -0500)]
rbd: Initialize std::atomic flag with an equals sign
I know it's weird, but
std::atomic_flag f = ATOMIC_FLAG_INIT;
is guaranteed to work, while
std::atomic_flag g(ATOMIC_FLAG_INIT);
is free to make demons fly out of your nose.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Wed, 9 Nov 2016 21:06:46 +0000 (16:06 -0500)]
rbd: typename is for types, not functions
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 20:43:26 +0000 (15:43 -0500)]
cmake: Suppress warnings on Cython output
They are automatically generated code and we don't really control it.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 19:18:48 +0000 (14:18 -0500)]
boost: Make inclde paths SYSTEM includes
We are not debugging Boost and do not need to see its warnings.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 16:26:32 +0000 (11:26 -0500)]
erasure: Remove unused variable
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 16:25:05 +0000 (11:25 -0500)]
bluestore: Remove redundant struct declaration
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 15:57:14 +0000 (10:57 -0500)]
mon: Fix bug in feature testing
Since we're comparing against a bitmask, the boolean rather than bitwise
operator can't be right.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Tue, 8 Nov 2016 15:55:01 +0000 (10:55 -0500)]
mon: Do not brace scalar initializers
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 22:01:07 +0000 (17:01 -0500)]
rgw: strlen is not constexpr
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:44:13 +0000 (16:44 -0500)]
rgw: Assign parameters to members, not themselves
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:35:29 +0000 (16:35 -0500)]
rgw: Initialize superclass from parameter not member
Especially since the member has not been initialized yet.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:33:20 +0000 (16:33 -0500)]
rgw: Do not std::move to return locally constructed objects
It prevents return value optimization.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:31:59 +0000 (16:31 -0500)]
rgw: NULL is not a bool
Really you shouldn't use NULL at all, this is a demonstration of why.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:28:39 +0000 (16:28 -0500)]
fuse: Fix narrowing error in switch statement
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 7 Nov 2016 21:24:58 +0000 (16:24 -0500)]
async: Do not use std::move on temporaries
It can actually cause the compiler to copy where it wouldn't
otherwise. Just return the std::function and take advantage of RVO.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Sage Weil [Thu, 17 Nov 2016 00:29:52 +0000 (18:29 -0600)]
Merge pull request #12032 from liewegas/wip-bluestore-warning
os/bluestore: fix warning and uninit variable
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Loic Dachary [Wed, 16 Nov 2016 23:40:25 +0000 (00:40 +0100)]
Merge pull request #11996 from dachary/wip-17849-bootstrap-osd
mon,ceph-disk: add lockbox permissions to bootstrap-osd
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 15 Nov 2016 17:34:39 +0000 (12:34 -0500)]
include/mempool: silence warnings
/home/sage/src/ceph4/src/include/mempool.h:421:68: warning: no return statement in function returning non-void [-Wreturn-type]
void *operator new[](size_t size) { assert(0 == "no array new"); } \
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 15 Nov 2016 17:21:32 +0000 (12:21 -0500)]
os/bluestore/KernelDevice: initialize oldest
Signed-off-by: Sage Weil <sage@redhat.com>
Gregory Farnum [Wed, 16 Nov 2016 21:58:38 +0000 (13:58 -0800)]
Merge pull request #12029 from batrick/mon-_dump-bugfix
mon: remove utime_t param in _dump
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Wed, 16 Nov 2016 21:38:55 +0000 (13:38 -0800)]
Merge pull request #12028 from batrick/client-redundant-init
client: remove redundant initialization
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Patrick Donnelly [Wed, 16 Nov 2016 18:50:12 +0000 (13:50 -0500)]
mon: remove utime_t param in _dump
Missing in
af720cc87b4d631695c1549c31d57bfbc82bc6ba .
Found in warning:
In file included from /home/pdonnell/ceph/src/mds/MDSRank.h:18:0,
from /home/pdonnell/ceph/src/mds/MDBalancer.cc:18:
/home/pdonnell/ceph/src/common/TrackedOp.h:153:16: warning: ‘virtual void TrackedOp::_dump(ceph::Formatter*) const’ was hidden [-Woverloaded-virtual]
virtual void _dump(Formatter *f) const {}
^
In file included from /home/pdonnell/ceph/src/mon/mon_types.h:23:0,
from /home/pdonnell/ceph/src/mon/MonMap.h:22,
from /home/pdonnell/ceph/src/mon/MonClient.h:20,
from /home/pdonnell/ceph/src/mds/MDBalancer.cc:19:
/home/pdonnell/ceph/src/mon/MonOpRequest.h:106:8: warning: by ‘void MonOpRequest::_dump(utime_t, ceph::Formatter*) const’ [-Woverloaded-virtual]
void _dump(utime_t now, Formatter *f) const {
^
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Loic Dachary [Tue, 15 Nov 2016 16:16:37 +0000 (17:16 +0100)]
mon,ceph-disk: add lockbox permissions to bootstrap-osd
ceph-disk --dmcrypt needs to put a config-key and authorize
the OSD to get it back. The corresponding permissions are
added to the bootstrap-osd profile in the monitor.
When preparing the OSD lockbox, use the bootstrap-osd profile instead of
implicitly requiring admin permissions to perform the initial config-key
and auth get-or-create operations.
Fixes: http://tracker.ceph.com/issues/17849
Signed-off-by: Loic Dachary <loic@dachary.org>
Patrick Donnelly [Fri, 11 Nov 2016 15:37:29 +0000 (10:37 -0500)]
client: remove redundant initialization
messenger is already initialized in the constructor member
initialization list.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Loic Dachary [Wed, 16 Nov 2016 18:32:51 +0000 (19:32 +0100)]
Merge pull request #12025 from dachary/wip-17923-tox
tests: no python3 tests for ceph-disk
Reviewed-by: Samuel Just <sjust@redhat.com>
Loic Dachary [Wed, 16 Nov 2016 17:47:28 +0000 (18:47 +0100)]
tests: no python3 tests for ceph-disk
2.5.0 published today made it so an environment with no action fails
where it previously did not.
Fixes: http://tracker.ceph.com/issues/17923
Signed-off-by: Loic Dachary <loic@dachary.org>
Kefu Chai [Wed, 16 Nov 2016 16:41:47 +0000 (00:41 +0800)]
Merge pull request #12024 from tchaikov/wip-ceph-erasure-code-corpus-arch
tests: sync ceph-erasure-code-corpus for using 'arch' not 'uname -p'
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Wed, 16 Nov 2016 15:47:48 +0000 (23:47 +0800)]
tests: sync ceph-erasure-code-corpus for using 'arch' not 'uname -p'
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 16 Nov 2016 15:23:29 +0000 (09:23 -0600)]
Merge pull request #12011 from ceph/wip-git-archive-all
git-archive-all.sh: use an actually unique tmp dir
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Wed, 16 Nov 2016 12:44:28 +0000 (20:44 +0800)]
Merge pull request #12007 from jcsp/wip-trackedop-now
common/TrackedOp: remove unused 'now' in _dump()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 16 Nov 2016 12:02:38 +0000 (20:02 +0800)]
Merge pull request #12016 from dachary/wip-17919-osd-crush
tests: osd-crush.sh must retry crush dump
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 16 Nov 2016 12:00:29 +0000 (20:00 +0800)]
Merge pull request #12012 from tchaikov/wip-sepia-bt
script/sepia_bt.sh: a script to prepare for debugging on teuthology@sepia
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
John Spray [Wed, 16 Nov 2016 11:59:41 +0000 (11:59 +0000)]
Merge pull request #11167 from jcsp/wip-17308
mon: make MDSMonitor tolerant of slow mon elections
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Wed, 16 Nov 2016 09:18:02 +0000 (10:18 +0100)]
tests: osd-crush.sh must retry crush dump
After ceph osd setcrushmap, the script must retry because ceph osd crush
dump races against the update of the crushmap.
Fixes: http://tracker.ceph.com/issues/17919
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Wed, 16 Nov 2016 08:50:10 +0000 (09:50 +0100)]
Merge pull request #11979 from ceph/wip-disable-osd-scrub-repair
test: disable osd-scrub-repair and test-erasure-eio
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Wed, 16 Nov 2016 04:07:54 +0000 (12:07 +0800)]
script/sepia_bt.sh: a script to prepare for debugging on teuthology@sepia
Signed-off-by: Kefu Chai <kchai@redhat.com>
Dan Mick [Wed, 16 Nov 2016 03:42:06 +0000 (19:42 -0800)]
git-archive-all.sh: use an actually unique tmp dir
git archive into $TMPDIR/$(basename "$(pwd)").$FORMAT is not unique;
if two runs are running simultaneously, this will collide. Make
TMPDIR actually unique, and then the cleanup can just remove the whole
directory as well.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Samuel Just [Tue, 15 Nov 2016 23:26:23 +0000 (15:26 -0800)]
Merge pull request #12003 from athanatos/wip-17899
OSDMonitor: only reject MOSDBoot based on up_from if inst matches
Reviewed-by: Sage Weil <sage@redhat.com>
John Spray [Wed, 21 Sep 2016 10:45:38 +0000 (11:45 +0100)]
mon: make MDSMonitor tolerant of slow mon elections
Previously MDS daemons would get failed incorrectly
when they appeared to have timed out due to
delays in calling into MDSMonitor that were
actually caused by e.g. slow leveldb writes leading
to slow mon elections.
Fixes: http://tracker.ceph.com/issues/17308
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 9 Nov 2016 19:51:34 +0000 (19:51 +0000)]
mon: clean up MDSMonitor interface
This was almost all public.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 23:04:03 +0000 (23:04 +0000)]
Merge pull request #11836 from batrick/client-new-
20161108
client: remove unnecessary bufferptr[] for writev
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 15 Nov 2016 23:03:09 +0000 (23:03 +0000)]
Merge pull request #11837 from batrick/client-unique-
20161108
client: use unique_ptr
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 15 Nov 2016 22:36:17 +0000 (22:36 +0000)]
Merge pull request #11904 from stiopaa1/mds_scrubheader_passStringByConstRef
mds/ScrubHeader.h: pass string by const reference
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
John Spray [Tue, 15 Nov 2016 22:35:47 +0000 (22:35 +0000)]
Merge pull request #11651 from stiopaa1/mds_mdsrank_protectedDestructor
mds/MDSRank.h: make destructor protected
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 15 Nov 2016 22:33:54 +0000 (22:33 +0000)]
Merge pull request #11338 from stiopaa1/mds_sessionmap_unneededCount
mds/SessionMap.cc: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 15 Nov 2016 22:21:16 +0000 (22:21 +0000)]
Merge pull request #11957 from batrick/mds-deactivate-doc
doc: clarify mds deactivate purpose
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 22:01:22 +0000 (22:01 +0000)]
common/TrackedOp: remove unused 'now' in _dump()
Greg pointed this out in PR #11985
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 21:59:28 +0000 (21:59 +0000)]
Merge pull request #11985 from batrick/op-tracker-mds-event
mds: revert "mds/Mutation: remove redundant _dump method"
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 15 Nov 2016 21:52:36 +0000 (21:52 +0000)]
Merge pull request #11958 from batrick/cls-lua-lua_next
lua: use simpler lua_next traversal structure
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 21:47:21 +0000 (21:47 +0000)]
Merge pull request #11833 from stiopaa1/mds_migrator_removeUnneededUseOfCount
mds/Migrator.h: remove unneeded use of count
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)]
Merge pull request #10940 from stiopaa1/mds_beacon_moveCMDSBeaconSenderClass
mds/Beacon: move C_MDS_BeaconSender class to .cc
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 15 Nov 2016 21:35:02 +0000 (21:35 +0000)]
Merge pull request #11887 from jcsp/wip-efragment-cleanup
mds: remove unused EFragment::OP_ONESHOT
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yehuda Sadeh [Tue, 15 Nov 2016 19:22:03 +0000 (11:22 -0800)]
Merge pull request #12004 from bassamtabbara/wip-fix-civetweb-submodule
rgw: revert unintentional change to civetweb
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Bassam Tabbara [Tue, 15 Nov 2016 19:13:20 +0000 (11:13 -0800)]
rgw: revert unintentional change to civetweb
https://github.com/ceph/ceph/pull/11800 uninternionally updated
the civetweb submodule.
Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
John Spray [Tue, 15 Nov 2016 18:52:26 +0000 (18:52 +0000)]
Merge pull request #11908 from stiopaa1/mds_mdcache_removeUnusedFunctions
mds/MDCache.h: remove unused functions
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Tue, 15 Nov 2016 18:45:39 +0000 (12:45 -0600)]
Merge pull request #11964 from xiexingguo/xxg-wip-bluestore-1112
os/bluestore: misc. fixes and cleanups
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 15 Nov 2016 18:45:00 +0000 (12:45 -0600)]
Merge pull request #11986 from xiexingguo/xxg-wip-bluestore-1115
os/bluestore: dedup if space overlap truly exists
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Dan Mick [Tue, 15 Nov 2016 02:29:11 +0000 (18:29 -0800)]
test: disable osd-scrub-repair and test-erasure-eio
After Sage's suggestion of earlier today, in now-closed
PR #11970, which can't be resurrected just now
Kefu is trying to reproduce osd-scrub-repair failures
David is working test-erasure-eio in
https://github.com/ceph/ceph/pull/11926
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Sage Weil [Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)]
Merge pull request #11803 from XinzeChi/wip-openpgs
osd: do not open pgs when the pg is not in pg_map
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Tue, 15 Nov 2016 16:44:02 +0000 (00:44 +0800)]
Merge pull request #11962 from tchaikov/wip-doc-rebuilddb
doc: fix the script for rebuild monitor db
Reviewed-by: Shylesh Kumar <shmohan@redhat.com>
Kefu Chai [Tue, 15 Nov 2016 14:03:36 +0000 (22:03 +0800)]
Merge pull request #11984 from batrick/sphinx-py3-error
doc/man: avoid file builtin to solve build error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Patrick Donnelly [Tue, 15 Nov 2016 03:46:23 +0000 (22:46 -0500)]
doc/man: avoid file builtin to solve build error
Sphinx running with Python 3.X fails:
# Sphinx version: 1.4.8
# Python version: 3.5.2 (CPython)
# Docutils version: 0.12 release
# Jinja2 version: 2.8
# Last messages:
# Loaded extensions:
Traceback (most recent call last):
File "/usr/lib/python3.5/site-packages/sphinx/cmdline.py", line 243, in main
opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)
File "/usr/lib/python3.5/site-packages/sphinx/application.py", line 137, in __init__
confoverrides or {}, self.tags)
File "/usr/lib/python3.5/site-packages/sphinx/config.py", line 287, in __init__
execfile_(filename, config)
File "/usr/lib/python3.5/site-packages/sphinx/util/pycompat.py", line 130, in execfile_
exec_(code, _globals)
File "conf.py", line 56, in <module>
File "conf.py", line 47, in _get_manpages
File "conf.py", line 12, in _get_description
NameError: name 'file' is not defined
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Jason Dillaman [Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)]
Merge pull request #11808 from trociny/wip-17010
librbd: default features should be negotiated with the OSD
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 15 Nov 2016 13:35:40 +0000 (08:35 -0500)]
Merge pull request #11821 from trociny/wip-test_notify
test/librbd: in test_notify set object-map and fast-diff features by default
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 15 Nov 2016 13:34:38 +0000 (08:34 -0500)]
Merge pull request #11840 from yangdongsheng/rbd_mirror_options
rbd-mirror: configuration overrides for hard coded timers
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
xie xingguo [Tue, 15 Nov 2016 09:03:48 +0000 (17:03 +0800)]
os/bluestore: note 1st existed coll instead of 1st coll
We store the coll mainly for cache trim and we shall try
our best to do it whenever it is possible.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Tue, 15 Nov 2016 07:15:51 +0000 (15:15 +0800)]
os/bluestore: move comments to proper place
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Tue, 15 Nov 2016 07:10:13 +0000 (15:10 +0800)]
os/bluestore: drop wal_op_onodes
Which is currently unused.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Tue, 15 Nov 2016 05:59:56 +0000 (13:59 +0800)]
os/bluestore: dedup if space overlap truly exists
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Patrick Donnelly [Mon, 14 Nov 2016 23:30:35 +0000 (18:30 -0500)]
mds: revert "mds/Mutation: remove redundant _dump method"
This reverts commit
93d0fc9d937186861b41b054235955475c65b5c1 .
This commit had the unintentional side-effect of preventing TrackedOp
dumps from including MDS specific events.
Fixes: http://tracker.ceph.com/issues/17906
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
xie xingguo [Tue, 15 Nov 2016 02:18:36 +0000 (10:18 +0800)]
os/bluestore: simplify OmapIteratorImpl::valid()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Tue, 15 Nov 2016 00:32:25 +0000 (08:32 +0800)]
os/bluestore: formatting nits
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Mon, 14 Nov 2016 07:25:03 +0000 (15:25 +0800)]
os/bluestore: make fsck() can catch uninitialized sbid too
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Dan Mick [Mon, 14 Nov 2016 23:42:35 +0000 (15:42 -0800)]
Merge pull request #11973 from ceph/wip-17898-ceph-disk-flake8
ceph-disk: fix flake8 errors
Reviewed-by: Dan Mick <dmick@redhat.com>
Loic Dachary [Mon, 14 Nov 2016 22:08:04 +0000 (23:08 +0100)]
Merge pull request #11971 from dachary/wip-17898-flake8
tests: pin flake8 to avoid behavior changes
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Ken Dreyer [Mon, 14 Nov 2016 21:49:15 +0000 (14:49 -0700)]
ceph-disk: fix flake8 errors
flake8 3.1.1 surfaces the following issues:
ceph_disk/main.py:173:1: E305 expected 2 blank lines after class or
function definition, found 1
ceph_disk/main.py:5011:1: E305 expected 2 blank lines after class or
function definition, found 1
Fixes: http://tracker.ceph.com/issues/17898
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Gregory Farnum [Mon, 14 Nov 2016 21:15:25 +0000 (13:15 -0800)]
Merge pull request #11954 from stiopaa1/mds_MDCache_removeUnneededClear
mds/MDCache.h: remove unneeded call to clear func
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Mon, 14 Nov 2016 21:07:06 +0000 (13:07 -0800)]
Merge pull request #11912 from SUSE/wip-17747-followup
doc: drop --journal-check from ceph-mds man page
Reviewed-by: John Spray <john.spray@redhat.com>
Samuel Just [Mon, 14 Nov 2016 19:50:23 +0000 (11:50 -0800)]
OSDMonitor: only reject MOSDBoot based on up_from if inst matches
If the osd actually restarts, there is no guarrantee that the epoch will
advance past up_from. If the inst is different, it can't really be a
dup. At worst, it might be a queued MOSDBoot from a previous inst, but
in that case, the real inst would see itself marked up, and then back
down causing it to try booting again.
Fixes: http://tracker.ceph.com/issues/17899
Signed-off-by: Samuel Just <sjust@redhat.com>
Loic Dachary [Mon, 14 Nov 2016 18:32:24 +0000 (19:32 +0100)]
tests: pin flake8 to avoid behavior changes
Fixes: http://tracker.ceph.com/issues/17898
Signed-off-by: Loic Dachary <loic@dachary.org>
Sage Weil [Mon, 14 Nov 2016 17:10:16 +0000 (11:10 -0600)]
Merge pull request #11967 from wjwithagen/wip-wjw-buffer-splice
common/buffer.cc: raw_pipe depends on splice(2)
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 14 Nov 2016 16:02:40 +0000 (00:02 +0800)]
Merge pull request #11914 from tchaikov/wip-17857
ReplicatedPG::failed_push: release read lock on failure
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Willem Jan Withagen [Mon, 14 Nov 2016 15:59:17 +0000 (16:59 +0100)]
common/buffer.cc: raw_pipe depends on splice(2)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Sage Weil [Mon, 14 Nov 2016 15:56:46 +0000 (09:56 -0600)]
Merge pull request #11919 from liewegas/wip-bluestore-cache-meta
os/bluestore: bluestore_cache_meta_ratio = .5
Reviewed-by: Mark Nelson <mnelson@redhat.com>
Sage Weil [Mon, 14 Nov 2016 15:42:53 +0000 (10:42 -0500)]
os/bluestore: precondition enough to write two 256mb buffers
We now match the new bluestore_rocksdb_options.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 11 Nov 2016 16:09:55 +0000 (11:09 -0500)]
os/bluestore: bluestore_cache_meta_ratio = .5
Signed-off-by: Sage Weil <sage@redhat.com>
Dongsheng Yang [Wed, 9 Nov 2016 00:39:10 +0000 (19:39 -0500)]
rbd-mirror: configuration overrides for hard coded timers
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Kefu Chai [Mon, 14 Nov 2016 14:08:36 +0000 (22:08 +0800)]
Merge pull request #11842 from ceph/wip-cmake
cmake: librbd cleanup
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Fri, 11 Nov 2016 13:37:50 +0000 (21:37 +0800)]
ReplicatedPG::failed_push: release read lock on failure
and requeue the blocked ops.
Fixes: http://tracker.ceph.com/issues/17857
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 14 Nov 2016 08:04:48 +0000 (16:04 +0800)]
cmake:librbd: move common to the end of linked libraries
so the linked libraries are able to find the symbols in libcommon.
and do not `list(APPEND librbd ...)` anymore, which is wrong and not
necessary. librbd does not depends on krbd.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 9 Nov 2016 05:11:13 +0000 (13:11 +0800)]
cmake: move ContextCompletion.cc into rbd_internal
- ContextCompletion.cc is used by TrimRequest.cc which is included by
rbd_internal, it's more natural to put ContextCompletion.cc into
rbd_internal also. as rbd_internal is the only consumer of this
translation unit.
- librbd/internal.cc is not referencing any symbols from util.cc, so
remove this include. and also, do not add
$<TARGET_OBJECTS:common_util_obj> to librbd.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 9 Nov 2016 04:10:03 +0000 (12:10 +0800)]
cmake: let rbd_internal depend on librbd-tp
as librbd/AioCompletion.cc includes "tracing/librbd.h", which is offered
by librbd-tp.
Signed-off-by: Kefu Chai <kchai@redhat.com>