Commit Graph

60180 Commits

Author SHA1 Message Date
Adam C. Emerson
c8194265e9 fuse: Fix narrowing error in switch statement
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2016-11-16 19:54:31 -05:00
Adam C. Emerson
e076245b70 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>
2016-11-16 19:54:31 -05:00
Sage Weil
20b58ba6c9 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>
2016-11-16 18:29:52 -06:00
David Zafman
006ab8dfe7 mon: Fix compiler warnings, missed _dump() change
Caused by: af720cc87b

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 15:40:41 -08:00
David Zafman
db7be41c1e test: Re-enable osd-scrub-repair.sh
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 15:40:40 -08:00
David Zafman
d30056a16a test: In osd-scrub-repair.sh fix use of wait_for_clean()
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 15:40:40 -08:00
Loic Dachary
88ce18da90 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>
2016-11-17 00:40:25 +01:00
Sage Weil
ee84e78f90 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>
2016-11-16 17:14:10 -06:00
Sage Weil
28ebc35c89 os/bluestore/KernelDevice: initialize oldest
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-16 17:14:10 -06:00
Gregory Farnum
41408ec921 Merge pull request #12029 from batrick/mon-_dump-bugfix
mon: remove utime_t param in _dump

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-16 13:58:38 -08:00
Piotr Dałek
7b3643decc librados: remove unused bufferlist from rados_write_op_rmxattr
rados_write_op_rmxattr declares the bl bufferlist variable, then doesn't make
any use of it. Get rid of it, as it's probably an effect of copy+paste.

Signed-off-by: Piotr Dałek <git@predictor.org.pl>
2016-11-16 22:52:53 +01:00
Gregory Farnum
b017355626 Merge pull request #12028 from batrick/client-redundant-init
client: remove redundant initialization

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-16 13:38:55 -08:00
David Zafman
df9a2df131 test: Re-enable test-erasure-eio.sh
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 11:01:43 -08:00
David Zafman
1a75696065 test: activate_osd() doesn't need to set crush
Tests use objectstore_tool() which stops and starts OSDs,
but may assume consistency of object locations.

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 11:01:43 -08:00
David Zafman
f3def4a0e5 test: wait_for_clean() add sleep backoff
Reduce size of log on timeout by doing a backoff so that
we don't log 3000 loops at 1/10 second sleeps.

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 11:01:43 -08:00
David Zafman
6a78b81f37 test: CLEANUP to later enable TEST_rados_get_with_subreadall_eio_shard_*
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 10:59:24 -08:00
Patrick Donnelly
c2875e6a3f
mon: remove utime_t param in _dump
Missing in af720cc87b.

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>
2016-11-16 13:50:12 -05:00
Loic Dachary
c1c6224bf8 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>
2016-11-16 19:34:40 +01:00
Patrick Donnelly
bc84f889be
client: remove redundant initialization
messenger is already initialized in the constructor member
initialization list.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-11-16 13:34:09 -05:00
Loic Dachary
59bf888e2c Merge pull request #12025 from dachary/wip-17923-tox
tests: no python3 tests for ceph-disk

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-11-16 19:32:51 +01:00
Loic Dachary
28c545eff5 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>
2016-11-16 18:47:28 +01:00
David Zafman
eb73dd4736 doc, test: Add schemas for list-inconsistent-* rados command output
If jsonschema cmd is available use it to test output against schema

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 09:38:15 -08:00
David Zafman
b7bacd219b test: Update testing for new list-inconsistent-obj output
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 09:38:15 -08:00
David Zafman
df3ff6dafe rados, osd: Improve attrs output of list-inconsistent-obj
Persist the user_version and shard id of scrubbed obj
Rados command dump inconsistent obj's version and shard-id
    so they can be passed to repair command
Rados list-inconsistent-obj output of attrs
    Make attrs an array since there are more than one
    Use base64 encode for values with non-printable chars
    Add indication if base64 encoding used
Add checking for ss_attr_missing and ss_attr_corrupted
    Rename attr errors to attr_key_mismatch and attr_value_mismatch
