]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoqa: fix multiple_rsync.sh to avoid using /usr/ directly 4831/head
John Spray [Tue, 2 Jun 2015 17:53:14 +0000 (18:53 +0100)]
qa: fix multiple_rsync.sh to avoid using /usr/ directly

While we're at it, take only /usr/lib instead of all of /usr
to keep the overall file count more modest.

Fixes: #11807
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4701 from jdurgin/wip-nova-rbd-cache
Jason Dillaman [Tue, 2 Jun 2015 15:34:45 +0000 (11:34 -0400)]
Merge pull request #4701 from jdurgin/wip-nova-rbd-cache

doc: add rbd cache settings to nova.conf

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4643 from tchaikov/wip-fix-11569
Kefu Chai [Tue, 2 Jun 2015 12:43:26 +0000 (20:43 +0800)]
Merge pull request #4643 from tchaikov/wip-fix-11569

fix "pg ls" with states of "recovering" and/or "repair"

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4760 from ketor/fix_mutex_memory_leak
Kefu Chai [Tue, 2 Jun 2015 12:37:10 +0000 (20:37 +0800)]
Merge pull request #4760 from ketor/fix_mutex_memory_leak

Mutex: fix memory leak in lockdep _register

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4802 from isserrano/master
Loic Dachary [Tue, 2 Jun 2015 12:36:35 +0000 (14:36 +0200)]
Merge pull request #4802 from isserrano/master

doc: Fixed example sintax in Absolute Sizing

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: s/osd pool hot-storage/osd pool set hot-storage/ 4802/head
Ismael [Fri, 29 May 2015 15:31:20 +0000 (16:31 +0100)]
doc: s/osd pool hot-storage/osd pool set hot-storage/

Signed-off-by: Ismael Serrano <ismael.serrano@gmail.com>
10 years agoMerge pull request #4729 from SUSE/wip_suse_builddeps_and_deps
Ken Dreyer [Mon, 1 Jun 2015 16:12:00 +0000 (10:12 -0600)]
Merge pull request #4729 from SUSE/wip_suse_builddeps_and_deps

ceph.spec.in: Forward port suse build deps and recomends

10 years agoMerge pull request #4822 from SUSE/wip_rpm_summary_ended_with_dot
Kefu Chai [Mon, 1 Jun 2015 14:28:23 +0000 (22:28 +0800)]
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>
10 years agoceph.spec.in summary-ended-with-dot 4822/head
Owen Synge [Mon, 1 Jun 2015 13:57:03 +0000 (15:57 +0200)]
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>
10 years agoMerge pull request #4710 from dachary/wip-9589-default-erasure-code-profile
Loic Dachary [Mon, 1 Jun 2015 13:00:04 +0000 (15:00 +0200)]
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>
10 years agoMerge pull request #4820 from ceph/wip-fix-ceph-perf-local
Kefu Chai [Mon, 1 Jun 2015 07:33:15 +0000 (15:33 +0800)]
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>
10 years agotest/perf_local: disable tests if not supported 4820/head
Kefu Chai [Mon, 1 Jun 2015 03:16:01 +0000 (11:16 +0800)]
test/perf_local: disable tests if not supported

* pass appropriate "-m<machine>" args to compiler

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years ago.gitignore: ignore /perf_perf_local
Kefu Chai [Mon, 1 Jun 2015 02:36:01 +0000 (10:36 +0800)]
.gitignore: ignore /perf_perf_local

Fixes: #11827
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Sun, 31 May 2015 16:43:33 +0000 (12:43 -0400)]
Merge remote-tracking branch 'gh/next'

10 years agounittest_ceph_argparse: test float parsing
Sage Weil [Sun, 31 May 2015 16:42:52 +0000 (12:42 -0400)]
unittest_ceph_argparse: test float parsing

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoAllow float value by allowing . in input value
Rajesh Nambiar [Sun, 31 May 2015 14:36:08 +0000 (14:36 +0000)]
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>
10 years agoerasure-code: ErasureCodeShec update default values to string 4710/head
Loic Dachary [Sun, 17 May 2015 16:09:21 +0000 (18:09 +0200)]
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>
10 years agoerasure-code: ErasureCodeLrc update default values to string
Loic Dachary [Sun, 17 May 2015 16:08:31 +0000 (18:08 +0200)]
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>
10 years agoerasure-code: return ErasureCodeLrc::parse_kml error
Loic Dachary [Sun, 17 May 2015 16:07:33 +0000 (18:07 +0200)]
erasure-code: return ErasureCodeLrc::parse_kml error

