Commit Graph

41891 Commits

Author SHA1 Message Date
Loic Dachary
64944d4105 tests: ceph-helpers.sh use expr instead of (( ))
Because (( timer++ )) is mistaken by set -e to not be a successful
command, use expr instead.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 18:33:20 +02:00
Loic Dachary
d2172b0e89 tests: move ceph-helpers.sh to qa/workunits
So that it can be used by scripts in qa/workunits that need it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 18:33:17 +02:00
Loic Dachary
830054b419 Merge pull request #4797 from dachary/wip-11665-erasure-code-lrc
tests: add lrc tests to osd-scrub-repair.sh

Reviewed-by: Shylesh Kumar <shmohan@redhat.com>
2015-05-30 12:19:59 +02:00
Kefu Chai
17855b4288 Merge pull request #4799 from dachary/wip-install-deps
install-deps.sh: robust pip and wheel installation

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-30 17:47:36 +08:00
Loic Dachary
8199e0064b install-deps.sh: do not store pip cache outside of the tree
Signed-off-by: Loic Dachary <ldachary@redhat.org>
2015-05-30 11:00:56 +02:00
Sage Weil
013f9af82c Merge pull request #4727 from tchaikov/wip-osdmaptool-dump-tree-with-format
osdmaptool: dump tree with given format

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 17:43:54 -07:00
Loic Dachary
bbf75f811c install-deps.sh: keep debian alternatives
Instead of removing the | when an alternative is found in the control
file such as

     cryptsetup-bin | cryptsetup

remove the surrounding spaces so that it is treated as a regular
expression that matches either one.

Replace the form

    sudo bash -c "FOO=bar ..."

with

    sudo env FOO=bar ...

to reduce the levels of shell escaping.

Reported-by: http://dyweni.com/
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-29 23:55:01 +02:00
Loic Dachary
cbc96a08d0 install-deps.sh: robust pip and wheel installation
The wheel and pip module must not only be installed in each wheelhouse
directory for tox to find. They must also be installed in the virtual
environment that populates the wheelhouse directory. Otherwise older pip
modules such as the one found by default on Ubuntu 12.04 will fail.

Python 2.7.3 on Ubuntu 12.04 also requires that distribute >= 0.7.3 is
installed although it is redundant with setuptools, otherwise it will
fail to run the wheel module.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-29 23:43:06 +02:00
Sage Weil
64096b8709 Merge pull request #4805 from athanatos/wip-11787
Wip 11787

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 14:21:52 -07:00
Samuel Just
33150c509d Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-29 14:20:29 -07:00
Sage Weil
d07100b660 Merge pull request #4526 from athanatos/wip-11296
Wip 11296

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 14:19:44 -07:00
Samuel Just
8a95f13a69 Merge remote-tracking branch 'upstream/wip-11493'
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 14:17:42 -07:00
Sage Weil
315260a58c Merge pull request #4803 from athanatos/wip-11677
Wip 11677 -- fixes for rw rados ops with snaps

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 14:11:12 -07:00
Samuel Just
be873eb8da ReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked
Otherwise we can reorder an op around another op which got blocked by a
scrub which started after the first blocked on an obc.

Fixes: #11691
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-29 14:09:11 -07:00
Samuel Just
5c2b795724 ReplicatedPG::finish_ctx: take excl lock if operation is rw
Fixes: #11677
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-29 14:09:05 -07:00
Sage Weil
f9ce2d78cf Merge pull request #4804 from athanatos/wip-11771
osd_types::is_new_interval: size change triggers new interval

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 14:03:36 -07:00
Samuel Just
d7fabebf84 Merge pull request #4070 from ceph/wip-chain-xattr
os/chain_xattr: cope with xfs limit of 254 bytes for inlined xattrs.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Ning Yao <zay11022@gmail.com>
2015-05-29 10:57:29 -07:00
Samuel Just
2b28150765 Merge pull request #4059 from majianpeng/copyget-digest
Replicated: For COPY_GET, only src has data/omap digest, the dst can do.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-29 10:41:12 -07:00
Samuel Just
3e072c9032 Merge pull request #3253 from majianpeng/bug-fix
cleanup code for wbthrottle.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-29 10:31:21 -07:00
John Spray
891e9b17dc Merge pull request #4800 from hjwsm1989/journaler
osdc/Journaler.h: fix ceph_file_layout dump error in journaler::dum…

