]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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 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>
10 years agolibrbd: add new fail method to AioCompletion
Jason Dillaman [Thu, 9 Apr 2015 00:18:50 +0000 (20:18 -0400)]
librbd: add new fail method to AioCompletion

Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: avoid blocking AIO API methods
Jason Dillaman [Wed, 8 Apr 2015 23:06:52 +0000 (19:06 -0400)]
librbd: avoid blocking AIO API methods

Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.

Fixes: #11056
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add task pool / work queue for requests / callbacks
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add task pool / work queue for requests / callbacks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoWorkQueue: added virtual destructor
Jason Dillaman [Mon, 11 May 2015 21:05:49 +0000 (17:05 -0400)]
WorkQueue: added virtual destructor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoWorkQueue: add new ContextWQ work queue
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: add new ContextWQ work queue

The queue holds a collection of Context pointers that will
be completed by the thread pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agodoc: updates to v0.94.2 draft release notes 4772/head
Abhishek Lekshmanan [Tue, 26 May 2015 18:23:50 +0000 (23:53 +0530)]
doc: updates to v0.94.2 draft release notes

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agodoc: update the development workflow 4761/head
Loic Dachary [Tue, 26 May 2015 10:53:46 +0000 (12:53 +0200)]
doc: update the development workflow

* use HOWTO_monitor_the_automated_tests_AKA_nightlies to explain the nightlies
* replace references to Serverity with Backport tracker
* add links to the backporter manual and the release page
* s/0.95/9.0.0/
* unify release names to be lowercase
* replace lifecycle with release cycle and end of life with retirement
* Prefer LTS or Long Term Stable over Long Term Support

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4756 from ceph/wip-mount-timeout-doc
Josh Durgin [Tue, 26 May 2015 17:07:11 +0000 (10:07 -0700)]
Merge pull request #4756 from ceph/wip-mount-timeout-doc

rbd: document mount_timeout in the man page

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoTemplate systemd/ceph-osd@.service with autotools, 4768/head
Owen Synge [Tue, 26 May 2015 17:02:36 +0000 (19:02 +0200)]
Template systemd/ceph-osd@.service with autotools,

The libexec path is different for different distributions.
systemd. This path is defined by a new variable on the
configure path.

This variable can be set with enviroment SYSTEMD_LIBEXEC_DIR.
The parameter --with-systemd-libexec-dir overrides the enviroment
variable.

Appropriate conditionals are set for SUSE and RHEL derivatives.

This is then used to template out systemd/ceph-osd@.service

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4746 from ceph/wip-blacklist-json
Loic Dachary [Tue, 26 May 2015 11:14:14 +0000 (13:14 +0200)]
Merge pull request #4746 from ceph/wip-blacklist-json

osd: fix blacklist field in OSDMap::dump

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoqa/cephtool: add blacklist json output check 4746/head
John Spray [Fri, 22 May 2015 13:08:04 +0000 (14:08 +0100)]
qa/cephtool: add blacklist json output check

...not very elegantly because this is bash, but
at least check the expected value is somewhere
present in the JSON output.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoosd: fix blacklist field in OSDMap::dump
John Spray [Fri, 22 May 2015 09:48:32 +0000 (10:48 +0100)]
osd: fix blacklist field in OSDMap::dump

This was using an array_section so we were getting
a list of only the times, instead of an array
mapping addr to time.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoKeyValueStore: Add collect_metadata support 4759/head
Haomai Wang [Tue, 26 May 2015 04:40:19 +0000 (12:40 +0800)]
KeyValueStore: Add collect_metadata support

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore: Avoid extra lookup for map
Haomai Wang [Tue, 26 May 2015 04:34:08 +0000 (12:34 +0800)]
KeyValueStore: Avoid extra lookup for map

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4757 from xinxinsh/wip-kv-cleanup
Haomai Wang [Tue, 26 May 2015 03:57:10 +0000 (11:57 +0800)]
Merge pull request #4757 from xinxinsh/wip-kv-cleanup

os : remove GenericObjectMap::sync() function

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4755 from ceph/wip-11752
Yan, Zheng [Tue, 26 May 2015 01:18:05 +0000 (09:18 +0800)]
Merge pull request #4755 from ceph/wip-11752

mds: fix use-after-free in SessionMap::remove_session