Instead of always returning 0

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: ErasureCodeJerasure update default values to string
Loic Dachary [Sun, 17 May 2015 16:04:56 +0000 (18:04 +0200)]
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>
10 years agoerasure-code: ErasureCodeIsa update default values to string
Loic Dachary [Sun, 17 May 2015 15:58:36 +0000 (17:58 +0200)]
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>
10 years agoerasure-code: ErasureCode default value is a string
Loic Dachary [Sun, 17 May 2015 15:53:55 +0000 (17:53 +0200)]
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>
10 years agoMerge pull request #4810 from zaitcev/context_io_init_undup
Yehuda Sadeh [Sat, 30 May 2015 17:25:45 +0000 (20:25 +0300)]
Merge pull request #4810 from zaitcev/context_io_init_undup

rgw: Drop a redundant context_io.init

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: Drop a redundant context_io.init 4810/head
Pete Zaitcev [Fri, 29 May 2015 23:55:59 +0000 (17:55 -0600)]
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>
10 years agoMerge pull request #4812 from yuyuyu101/fix-perf-incompatible
Loic Dachary [Sat, 30 May 2015 14:17:46 +0000 (16:17 +0200)]
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>
10 years agoPerfLocal: Doesnt' compile div64 for non-64 bits arch 4812/head
Haomai Wang [Sat, 30 May 2015 13:10:12 +0000 (21:10 +0800)]
PerfLocal: Doesnt' compile div64 for non-64 bits arch

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4797 from dachary/wip-11665-erasure-code-lrc
Loic Dachary [Sat, 30 May 2015 10:19:59 +0000 (12:19 +0200)]
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>
10 years agoMerge pull request #4799 from dachary/wip-install-deps
Kefu Chai [Sat, 30 May 2015 09:47:36 +0000 (17:47 +0800)]
Merge pull request #4799 from dachary/wip-install-deps

install-deps.sh: robust pip and wheel installation

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoinstall-deps.sh: do not store pip cache outside of the tree 4799/head
Loic Dachary [Sat, 30 May 2015 08:53:51 +0000 (10:53 +0200)]
install-deps.sh: do not store pip cache outside of the tree

Signed-off-by: Loic Dachary <ldachary@redhat.org>
10 years agoMerge pull request #4727 from tchaikov/wip-osdmaptool-dump-tree-with-format
Sage Weil [Sat, 30 May 2015 00:43:54 +0000 (17:43 -0700)]
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>
10 years agoinstall-deps.sh: keep debian alternatives
Loic Dachary [Fri, 29 May 2015 21:55:01 +0000 (23:55 +0200)]
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>
10 years agoinstall-deps.sh: robust pip and wheel installation
Loic Dachary [Thu, 28 May 2015 23:34:45 +0000 (01:34 +0200)]
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>
10 years agoMerge pull request #4805 from athanatos/wip-11787
Sage Weil [Fri, 29 May 2015 21:21:52 +0000 (14:21 -0700)]
Merge pull request #4805 from athanatos/wip-11787

Wip 11787

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'
Samuel Just [Fri, 29 May 2015 21:20:29 +0000 (14:20 -0700)]
Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4526 from athanatos/wip-11296
Sage Weil [Fri, 29 May 2015 21:19:44 +0000 (14:19 -0700)]
Merge pull request #4526 from athanatos/wip-11296

Wip 11296

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'upstream/wip-11493'
Samuel Just [Fri, 29 May 2015 21:17:42 +0000 (14:17 -0700)]
Merge remote-tracking branch 'upstream/wip-11493'

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4803 from athanatos/wip-11677
Sage Weil [Fri, 29 May 2015 21:11:12 +0000 (14:11 -0700)]
Merge pull request #4803 from athanatos/wip-11677

Wip 11677 -- fixes for rw rados ops with snaps

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked 4803/head
Samuel Just [Wed, 20 May 2015 23:10:02 +0000 (16:10 -0700)]
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>
10 years agoReplicatedPG::finish_ctx: take excl lock if operation is rw
Samuel Just [Tue, 19 May 2015 17:56:11 +0000 (10:56 -0700)]
ReplicatedPG::finish_ctx: take excl lock if operation is rw