Reviewed-by: John Spray <john.spray@redhat.com>
2015-05-29 12:39:12 +02:00
Loic Dachary
a10bd899d1 Merge pull request #4794 from XinzeChi/wip-kill-sleep
test: check daemon is alive or not agagin when sleep 60s

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-29 10:56:54 +02:00
huangjun
8a6d626c63 osdc/Journaler.h: fix ceph_file_layout dump error in journaler::dump().
Signed-off-by: huangjun <hjwsm1989@gmail.com>
2015-05-29 16:11:11 +08:00
Xinze Chi
83f88e7645 commit: test: check daemon is alive or not agagin when sleep 60s
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-05-29 09:33:01 +08:00
Loic Dachary
ddcbb66d4d tests: add lrc tests to osd-scrub-repair.sh
Create an lrc erasure coded pool and run corruption and repair tests on
it.

http://tracker.ceph.com/issues/11665 Fixes: #11665

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 23:25:24 +02:00
Loic Dachary
77f322b63c tests: split osd-scrub-repair.sh erasure code test
The erasure code repair test is split in two function:

 * setup conditions specific to jerasure (4 osds, jerasure
   profile)

 * populate and corrupt and repair the erasure coded pool,
   with one or two failures.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 23:25:19 +02:00
Loic Dachary
70e069d272 tests: cosmetic move of functions in osd-scrub-repair.sh
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 22:38:08 +02:00
Loic Dachary
28820d1cd6 erasure-code: s/unreocvery/unfound/
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 22:35:08 +02:00
Yehuda Sadeh
7b4ee4060a Merge pull request #4796 from SUSE/wip-release-notes-fixup
doc: release-notes.rst: fix typo and delete superfluous sentence

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-28 21:02:14 +03:00
Nathan Cutler
8b78371877 doc: release-notes.rst: fix typo and delete superfluous sentence
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-05-28 19:29:58 +02:00
Ken Dreyer
9844320371 Merge pull request #4786 from dachary/wip-11546-debian-packages
debian/control: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-05-28 11:09:07 -06:00
Loic Dachary
6f11fbf41f debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg
When ceph-objectstore-tool was moved from ceph-test to
ceph by 61cf5da0b5, the ceph package in
debian/control was updated accordingly, as recommended by
https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

The same must be done for the ceph-dbg package because
/usr/lib/debug/usr/bin/ceph-objectstore-too is no longer in
ceph-test-dbg.

Although the change was merged may 6th, 2015
8f23382064, teuthology jobs were not
always failing because packages were not systematically upgraded during
the installation. The missing dependencies that were responsible for
this upgrade problem were fixed by
f898ec1e4e on may 18th, 2015 and all
upgrade tests relying on ceph-*-dbg packages started to fail
systematically after this date.

http://tracker.ceph.com/issues/11546 Fixes: #11546

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 15:50:02 +02:00
Loic Dachary
dbd9a87ec1 Merge pull request #4787 from yuyuyu101/fix-perf-i386
PerfLocal: fix i386 compatible with perf_local

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 15:31:22 +02:00
Yehuda Sadeh
77e0084028 Merge pull request #4309 from prallabh/master
RGW: Make RADOS handles in RGW to be a configurable option

Passed rgw teuthology suite run.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-28 04:41:41 -07:00
Loic Dachary
729c5e1c0e Merge pull request #4789 from yehudasa/wip-11442-notes
rgw: update release notes with regard to issue #11442 recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 12:28:18 +02:00
Yehuda Sadeh
926f2dfef6 rgw: update release notes with regard to issue #11442 recovery
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-28 03:07:02 -07:00
Haomai Wang
0b5944ae6c PerfLocal: fix i386 compatible with perf_local
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-28 17:25:30 +08:00
Loic Dachary
b80e214407 Merge pull request #4785 from tchaikov/wip-doc-fixes
doc: typo fixes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-28 11:01:51 +02:00
Kefu Chai
a808c814b0 osdmap, mon: switch the params of print_tree()
* change from
    print_tree(ostream*, Formatter*)
  to
    print_tree(Formatter*, ostream*)
  this is more consistent with other map's print
  functions. e.g.
    MDSMap::print_summary(Formatter *f, ostream *out)
