Commit Graph

42082 Commits

Author SHA1 Message Date
Yan, Zheng
ae0863888d client: exclude setfilelock requests when calculating oldest tid
setfilelock requests can block for a long time, which can prevent
client from advancing its oldest tid.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-05-29 09:45:03 +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
Owen Synge
a319976700 Forward port suse build deps and recomends
SUSE spec file got very out of sync with upstream master. This patch
helps resolve the build dependencies from suse ceph.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-05-28 11:01:21 +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
Loic Dachary
933df0369c tests: fix the main() documentation of ceph-helpers.sh
It was incorrectly documented as calling the setup function. It was
also vague on how the environment was reset.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-27 16:54:25 +02:00
Loic Dachary
a8e4b4fdad tests: remove unused CEPH_HELPER_VERBOSE in ceph-helpers.sh
And undocumented. It may be useful for debugging but it would have to be
properly implemented instead of being half commented out.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-27 16:16:19 +02:00
Ilya Dryomov
eb9dbef2fe doc: fix crush-ruleset-name param description
Specified crush-ruleset-name is required to exist, implicit creation is
going to happen only if crush-ruleset-name wasn't specified on the
command line.  While at it, pool-name is very much a required param.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-27 15:06:37 +03:00
Ilya Dryomov
c00e3933cf OSDMonitor: fix prepare_pool_crush_ruleset() retval
CrushWrapper::get_osd_pool_default_crush_replicated_ruleset() returns
-1 on error.  Returning -EPERM for "No suitable CRUSH ruleset exists"
is wrong.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-27 15:06:37 +03:00
Ilya Dryomov
29f11c7b67 CrushWrapper: validate default replicated ruleset config opt
Validate osd_pool_default_crush_{replicated_ruleset,rule} config
options, in particular when creating pools.  Otherwise "ceph osd pool
create foo <pg_num>" may end up creating pools with non-existent
rulesets.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-27 15:05:10 +03:00
Ilya Dryomov
f032c4098e OSDMap: respect default replicated ruleset config opt in build_simple()
Use id provided by osd_pool_default_crush_{replicated_ruleset,rule}
config options when creating a simple replicated ruleset for an initial
osdmap instead of always making it ruleset 0.  Not doing so may leave
default created pools (currently "rbd") in a broken state with their
crush_ruleset pointing to a non-existent ruleset.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-27 15:05:10 +03:00
Ilya Dryomov
ea4f9421ab tests: a couple tweaks to osd-pool-create.sh
In TEST_default_deprectated_*(), make expected/unexpected vars local
and actually check that rbd, being a default created pool, is set to
use the ruleset specified by conf.

INVALIDRULESET thing in TEST_replicated_pool() is redundant - it is
checked in TEST_replicated_pool_with_ruleset() a bit earlier.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-27 15:05:10 +03:00
Loic Dachary
770bd756b1 Merge pull request #4777 from SUSE/wip-git_ignore_systemd_autotools_template_systemd_ceph_osd
.gitignore: systemd/ceph-osd@.service

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-27 13:21:23 +02:00
Haomai Wang
81faac75b5 debian/copyright: update copyright for test/perf*
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-27 19:03:30 +08:00
Loic Dachary
93653f5983 Merge pull request #4779 from theanalyst/scripts/ceph-release-notes
scripts: Add a helper to make release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-27 11:54:08 +02:00
Abhishek Lekshmanan
cc92872b6f scripts: Add a helper to make release notes
First cut for a `ceph-release-notes` script added which looks at merge
commits and picks out issue numbers. Though this ideally suits for
backport releases workflow where the commit messages always follow a
specific pattern, it is partly useful for preparing release notes for
normal releases as well.

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-05-27 15:12:58 +05:30
Owen Synge
2879b0cd64 .gitignore: systemd/ceph-osd@.service
systemd/ceph-osd@.service is now auto-generated by autotools.

This means the file should be added to gitignored list.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-05-27 10:25:03 +02:00
Haomai Wang
f814298008 packaging: include ceph_perf_local
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-27 12:51:50 +08:00
Haomai Wang
61d70db320 ceph_perf_local: rename from ceph_perf
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-27 12:51:36 +08:00
Jason Dillaman
178484b8c3 librbd: re-add missing discard perf counters
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-05-27 00:41:42 -04:00
Loic Dachary
9721d422fa Merge pull request #4708 from dachary/wip-erasure-code-profile
erasure-code: fix error reporting

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
2015-05-27 01:17:30 +02:00
Sage Weil
5a216b1470 Merge pull request #4768 from SUSE/wip-systemd_autotools_template_systemd_ceph_osd
Template systemd/ceph-osd@.service with autotools,

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-26 15:37:20 -07:00
Samuel Just
ff79959c03 osd_types::is_new_interval: size change triggers new interval
Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-26 12:58:07 -07:00
Loic Dachary
e2f392efdb Merge pull request #4761 from dachary/wip-doc-workflow
doc: update the development workflow

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-26 21:07:05 +02:00
Loic Dachary
101287d8ac Merge pull request #4772 from theanalyst/doc/release/v0.94.2-updates
doc: updates to v0.94.2 draft release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-26 20:50:24 +02:00