Commit Graph

60098 Commits

Author SHA1 Message Date
David Zafman
8c824fd3ba test: Remove renamed test directory
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-17 08:49:57 -08:00
Loic Dachary
77fe9af960 Merge pull request #12036 from tchaikov/wip-osd-scrub-repair-cleanup
test/osd-scrub-repair.sh: use repair() instead of "ceph pg repair"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-11-17 16:54:53 +01:00
Sage Weil
6662c80b46 Merge pull request #12039 from xiexingguo/xxg-wip-bluestreo-1117
os/bluestore: fix bufferspace stats leak due to blob splitting

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-17 09:25:03 -06:00
Sage Weil
12b12e6023 Merge pull request #12042 from ifed01/wip-bluestore-drop-blob_depth
os/bluestore: remove garbage collector staff

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-17 09:19:57 -06:00
Casey Bodley
1cf0f1e3a7 Merge pull request #11961 from tianshan/fix-RGWSimpleRadosLockCR
rgw: fix RGWSimpleRadosLockCR set_description()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-11-17 09:57:12 -05:00
Casey Bodley
7bab807821 Merge pull request #11965 from ceph/wip-rgw-fix-period-commit
rgw: fix missing master zone for a single zone zonegroup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-11-17 09:56:18 -05:00
Jason Dillaman
eb0248c6e3 Merge pull request #12020 from leseb/glance-mitaka
doc: openstack glance mitaka uses show_multiple_locations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-17 09:31:22 -05:00
Orit Wasserman
0870b00c77 rgw: fix missing master zone for a single zone zonegroup
Fixes: http://tracker.ceph.com/issues/17364
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-11-17 14:51:35 +01:00
Igor Fedotov
adddaf49a7 os/bluestore: remove garbage collector staff
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-17 13:34:17 +00:00
Kefu Chai
e445953379 Merge pull request #11424 from renhwztetecs/renhw-wip-mgr
mgr: init() return when connection daemons failed && add some err info

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-17 19:40:53 +08:00
Igor Fedotov
7814549c74 Merge pull request #12015 from xiexingguo/xxg-wip-bluestore-init-csum
os/bluestore: avoid unnecessary call to init_csum()

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-17 14:07:40 +03:00
Kefu Chai
1be2eb114b test/osd-scrub-repair.sh: use repair() instead of "ceph pg repair"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-11-17 18:51:52 +08:00
Kefu Chai
15649431a0 Merge pull request #12038 from tchaikov/wip-ceph-objectstore-tool
test: ceph-objectstore-tool: should import platform before using it

Reviewed-by: Owen Synge <osynge@suse.com>
2016-11-17 18:13:47 +08:00
Sébastien Han
def903a7ef doc: openstack glance mitaka uses show_multiple_locations
As of the Mitaka release show_image_direct_url is not needed, but
instead show_multiple_locations should be used.
Adding the necessary guidance for Mitaka release.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-17 10:57:36 +01:00
Kefu Chai
e3de5f4a08 test: ceph-objectstore-tool: should import platform before using it
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-11-17 17:20:57 +08:00
Kefu Chai
2c7f08b849 Merge pull request #9613 from dzafman/wip-16064
common osd: Improve scrub analysis, list-inconsistent-obj output and osd-scrub-repair test

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-17 15:48:32 +08:00
Kefu Chai
7c471eaf5a Merge pull request #10507 from wjwithagen/wip-wjw-tests-ceph_objectstore_tool
ceph_objectstore_tool.py: Don't use btrfs on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-17 14:57:51 +08:00
Kefu Chai
3a00c50a72 Merge pull request #11890 from liupan1111/wip-code-clean-ups
os/filestore: handle EINTR returned by io_getevents()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-17 14:54:49 +08:00
Kefu Chai
761f193282 Merge pull request #11765 from bassamtabbara/wip-crushtool-fix
mon: if crushtool config is empty use internal crush test

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-17 14:53:28 +08:00
xie xingguo
3bf051d6f9 os/bluestore: fix bufferspace stats leak due to blob splitting
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-17 14:51:31 +08:00
Kefu Chai
5445a3dd0e Merge pull request #11926 from dzafman/wip-test-17830
test: fix test-erasure-eio and osd-scrub-repair races (17830)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-17 14:39:17 +08:00
Xie Xingguo
b24bd44149 Merge pull request #12030 from branch-predictor/bp-rmxattr-bl
librados: remove unused bufferlist from rados_write_op_rmxattr

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-17 10:24:08 +08:00
David Zafman
d0410062e2 test: Add sleep 1 so that we look for 60 seconds
This failed because test blew through 60 requests in 8 seceons before
the scrub repair even started on Jenkins.

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 17:58:09 -08:00
David Zafman
b7657c5431 test: Fix duplicate port in test-erasure-code-plugins.sh
Add comments about uniqueness of port number required

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-11-16 17:56:17 -08: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