* and in print_tree(Formatter* f, ostream* os),
  - `f` and `os` will be mutual exclusive.
  - will assert(0) if both of them are NULL.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-28 01:39:35 -07:00
Kefu Chai
aa62dcbe39 osdmaptool: dump 'osd tree' in specified format
* so we are able to dump more info from osdmap using this tool,
  and this allows us to reproduce the behavior of "ceph osd tree".
* add a test for 'osdmaptool --tree=<format> filepath'

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-28 01:39:35 -07:00
Kefu Chai
acdfd98787 doc: fix typo in placement-groups.rst
s/osd pool set/osd pool create/ in the command line example.

Fixes: #11503
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-28 15:44:09 +08:00
Kefu Chai
9c8f8d2751 doc: fix a wrong quote in release.rst
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-28 15:44:09 +08:00
Sage Weil
b2ccd9e365 Merge pull request #4728 from branch-predictor/wip-radosbench-nomemcmp
tools: add --no-verify option to rados bench

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-27 15:29:05 -07:00
Sage Weil
91d8251569 Merge pull request #4547 from yuyuyu101/wip-perf
Perf: used to perf local hardware capacity

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-27 15:26:13 -07:00
Sage Weil
c6f62f518f Merge remote-tracking branch 'gh/next' 2015-05-27 17:25:28 -04:00
Samuel Just
90eb7768f9 ReplicatedPG::trim_object: write filtered snapset while we're at it
If we trimmed an object, we might as well remove the obsolete snaps
as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-27 11:31:50 -07:00
Samuel Just
6051e255ac ReplicatedPG: start_flush: use filtered snapset
Otherwise, we might send our deletes based on deleted snaps.  This is
problematic since we may have trimmed the clones to which those snaps
belong, causing us to send them at an earlier snap than we used before.

The specific situation was

78:[78, 70, 63, 5a, 58, 57]:[64(63), 58(58, 57)]

with 58 already clean.  To flush 64, we send:

delete@58
delete@59
copyfrom@62

Then, snap 63 is trimmed leaving us with a snapset of:

78:[78, 70, 63, 5a, 58, 57]:[58(58, 57)]

since trim_object doesn't filter the head object snapset snaps.  This
isn't really a bug since in general all snapset users must be aware
that there may be trimmed snaps in snapset::snaps.  However, here
it becomes a problem when we go to flush head:

delete@58 -- ignored due to snapc
delete@59 -- ignored due to snapc
copyfrom@78 -- not ignored

The base pool head is at snap seq 62, so it clones that value into
clone 78(78, 70) instead of forgetting it.  What should have happened
is that we should have based our flushes on filtered snapset:

78:[78, 70, 58, 57]:[58(58, 57)]

Causing us to instead send:

delete@58 -- ignored due to snapc
delete@69 -- not ignored, causes no clone to be made
copyfrom@78 -- not ignored, updates head such that a subsequent clone
will leave 70 out of the clone snaps vector.

Fixes: 11787
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-27 11:30:27 -07:00
Sage Weil
9ff69f6498 Merge pull request #4750 from vuhuong/wip-xio
xio: several bug fixes
2015-05-27 08:48:22 -07:00
Kefu Chai
f6c61dfc8a Merge pull request #4782 from dachary/wip-doc-ceph-helpers
tests: document ceph helpers

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-27 23:40:50 +08:00
John Spray
1eff4bc934 Merge pull request #4700 from ceph/wip-crush-ruleset-name
Validate default replicated ruleset config value

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-27 17:14:14 +02:00
Haomai Wang
9e75d3b3dd Merge pull request #4759 from yuyuyu101/wip-kvstore-misc
Wip kvstore misc

Reviewed-by: Varada Raja Kumar Kari <kariraja@yahoo.com>
2015-05-27 22:56:04 +08:00