Add missing size_mismatch_oi scrub checking
For erasure coded pools add ec_size_error and ec_hash_error not just read_error
Use oi_attr_missing and oi_attr_corrupted just like list-inconsistent-snap does
Pick an object info based on version and use that to find specific shards in error
    Check for object info inconsistency which should be rare
Make all errors based on comparing shards to each other object errors
    We don't want give the impression that we've picked the correct one

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 09:38:15 -08:00
Kefu Chai
397e38aa39 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>
2016-11-17 00:41:47 +08:00
Kefu Chai
f8ce44029b tests: sync ceph-erasure-code-corpus for using 'arch' not 'uname -p'
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-11-16 23:48:00 +08:00
Sage Weil
588d6319d9 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>
2016-11-16 09:23:29 -06:00
Kefu Chai
7a5eb3b73f 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>
2016-11-16 20:44:28 +08:00
Kefu Chai
c1d74d2c01 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>
2016-11-16 20:02:38 +08:00
Kefu Chai
a2faf63ceb 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>
2016-11-16 20:00:29 +08:00
John Spray
f4fda3fa0f Merge pull request #11167 from jcsp/wip-17308
mon: make MDSMonitor tolerant of slow mon elections

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-16 11:59:41 +00:00
Loic Dachary
274c307de6 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>
2016-11-16 10:21:26 +01:00
Loic Dachary
b135ded369 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>
2016-11-16 09:50:10 +01:00
xie xingguo
eedb3f4b6b os/bluestore: more readability improvements
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-16 16:13:14 +08:00
xie xingguo
5beb99e17a os/bluestore: avoid unnecessary call to init_csum()
We have to initiate CSumType from 1, which represents CSUM_NONE,
to be aligned with OSDMnitor's pool_opts_t handling.

So we have to explicitly check against CSUM_NONE to skip init_csum(),
which will set FLAG_CSUM and alloc memory for csum_data and thus
shall be avoided whenever it is possible.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-16 14:33:30 +08:00
Kefu Chai
045b8212e1 script/sepia_bt.sh: a script to prepare for debugging on teuthology@sepia
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-11-16 12:09:27 +08:00
Dan Mick
6cc659feea 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>
2016-11-15 19:45:02 -08:00
Samuel Just
83ce0fe2f4 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>
2016-11-15 15:26:23 -08:00
John Spray
9950062f90 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>
2016-11-15 23:09:25 +00:00
John Spray
14588e544f mon: clean up MDSMonitor interface
This was almost all public.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-15 23:09:21 +00:00
John Spray
669cbfbda8 Merge pull request #11836 from batrick/client-new-20161108
client: remove unnecessary bufferptr[] for writev

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-15 23:04:03 +00:00
John Spray
916ad85853 Merge pull request #11837 from batrick/client-unique-20161108
client: use unique_ptr

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-15 23:03:09 +00:00
John Spray
6ca6fd1ed9 Merge pull request #11904 from stiopaa1/mds_scrubheader_passStringByConstRef
mds/ScrubHeader.h: pass string by const reference

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2016-11-15 22:36:17 +00:00
John Spray
4ed46effde Merge pull request #11651 from stiopaa1/mds_mdsrank_protectedDestructor
mds/MDSRank.h: make destructor protected

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-15 22:35:47 +00:00
John Spray
163c6285d2 Merge pull request #11338 from stiopaa1/mds_sessionmap_unneededCount
mds/SessionMap.cc: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-11-15 22:33:54 +00:00
John Spray
556c8caf23 Merge pull request #11957 from batrick/mds-deactivate-doc
doc: clarify mds deactivate purpose

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-15 22:21:16 +00:00
John Spray
af720cc87b common/TrackedOp: remove unused 'now' in _dump()
Greg pointed this out in PR #11985

Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-15 22:02:19 +00:00
John Spray
82f5750b51 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>
2016-11-15 21:59:28 +00:00
John Spray
212b9737b8 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>
2016-11-15 21:52:36 +00:00
John Spray
8a08531135 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>
2016-11-15 21:47:21 +00:00