10 years agoos : remove unused GenericObjectMap::sync() funtion since no caller invoke this function 4757/head
xinxin shu [Mon, 25 May 2015 00:15:00 +0000 (08:15 +0800)]
os : remove unused GenericObjectMap::sync() funtion since no caller invoke this function

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoerasure-code: implement consistent error stream 4708/head
Loic Dachary [Sun, 17 May 2015 13:28:52 +0000 (15:28 +0200)]
erasure-code: implement consistent error stream

The error stream in the erasure code path is broken and the error
message is sometime not reported back to the user. For instance the
ErasureCodePlugin::factory method has no error stream: when an error
happens the user is left with a cryptic error code that needs lookup in
the sources to figure it out.

The error stream is made more systematic by:

  * always pass it as ostream *ss (instead of something passing it as
    a reference and sometime as a stringstream)

  * ostream *ss is added to ErasureCodePlugin::factory

  * define the ErasureCodeInterface::init pure virtual. It is
    already implemented by all plugins, only in slightly different
    ways. The ostream *ss is added so the init function has a way to
    report error in a human readable way to the caller, in addition to
    the error code.

The ErasureCodePluginJerasure::init return value was incorrectly ignored
when called from ErasureCodePluginJerasure::factory and now returns when
it fails.

The ErasureCodeLrc::layers_init method is given ostream *ss for error
messages instead of printing them via derr.

The ErasureCodePluginLrc::factory method no longer prints errors via
derr: this workaround is made unnecessary by the ostream *ss argument.

The ErasureCodeShec::init ostream *ss argument is ignored. The
ErasureCodeShec::parse method entirely relies on derr to report errors
and converting it goes beyond the scope of this cleanup. There is a
slight risk of getting it wrong and it deserves a separate commit and
careful and independent review.

The PGBackend, OSDMonitor.{cc,h} changes are only about prototype
changes.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: do not leak shec instance on failure
Loic Dachary [Mon, 25 May 2015 13:36:30 +0000 (15:36 +0200)]
erasure-code: do not leak shec instance on failure

If the shec plugin fails to initialize the instance, it must be deleted
before returning to the caller, otherwise it will be leaked.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: lrc size test depends on layer semantic
Loic Dachary [Mon, 25 May 2015 13:44:53 +0000 (15:44 +0200)]
erasure-code: lrc size test depends on layer semantic

When the lrc layers are defined, the semantic of the D,c and _
characters are defined, the rest is undefined. The test that verifies
the guard against layers of different size uses the A character which
is undefined. Depending on the implementation, the size test could fail
because the A character is undefined and a guard to forbid undefined
characters is added. Replace A with D to make sure the undefined
character A will not interfere with the test.

This may seem nitpicking but it actually caused problems after a code
refactor that will appear in a few commits from here.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: define the ErasureCodeProfile type
Loic Dachary [Sat, 16 May 2015 22:46:38 +0000 (00:46 +0200)]
erasure-code: define the ErasureCodeProfile type

Instead of map<string,string>. Make it a non const when initializing
an ErasureCodeInterface instance so that it can be modified.

Rename parameters into profile for consistency with the user
documentation. The parameters name was chosen before the user interface
was defined. This cosmetic update is made in the context of larger
functional changes to improve error reporting and user interface
consistency.

The init() method are made to accept non const parameters.  It is
desirable for them to be able to modify the profile so that is
accurately reflects the values that are used. The caller may use this
information for better error reporting.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorbd: document mount_timeout in the man page 4756/head
Ilya Dryomov [Mon, 25 May 2015 11:22:34 +0000 (14:22 +0300)]
rbd: document mount_timeout in the man page

With "rbd: timeout watch teardown on unmap with mount_timeout" going
into kernel 4.2, document its effect in the man page.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4745 from jmunhoz/object-copy-bug
Yehuda Sadeh [Mon, 25 May 2015 07:05:11 +0000 (00:05 -0700)]
Merge pull request #4745 from jmunhoz/object-copy-bug

rgw: Use attrs from source bucket on copy

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agomds: fix use-after-free in SessionMap::remove_session 4755/head
Yan, Zheng [Mon, 25 May 2015 03:35:01 +0000 (11:35 +0800)]
mds: fix use-after-free in SessionMap::remove_session

Fixes: #11752
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4709 from dachary/wip-shec-corpus
Loic Dachary [Sat, 23 May 2015 08:54:12 +0000 (10:54 +0200)]
Merge pull request #4709 from dachary/wip-shec-corpus

erasure-code: update ceph-erasure-code-corpus for shec

10 years agoMerge pull request #4751 from islepnev/wip-11612
Loic Dachary [Sat, 23 May 2015 07:05:03 +0000 (09:05 +0200)]
Merge pull request #4751 from islepnev/wip-11612