Fixes: #11677
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4804 from athanatos/wip-11771
Sage Weil [Fri, 29 May 2015 21:03:36 +0000 (14:03 -0700)]
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>
10 years agoMerge pull request #4070 from ceph/wip-chain-xattr
Samuel Just [Fri, 29 May 2015 17:57:29 +0000 (10:57 -0700)]
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>
10 years agoMerge pull request #4059 from majianpeng/copyget-digest
Samuel Just [Fri, 29 May 2015 17:41:12 +0000 (10:41 -0700)]
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>
10 years agoMerge pull request #3253 from majianpeng/bug-fix
Samuel Just [Fri, 29 May 2015 17:31:21 +0000 (10:31 -0700)]
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>
10 years agoMerge pull request #4800 from hjwsm1989/journaler
John Spray [Fri, 29 May 2015 10:39:12 +0000 (12:39 +0200)]
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>
10 years agoMerge pull request #4794 from XinzeChi/wip-kill-sleep
Loic Dachary [Fri, 29 May 2015 08:56:54 +0000 (10:56 +0200)]
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>
10 years ago osdc/Journaler.h: fix ceph_file_layout dump error in journaler::dump(). 4800/head
huangjun [Fri, 29 May 2015 08:11:11 +0000 (16:11 +0800)]
  osdc/Journaler.h: fix ceph_file_layout dump error in journaler::dump().
Signed-off-by: huangjun <hjwsm1989@gmail.com>
10 years agocommit: test: check daemon is alive or not agagin when sleep 60s 4794/head
Xinze Chi [Fri, 29 May 2015 01:33:01 +0000 (09:33 +0800)]
commit: test: check daemon is alive or not agagin when sleep 60s

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agotests: add lrc tests to osd-scrub-repair.sh 4797/head
Loic Dachary [Thu, 28 May 2015 20:46:06 +0000 (22:46 +0200)]
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>
10 years agotests: split osd-scrub-repair.sh erasure code test
Loic Dachary [Thu, 28 May 2015 20:44:17 +0000 (22:44 +0200)]
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>
10 years agotests: cosmetic move of functions in osd-scrub-repair.sh
Loic Dachary [Thu, 28 May 2015 20:38:08 +0000 (22:38 +0200)]
tests: cosmetic move of functions in osd-scrub-repair.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: s/unreocvery/unfound/
Loic Dachary [Thu, 28 May 2015 20:35:08 +0000 (22:35 +0200)]
erasure-code: s/unreocvery/unfound/

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4796 from SUSE/wip-release-notes-fixup
Yehuda Sadeh [Thu, 28 May 2015 18:02:14 +0000 (21:02 +0300)]
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>
10 years agodoc: release-notes.rst: fix typo and delete superfluous sentence 4796/head
Nathan Cutler [Thu, 28 May 2015 17:29:58 +0000 (19:29 +0200)]
doc: release-notes.rst: fix typo and delete superfluous sentence

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #4786 from dachary/wip-11546-debian-packages
Ken Dreyer [Thu, 28 May 2015 17:09:00 +0000 (11:09 -0600)]
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>
10 years agodebian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg 4786/head
Loic Dachary [Thu, 28 May 2015 08:35:51 +0000 (10:35 +0200)]
debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg

When ceph-objectstore-tool was moved from ceph-test to
ceph by 61cf5da0b51e2d9578c7b4bca85184317e30f4ca, 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
8f23382064c189b657564d58c3f9d17720e891ed, 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
f898ec1e4e3472b0202280f09653a769fc62c8d3 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>
10 years agoMerge pull request #4787 from yuyuyu101/fix-perf-i386
Loic Dachary [Thu, 28 May 2015 13:31:22 +0000 (15:31 +0200)]
Merge pull request #4787 from yuyuyu101/fix-perf-i386

