Commit Graph

41919 Commits

Author SHA1 Message Date
David Zafman
d7858c6645 test/ceph-objectstore-tool: Don't need stderr noise
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 17:41:18 -07:00
David Zafman
23551deea6 test/ceph-objectstore-tool: Show command that should have failed
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 17:41:18 -07:00
David Zafman
ce76f88777 test/ceph_objectstore_tool: Improve dump-journal testing
Fix false failure when journal has no entries
Test dump-journal on all osds in 2 places

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 17:41:13 -07:00
David Zafman
90202a70f8 ceph-objectstore-tool: Allow --pgid specified on import (for post split)
Revamp split import testing to use --pgid option post split

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 17:41:11 -07:00
David Zafman
51e27984ec ceph-objectstore-tool: Invalidate pg stats when objects were skipped during pg import
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 13:19:00 -07:00
David Zafman
70316541bb ceph-objectstore-tool, osd: Fix import handling
Use same_interval_since set to zero to communicate that an import has happened
and the correct value needs to be computed.

Fixes: #10794

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 13:19:00 -07:00
David Zafman
99d7663f87 ceph-objectstore-tool: Add dump-super to show OSDSuperblock in format specified
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 13:19:00 -07:00
David Zafman
f1520061bb mds, include: Fix dump() numeric char array to include additional alpha chars
Caused by: c87f55b5a8

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 13:19:00 -07:00
David Zafman
bd2f62445b ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage
Additional comment describes --pgid requirement checking

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-01 13:19:00 -07:00
Ken Dreyer
a1de1fc20e Merge pull request #4729 from SUSE/wip_suse_builddeps_and_deps
ceph.spec.in: Forward port suse build deps and recomends
2015-06-01 10:12:00 -06:00
Kefu Chai
e5222b7ff0 Merge pull request #4822 from SUSE/wip_rpm_summary_ended_with_dot
ceph.spec.in summary-ended-with-dot

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-01 22:28:23 +08:00
Owen Synge
042e8ff4dc ceph.spec.in summary-ended-with-dot
RPM spec files summary should not end with a dot.
This was inconsistent across the ceph rpm packages
and creates errors with rpm lint.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-06-01 15:57:03 +02:00
Loic Dachary
8b7a6fdeaa Merge pull request #4710 from dachary/wip-9589-default-erasure-code-profile
erasure-code: query plugin for erasure-code-profile defaults

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
2015-06-01 15:00:04 +02:00
Kefu Chai
0f024602bd Merge pull request #4820 from ceph/wip-fix-ceph-perf-local
tools: fix ceph perf local build on i386

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-06-01 15:33:15 +08:00
Kefu Chai
06e6c15217 test/perf_local: disable tests if not supported
* pass appropriate "-m<machine>" args to compiler

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-06-01 14:58:57 +08:00
Kefu Chai
63343cef77 .gitignore: ignore /perf_perf_local
Fixes: #11827
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-06-01 14:58:52 +08:00
Sage Weil
c8705e5ae5 Merge remote-tracking branch 'gh/next' 2015-05-31 12:43:33 -04:00
Sage Weil
f5a95804af unittest_ceph_argparse: test float parsing
Signed-off-by: Sage Weil <sage@redhat.com>
2015-05-31 12:43:01 -04:00
Rajesh Nambiar
4487d13cc6 Allow float value by allowing . in input value
Dont bail out if the input value happens to be .

Fixes: #11620
Signed-off-by: Rajesh Nambiar <rajesh.n@msystechnologies.com>
Tested-by: Sage Weil <sage@redhat.com>
2015-05-31 12:38:03 -04:00
Loic Dachary
a199ff9d59 erasure-code: ErasureCodeShec update default values to string
Update the ErasureCodeShec::init function to use string default
values. The default profile values for technique, ruleset-root and
ruleset-failure-domain are set for the user to see.

The error message when an invalid technique is provided is written to
the error stream to be returned to the user instead of being written to
the OSD log.

Updating other values from the profile would require deeper changes and
is left for later.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Loic Dachary
395eba9b38 erasure-code: ErasureCodeLrc update default values to string
Update the ErasureCodeLrc::init function to use string default values
and update the profile accordingly.

If the k,m,l values are set and generate mappings and layers entries,
those are not stored in the profile. The details of what k,m,l create
are private and not exposed to the caller.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Loic Dachary
17ecd6f942 erasure-code: return ErasureCodeLrc::parse_kml error
Instead of always returning 0

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Loic Dachary
14a59e5a2c erasure-code: ErasureCodeJerasure update default values to string
Update the ErasureCodeJerasure::init function to use string default values
and update the profile accordingly.

The ErasureCodeJerasure::revert_to_default prototype is modified so it
can update the profile.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Loic Dachary
6eaeb56718 erasure-code: ErasureCodeIsa update default values to string
Update the ErasureCodeIsa::init function to use string default values
and update the profile accordingly.

Also fix a bug by which the plugin would incorrectly report using the
default technique when the reed_sol_van or cauchy techniques are the
only legitimate values.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Loic Dachary
4b3ba2abc4 erasure-code: ErasureCode default value is a string
The to_int, to_bool prototypes are modified and the default values are
changed to string instead of int. If a default value is set, the profile
is modified to contain the default value.

The to_string helper is added so it can be used to set the default value
of a string, in a way that is consistent with to_int and to_bool.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-31 00:01:34 +02:00
Yehuda Sadeh
5652518cf8 Merge pull request #4810 from zaitcev/context_io_init_undup
rgw: Drop a redundant context_io.init

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-30 20:25:45 +03:00
Pete Zaitcev
55b9e4e29b rgw: Drop a redundant context_io.init
Interestingly enough, the function is not even entirely idempotent:
it prints debugging output, duplicated.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
2015-05-30 11:19:25 -06:00
Loic Dachary
a6479e4efe Merge pull request #4812 from yuyuyu101/fix-perf-incompatible
PerfLocal: Doesnt' compile div64 for non-64 bits arch

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-30 16:17:46 +02:00
Haomai Wang
6fcf162dea PerfLocal: Doesnt' compile div64 for non-64 bits arch
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-30 21:13:12 +08: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