Support NVMe device partitions by ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: support NVMe device partitions 4751/head
islepnev [Fri, 17 Apr 2015 19:33:01 +0000 (22:33 +0300)]
ceph-disk: support NVMe device partitions

Linux nvme kernel module v0.9 enumerate devices as following:

/dev/nvme0 - characted revice
/dev/nvme0n1 - whole block device
/dev/nvme0n1p1 - first partition
/dev/nvme0n1p2 - second partition

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

Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
10 years agoMerge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds
Kefu Chai [Fri, 22 May 2015 19:56:34 +0000 (03:56 +0800)]
Merge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds

test/test-erasure-code: spin off EIO tests to avoid lingering OSDs after tests finish

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4748 from ceph/wip-11562
Josh Durgin [Fri, 22 May 2015 19:43:46 +0000 (12:43 -0700)]
Merge pull request #4748 from ceph/wip-11562

dev/rbd-diff: clarify encoding of image size

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotests/test-erasure-code: spin off eio tests into another testsuite 4736/head
Kefu Chai [Fri, 22 May 2015 07:54:22 +0000 (15:54 +0800)]
tests/test-erasure-code: spin off eio tests into another testsuite

* since the eio tests crashes some of the OSD nodes, before the
  change, the tests try to undo the crash before moving on, so it
  won't interfere with following tests. a more robust/clean way to
  do this is to isolate individual tests in a sandbox, so each eio
  test will have its own:
    setup + inject + verify crash + teardown
  cycle. this change helps to remove the cleanup/undo steps in
  invidual test.
* update the disabled tests accordingly.
* use a minimum set of OSDs and R-S(2,1) for the testing to speed
  up the test.
* add the new testsuite to check_SCRIPTS

Fixes: #11693
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotests: fix the get_config()
Kefu Chai [Fri, 22 May 2015 07:58:10 +0000 (15:58 +0800)]
tests: fix the get_config()

* the "daemon" parameter was not respected.
* update the test_get_config() to check the overrided option instead of
  the default one.
* add set_config()

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4749 from ddiss/ceph_disk_test_fix
Loic Dachary [Fri, 22 May 2015 18:45:16 +0000 (20:45 +0200)]
Merge pull request #4749 from ddiss/ceph_disk_test_fix

tests: don't choke on deleted losetup paths

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoxio: fix reuse of outer loop index in inner loop 4750/head
Casey Bodley [Fri, 22 May 2015 17:07:45 +0000 (13:07 -0400)]
xio: fix reuse of outer loop index in inner loop

Reported-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Casey Bodley <casey@cohortfs.com>
10 years agocmake: add missing source file to test_librbd
Casey Bodley [Fri, 22 May 2015 14:40:56 +0000 (10:40 -0400)]
cmake: add missing source file to test_librbd

Signed-off-by: Casey Bodley <casey@cohortfs.com>
10 years agocmake: add missing common/util.cc dependency
Casey Bodley [Fri, 22 May 2015 14:40:16 +0000 (10:40 -0400)]
cmake: add missing common/util.cc dependency

Signed-off-by: Casey Bodley <casey@cohortfs.com>
10 years agocmake: skip man/CMakeLists.txt
Casey Bodley [Fri, 22 May 2015 14:38:29 +0000 (10:38 -0400)]
cmake: skip man/CMakeLists.txt

man pages have to be preprocessed now, and can't be installed directly.
skip installing them until we add the cmake-fu to copy what man/Makefile.am
is doing

Signed-off-by: Casey Bodley <casey@cohortfs.com>
10 years agotests: don't choke on deleted losetup paths 4749/head
David Disseldorp [Fri, 22 May 2015 15:22:51 +0000 (17:22 +0200)]
tests: don't choke on deleted losetup paths

If a file has been deleted with a loopback device attached, then the
`losetup --all` output will carry:
/dev/loopX: [0032]:344213 (/.../src/test-ceph-disk/vdf.disk (deleted))

This causes the losetup parsing in reset_leftover_dev() to throw an
error, e.g.:
rreset_leftover_dev: 430: test
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk' '(deleted))' =
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk)'
test/ceph-disk.sh: line 430: test: too many arguments

Fix this by quoting the path variable for the string comparison.

Signed-off-by: David Disseldorp <ddiss@suse.de>
10 years agodev/rbd-diff: clarify encoding of image size 4748/head
Jason Dillaman [Fri, 22 May 2015 15:18:09 +0000 (11:18 -0400)]
dev/rbd-diff: clarify encoding of image size