PerfLocal: fix i386 compatible with perf_local

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4309 from prallabh/master
Yehuda Sadeh [Thu, 28 May 2015 11:41:41 +0000 (04:41 -0700)]
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>
10 years agoMerge pull request #4789 from yehudasa/wip-11442-notes
Loic Dachary [Thu, 28 May 2015 10:28:18 +0000 (12:28 +0200)]
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>
10 years agorgw: update release notes with regard to issue #11442 recovery 4789/head
Yehuda Sadeh [Thu, 28 May 2015 10:02:59 +0000 (03:02 -0700)]
rgw: update release notes with regard to issue #11442 recovery

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoPerfLocal: fix i386 compatible with perf_local 4787/head
Haomai Wang [Thu, 28 May 2015 09:25:30 +0000 (17:25 +0800)]
PerfLocal: fix i386 compatible with perf_local

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4785 from tchaikov/wip-doc-fixes
Loic Dachary [Thu, 28 May 2015 09:01:51 +0000 (11:01 +0200)]
Merge pull request #4785 from tchaikov/wip-doc-fixes

doc: typo fixes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoForward port suse build deps and recomends 4729/head
Owen Synge [Wed, 20 May 2015 12:39:54 +0000 (14:39 +0200)]
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>
10 years agoosdmap, mon: switch the params of print_tree() 4727/head
Kefu Chai [Wed, 20 May 2015 06:24:48 +0000 (14:24 +0800)]
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>
10 years agoosdmaptool: dump 'osd tree' in specified format
Kefu Chai [Wed, 20 May 2015 06:16:14 +0000 (14:16 +0800)]
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>
10 years agodoc: fix typo in placement-groups.rst 4785/head
Kefu Chai [Mon, 25 May 2015 15:16:45 +0000 (23:16 +0800)]
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>
10 years agodoc: fix a wrong quote in release.rst
Kefu Chai [Thu, 14 May 2015 13:15:24 +0000 (21:15 +0800)]
doc: fix a wrong quote in release.rst

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4728 from branch-predictor/wip-radosbench-nomemcmp
Sage Weil [Wed, 27 May 2015 22:29:05 +0000 (15:29 -0700)]
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>
10 years agoMerge pull request #4547 from yuyuyu101/wip-perf
Sage Weil [Wed, 27 May 2015 22:26:13 +0000 (15:26 -0700)]
Merge pull request #4547 from yuyuyu101/wip-perf

Perf: used to perf local hardware capacity

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)]
Merge remote-tracking branch 'gh/next'

10 years agoReplicatedPG::trim_object: write filtered snapset while we're at it 4805/head
Samuel Just [Wed, 27 May 2015 18:14:15 +0000 (11:14 -0700)]
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>
10 years agoReplicatedPG: start_flush: use filtered snapset
Samuel Just [Wed, 27 May 2015 18:00:54 +0000 (11:00 -0700)]
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>
10 years agoMerge pull request #4750 from vuhuong/wip-xio
Sage Weil [Wed, 27 May 2015 15:48:22 +0000 (08:48 -0700)]
Merge pull request #4750 from vuhuong/wip-xio

xio: several bug fixes

10 years agoMerge pull request #4782 from dachary/wip-doc-ceph-helpers
Kefu Chai [Wed, 27 May 2015 15:40:50 +0000 (23:40 +0800)]
Merge pull request #4782 from dachary/wip-doc-ceph-helpers

tests: document ceph helpers

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4700 from ceph/wip-crush-ruleset-name
John Spray [Wed, 27 May 2015 15:14:14 +0000 (17:14 +0200)]
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>
10 years agoMerge pull request #4759 from yuyuyu101/wip-kvstore-misc
Haomai Wang [Wed, 27 May 2015 14:56:04 +0000 (22:56 +0800)]
Merge pull request #4759 from yuyuyu101/wip-kvstore-misc

Wip kvstore misc

Reviewed-by: Varada Raja Kumar Kari <kariraja@yahoo.com>
10 years agotests: fix the main() documentation of ceph-helpers.sh 4782/head
Loic Dachary [Wed, 27 May 2015 14:16:34 +0000 (16:16 +0200)]
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>
10 years agotests: remove unused CEPH_HELPER_VERBOSE in ceph-helpers.sh
Loic Dachary [Wed, 27 May 2015 14:14:42 +0000 (16:14 +0200)]
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>
10 years agodoc: fix crush-ruleset-name param description 4700/head
Ilya Dryomov [Fri, 15 May 2015 18:44:27 +0000 (21:44 +0300)]
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>
10 years agoOSDMonitor: fix prepare_pool_crush_ruleset() retval
Ilya Dryomov [Sat, 16 May 2015 10:19:22 +0000 (13:19 +0300)]
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>
10 years agoCrushWrapper: validate default replicated ruleset config opt
Ilya Dryomov [Fri, 15 May 2015 18:44:27 +0000 (21:44 +0300)]
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>
10 years agoOSDMap: respect default replicated ruleset config opt in build_simple()
Ilya Dryomov [Thu, 21 May 2015 15:52:52 +0000 (18:52 +0300)]
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>
10 years agotests: a couple tweaks to osd-pool-create.sh
Ilya Dryomov [Fri, 22 May 2015 12:50:07 +0000 (15:50 +0300)]
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>
10 years agoMerge pull request #4777 from SUSE/wip-git_ignore_systemd_autotools_template_systemd_...
Loic Dachary [Wed, 27 May 2015 11:21:23 +0000 (13:21 +0200)]
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>
10 years agodebian/copyright: update copyright for test/perf* 4547/head
Haomai Wang [Wed, 27 May 2015 05:25:50 +0000 (13:25 +0800)]
debian/copyright: update copyright for test/perf*

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4779 from theanalyst/scripts/ceph-release-notes
Loic Dachary [Wed, 27 May 2015 09:54:08 +0000 (11:54 +0200)]
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>
10 years agoscripts: Add a helper to make release notes 4779/head
Abhishek Lekshmanan [Wed, 27 May 2015 09:42:58 +0000 (15:12 +0530)]
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>
10 years ago.gitignore: systemd/ceph-osd@.service 4777/head
Owen Synge [Wed, 27 May 2015 08:25:03 +0000 (10:25 +0200)]
.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>
10 years agopackaging: include ceph_perf_local
Haomai Wang [Wed, 27 May 2015 04:51:50 +0000 (12:51 +0800)]
packaging: include ceph_perf_local

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoceph_perf_local: rename from ceph_perf
Haomai Wang [Wed, 6 May 2015 11:52:35 +0000 (19:52 +0800)]
ceph_perf_local: rename from ceph_perf

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4708 from dachary/wip-erasure-code-profile
Loic Dachary [Tue, 26 May 2015 23:17:30 +0000 (01:17 +0200)]
Merge pull request #4708 from dachary/wip-erasure-code-profile

erasure-code: fix error reporting

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
10 years agoMerge pull request #4768 from SUSE/wip-systemd_autotools_template_systemd_ceph_osd
Sage Weil [Tue, 26 May 2015 22:37:20 +0000 (15:37 -0700)]
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>
10 years agoosd_types::is_new_interval: size change triggers new interval 4804/head
Samuel Just [Tue, 26 May 2015 19:35:11 +0000 (12:35 -0700)]
osd_types::is_new_interval: size change triggers new interval

Fixes: 11771
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4761 from dachary/wip-doc-workflow
Loic Dachary [Tue, 26 May 2015 19:07:05 +0000 (21:07 +0200)]
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>
10 years agoMerge pull request #4772 from theanalyst/doc/release/v0.94.2-updates
Loic Dachary [Tue, 26 May 2015 18:50:24 +0000 (20:50 +0200)]
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>
10 years agoMerge pull request #4318 from ceph/wip-11056
Josh Durgin [Tue, 26 May 2015 18:43:29 +0000 (11:43 -0700)]
Merge pull request #4318 from ceph/wip-11056

librbd: avoid blocking AIO API methods

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoPendingReleaseNotes: document changes to librbd's aio_read methods 4318/head
Jason Dillaman [Fri, 10 Apr 2015 00:34:28 +0000 (20:34 -0400)]
PendingReleaseNotes: document changes to librbd's aio_read methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: update librbd AIO tests to remove result code
Jason Dillaman [Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)]
tests: update librbd AIO tests to remove result code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AioRequest::send no longer returns a result
Jason Dillaman [Thu, 9 Apr 2015 17:33:09 +0000 (13:33 -0400)]
librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: internal AIO methods no longer return result
Jason Dillaman [Thu, 9 Apr 2015 01:37:50 +0000 (21:37 -0400)]
librbd: internal AIO methods no longer return result

All failures should be returned via the AioCompletion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoThrottle: added pending_error method to SimpleThrottle
Jason Dillaman [Thu, 9 Apr 2015 01:48:21 +0000 (21:48 -0400)]
Throttle: added pending_error method to SimpleThrottle

Allow the client of SimpleThrottle to detect an async error
so that it can exit early.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>