Fixes: #11562
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4512 from hjwsm1989/init-ceph
Loic Dachary [Fri, 22 May 2015 14:19:28 +0000 (16:19 +0200)]
Merge pull request #4512 from hjwsm1989/init-ceph

  init-ceph.in: Create osd data dir if don't exists.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports
Loic Dachary [Fri, 22 May 2015 12:32:04 +0000 (14:32 +0200)]
Merge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports

#11688: doc: update OSD/MDS firewall port list

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4734 from wonzhq/aio-completion
Kefu Chai [Fri, 22 May 2015 09:57:48 +0000 (17:57 +0800)]
Merge pull request #4734 from wonzhq/aio-completion

test/aio: fix the leak of aio completion

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4738 from dachary/wip-11618-osd-create-dup
Kefu Chai [Fri, 22 May 2015 08:55:04 +0000 (16:55 +0800)]
Merge pull request #4738 from dachary/wip-11618-osd-create-dup

tests: ceph create may consume more than one id

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh 4738/head
Loic Dachary [Thu, 21 May 2015 14:45:07 +0000 (16:45 +0200)]
tests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh

Run cephtool-test-{mon,osd,mds}.sh with CEPH_CLI_TEST_DUP_COMMAND=1 to
detect idempotency related problems during make check. This is how
ceph-qa-suite/tasks/workunit.py will run
suites/rados/singleton/all/cephtool.yaml and it's easier to fix when
make check fails rather than later on when a fully populated rados suite
has one failed job.

http://tracker.ceph.com/issues/11618 Refs: #11618

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph create may consume more than one id
Loic Dachary [Thu, 21 May 2015 14:39:30 +0000 (16:39 +0200)]
tests: ceph create may consume more than one id

When CEPH_CLI_TEST_DUP_COMMAND=1 is set, ceph osd create will consume
two osd id and return the later. Fix the test to account for that and
not assume the osd id being allocated by osd create is always the
next available osd id.

The other osd create tests do not suffer from the same variation because
they provide a UUID argument that guarantees the same osd id is going to
be returned every time.

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

Signed-off-by: Loic Dachary <ldachary@redhdat.com>
10 years agorgw: Use attrs from source bucket on copy 4745/head
Javier M. Mellid [Fri, 15 May 2015 12:22:29 +0000 (14:22 +0200)]
rgw: Use attrs from source bucket on copy

On copy objects, when bucket source is the same as the destination, use attrs
from source bucket.

Fixes: #11639
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
10 years agoMerge pull request #4617 from aakso/wip-11367-pki-token-expire
Yehuda Sadeh [Thu, 21 May 2015 21:09:38 +0000 (14:09 -0700)]
Merge pull request #4617 from aakso/wip-11367-pki-token-expire

rgw: always check if token is expired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agodoc: recommend opening entire 6800-7300 port range 4740/head
Ken Dreyer [Thu, 21 May 2015 18:54:30 +0000 (12:54 -0600)]
doc: recommend opening entire 6800-7300 port range

Prior to this commit, the Network Configuration Reference guide and
Troubleshooting guide recommended opening a number of ports that were
unique to the number of daemons that we ran.

This doesn't really cover all use cases. Users can easily restart
daemons in ways that cause the daemons to bind to higher ports. This
leads to OSDs or MDSs binding to ports that are firewalled.

Update the Network Configuration Reference guide and Troubleshooting
guides to simply recommend that users open all the ports between 6800
and 7300 on their OSDs and MDSs.

http://tracker.ceph.com/issues/11688 Refs: #11688

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: update OSD port range to 6800-7300
Ken Dreyer [Thu, 21 May 2015 18:53:43 +0000 (12:53 -0600)]
doc: update OSD port range to 6800-7300

The upper limit for OSD/MDS ports changed from 7100 to 7300 in commit
f9ec5a7945518089ffae540649b77ac06f98df5f. Update the Quick Start
Preflight documentation to reflect this change.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway
Yehuda Sadeh [Thu, 21 May 2015 17:00:20 +0000 (13:00 -0400)]
Merge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Removes references to s3gw.fcgi in simple gateway configuration file...

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoxio: malloc if xio_mempool_alloc fails
Casey Bodley [Thu, 14 May 2015 18:01:11 +0000 (14:01 -0400)]
xio: malloc if xio_mempool_alloc fails

Signed-off-by: Casey Bodley <casey@cohortfs.com>