]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agobuild: Add info about tests to --with-debug option 4870/head
Joaquim Rocha [Fri, 5 Jun 2015 12:48:41 +0000 (14:48 +0200)]
build: Add info about tests to --with-debug option

The configure's --with-debug option builds also some of the tests
so this should be mentioned in its doc string in order to let users
know how to build all the tests.

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
10 years agoMerge pull request #4866 from ddiss/fix_test_ceph_disk_dmcrypt_uuid_only
Loic Dachary [Fri, 5 Jun 2015 09:56:37 +0000 (11:56 +0200)]
Merge pull request #4866 from ddiss/fix_test_ceph_disk_dmcrypt_uuid_only

tests: fix test_activate_dmcrypt uuid usage

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: fix test_activate_dmcrypt uuid usage 4866/head
David Disseldorp [Fri, 29 May 2015 16:30:54 +0000 (18:30 +0200)]
tests: fix test_activate_dmcrypt uuid usage

4601e10800a63cf0e03108e1da0bf11c19c33e26 introduced a regression in that
an empty (uninitialised) OSD uuid is passed to test_pool_read_write for
IO. As a result, the "rados put" request times out causing test failure.

This change ensures that a correct OSD uuid is passed to
test_pool_read_write.

Signed-off-by: David Disseldorp <ddiss@suse.de>
10 years agoMerge pull request #4528 from ceph/wip-librbd-helgrind
Josh Durgin [Fri, 5 Jun 2015 01:55:43 +0000 (18:55 -0700)]
Merge pull request #4528 from ceph/wip-librbd-helgrind

librbd: correct issues discovered via lockdep / helgrind

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4857 from jdurgin/wip-rbd-features-constants
Jason Dillaman [Fri, 5 Jun 2015 00:37:39 +0000 (20:37 -0400)]
Merge pull request #4857 from jdurgin/wip-rbd-features-constants

update rbd features constants for python usage

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: flush pending ops while not holding lock 4528/head
Jason Dillaman [Tue, 12 May 2015 14:19:48 +0000 (10:19 -0400)]
librbd: flush pending ops while not holding lock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: fix possible deadlock in librbd ImageWatcher tests
Jason Dillaman [Tue, 12 May 2015 14:07:21 +0000 (10:07 -0400)]
tests: fix possible deadlock in librbd ImageWatcher tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: enable lockdep for librbd unit tests
Jason Dillaman [Mon, 11 May 2015 17:59:49 +0000 (13:59 -0400)]
tests: enable lockdep for librbd unit tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: owner_lock should be held during flush request
Jason Dillaman [Thu, 7 May 2015 18:17:37 +0000 (14:17 -0400)]
librbd: owner_lock should be held during flush request

Flush might result in the cache writing out dirty objects, which
would require that the owner_lock be held.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosdc: ObjectCacher flusher might needs additional locks
Jason Dillaman [Thu, 7 May 2015 18:06:16 +0000 (14:06 -0400)]
osdc: ObjectCacher flusher might needs additional locks

librbd requires the ObjectCacher flusher thread to acquire
an additional lock in order to maintain lock ordering
constraints.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: fix recursive locking issues
Jason Dillaman [Thu, 30 Apr 2015 20:11:03 +0000 (16:11 -0400)]
librbd: fix recursive locking issues

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: simplify state machine handling of exclusive lock
Jason Dillaman [Thu, 30 Apr 2015 20:04:28 +0000 (16:04 -0400)]
librbd: simplify state machine handling of exclusive lock

It is expected that all IO is flushed and all async ops are cancelled
prior to releasing the exclusive lock.  Therefore, replace handling of
lost exclusive locks in state machines with an assertion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AsyncObjectThrottle should always hold owner_lock
Jason Dillaman [Thu, 30 Apr 2015 19:41:59 +0000 (15:41 -0400)]
librbd: AsyncObjectThrottle should always hold owner_lock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: execute flush completion outside of cache_lock
Jason Dillaman [Thu, 30 Apr 2015 19:34:43 +0000 (15:34 -0400)]
librbd: execute flush completion outside of cache_lock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add AsyncRequest task enqueue helper method
Jason Dillaman [Thu, 30 Apr 2015 19:17:54 +0000 (15:17 -0400)]
librbd: add AsyncRequest task enqueue helper method

In order to support the invariant that all state machine
callbacks occur without holding locks, transitions that
don't always involve a librados call should queue their
callback.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: disable lockdep on AioCompletion
Jason Dillaman [Thu, 7 May 2015 19:32:27 +0000 (15:32 -0400)]
librbd: disable lockdep on AioCompletion

It is only used by clients and it causes a large slowdown
in performance due to the rate at which the lock is constructed/
destructed for each IO request.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AioCompletion shouldn't hold its lock during callback
Jason Dillaman [Thu, 30 Apr 2015 17:42:19 +0000 (13:42 -0400)]
librbd: AioCompletion shouldn't hold its lock during callback

The callback routine most likely will attempt to retrieve the result
code, which will result in a recursive lock attempt.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: complete cache read in a new thread context
Jason Dillaman [Thu, 30 Apr 2015 17:40:16 +0000 (13:40 -0400)]
librbd: complete cache read in a new thread context

The ObjectCacher complete the read callback while still holding
the cache lock.  This introduces lock ordering issues which are
resolved by queuing the completion to execute in a clean (unlocked)
context.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: give locks unique names to prevent false lockdep failures
Jason Dillaman [Thu, 30 Apr 2015 17:51:03 +0000 (13:51 -0400)]
librbd: give locks unique names to prevent false lockdep failures

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolog: fix helgrind warnings regarding possible data race
Jason Dillaman [Thu, 30 Apr 2015 17:38:29 +0000 (13:38 -0400)]
log: fix helgrind warnings regarding possible data race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: fix helgrind warnings
Jason Dillaman [Thu, 30 Apr 2015 17:37:56 +0000 (13:37 -0400)]
librados_test_stub: fix helgrind warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: add support for flushing watches
Jason Dillaman [Thu, 30 Apr 2015 17:36:26 +0000 (13:36 -0400)]
librados_test_stub: add support for flushing watches

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocommon: lockdep now support unregistering once destructed
Jason Dillaman [Thu, 30 Apr 2015 17:29:12 +0000 (13:29 -0400)]
common: lockdep now support unregistering once destructed

librbd use of an image hierarchy resulted in lock names being
re-used and incorrectly analyzed.  librbd now uses unique lock
names per instance, but to prevent an unbounded growth of
tracked locks, we now remove lock tracking once a lock is
destructed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocommon: add valgrind.h convenience wrapper
Jason Dillaman [Thu, 30 Apr 2015 17:26:41 +0000 (13:26 -0400)]
common: add valgrind.h convenience wrapper

Conditionally support helgrind annotations if valgrind support is
enabled during the build.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add work queue for op completions
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add work queue for op completions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoWorkQueue: ContextWQ can now accept a return code
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: ContextWQ can now accept a return code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agopybind/rbd.py: update with new features constants 4857/head
Josh Durgin [Thu, 4 Jun 2015 20:13:57 +0000 (13:13 -0700)]
pybind/rbd.py: update with new features constants

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: describe the purpose of features constants
Josh Durgin [Thu, 4 Jun 2015 20:06:51 +0000 (13:06 -0700)]
librbd: describe the purpose of features constants

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: add a constant for single-client-only features
Josh Durgin [Thu, 4 Jun 2015 20:05:13 +0000 (13:05 -0700)]
librbd: add a constant for single-client-only features

This way it's easy to disable them if you want to access an image from
multiple clients.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4717 from athanatos/wip-8635
Samuel Just [Thu, 4 Jun 2015 18:25:12 +0000 (11:25 -0700)]
Merge pull request #4717 from athanatos/wip-8635

Wip 8635 -- Move scrub, snap_trim into a unified queue

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4718 from athanatos/wip-sync-omap
Samuel Just [Thu, 4 Jun 2015 18:24:43 +0000 (11:24 -0700)]
Merge pull request #4718 from athanatos/wip-sync-omap

FileStore: sync object_map when we syncfs

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4839 from ceph/wip-fix-arm-linking-issue
Sage Weil [Thu, 4 Jun 2015 16:46:29 +0000 (09:46 -0700)]
Merge pull request #4839 from ceph/wip-fix-arm-linking-issue

common/Cycles.cc: skip initialization if rdtsc is not implemented

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4852 from ceph/wip-rgw-vstart
Orit Wasserman [Thu, 4 Jun 2015 16:03:58 +0000 (18:03 +0200)]
Merge pull request #4852 from ceph/wip-rgw-vstart

make vstart + rgw more useful

10 years agovstart.sh: set rgw dns name = localhost 4852/head
Sage Weil [Thu, 4 Jun 2015 16:02:29 +0000 (09:02 -0700)]
vstart.sh: set rgw dns name = localhost

So we can test buckets in the URL by adding entries in /etc/hosts

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4858 from SUSE/wip_ceph.spec.in_remove_extra_else_statement
Kefu Chai [Thu, 4 Jun 2015 11:07:52 +0000 (19:07 +0800)]
Merge pull request #4858 from SUSE/wip_ceph.spec.in_remove_extra_else_statement

ceph.spec.in: remove extra %else statement

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4859 from ceph/wip-fix-i386-test-11870
Loic Dachary [Thu, 4 Jun 2015 10:14:10 +0000 (12:14 +0200)]
Merge pull request #4859 from ceph/wip-fix-i386-test-11870

test: fix the plugin_exists()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest: fix the plugin_exists() 4859/head
Kefu Chai [Thu, 4 Jun 2015 09:45:09 +0000 (17:45 +0800)]
test: fix the plugin_exists()

in 8e61a99, we try to init the plugin when user set a profile using
"ceph osd erasure-code-profile set <profile-name> <profile>", so
if user passes in an unknown plugin, ceph will reject it right away,
instead of loading the plugin when "ceph osd crush rule create-erasure".

Fixes: #11870
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4856 from ceph/wip-install-deps-11869
Loic Dachary [Thu, 4 Jun 2015 08:52:10 +0000 (10:52 +0200)]
Merge pull request #4856 from ceph/wip-install-deps-11869

install-deps.sh: create virtualenv only if necessary

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph.spec.in: remove extra %else statement 4858/head
Owen Synge [Thu, 4 Jun 2015 08:11:34 +0000 (10:11 +0200)]
ceph.spec.in: remove extra %else statement

Remove extra conditional.

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoinstall-deps.sh: s/get_pip_and_wheel/populate_wheelhouse/ 4856/head
Kefu Chai [Thu, 4 Jun 2015 08:00:45 +0000 (16:00 +0800)]
install-deps.sh: s/get_pip_and_wheel/populate_wheelhouse/

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoinstall-deps.sh: create virtualenv only if necessary
Kefu Chai [Thu, 4 Jun 2015 05:44:00 +0000 (13:44 +0800)]
install-deps.sh: create virtualenv only if necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoinstall-deps.sh: do not create "wheelhouse" unless it's ready
Kefu Chai [Thu, 4 Jun 2015 03:53:55 +0000 (11:53 +0800)]
install-deps.sh: do not create "wheelhouse" unless it's ready

* only create "wheelhouse" directory for tox when it is populated
  with all packages in *requiresments.txt. before than, the wheels
  are put in "wheelhouse-wip"

Fixes: #11869
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocommon/Cycles.cc: skip initialization if rdtsc is not implemented 4839/head
Boris Ranto [Wed, 3 Jun 2015 10:24:48 +0000 (12:24 +0200)]
common/Cycles.cc: skip initialization if rdtsc is not implemented

The Cycles initialization gets stuck in infinite loop if rdtsc is not
implemented. This patch fixes the issue by quitting the initialization
if rtdsc fails.

The patch was cherry-picked from ubuntu patch by James Page, see

https://bugzilla.redhat.com/show_bug.cgi?id=1222286

for more details on the patch.

Signed-off-by: James Page <james.page@ubuntu.com>
10 years agoinstall-deps.sh: refactor pip install a little bit
Kefu Chai [Thu, 4 Jun 2015 03:45:55 +0000 (11:45 +0800)]
install-deps.sh: refactor pip install a little bit

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4855 from tchaikov/wip-man-page-fix
Kefu Chai [Thu, 4 Jun 2015 05:24:22 +0000 (13:24 +0800)]
Merge pull request #4855 from tchaikov/wip-man-page-fix

man/create-create-keys: minor fixes

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoman/create-create-keys: minor fixes 4855/head
Kefu Chai [Thu, 4 Jun 2015 03:24:13 +0000 (11:24 +0800)]
man/create-create-keys: minor fixes

to address the comments on https://github.com/ceph/ceph/pull/4846

Fixes: #10725
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4853 from ceph/wip-rpm-rm-endif
Kefu Chai [Thu, 4 Jun 2015 03:21:39 +0000 (11:21 +0800)]
Merge pull request #4853 from ceph/wip-rpm-rm-endif

ceph.spec.in: fix rpm build errors

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoRevert "ceph.spec.in:ownership of dirs extension" 4853/head
Ken Dreyer [Wed, 3 Jun 2015 23:42:27 +0000 (17:42 -0600)]
Revert "ceph.spec.in:ownership of dirs extension"

This reverts commit 6f495974a8255ec4bbd4c7c85f1ed21b3f281f2b.

This needs more discussion, since "make install" does not currently
create /usr/lib/ceph (and maybe /usr/share/ceph?)

This fixes the rpmbuild failure,

  error: File not found:
  /srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-9.0.0-1225.ga16afdd.el6.x86_64/usr/lib/ceph

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoceph.spec.in: rm stray %endif
Ken Dreyer [Wed, 3 Jun 2015 23:20:26 +0000 (17:20 -0600)]
ceph.spec.in: rm stray %endif

Commit d8abde3338b0c7df373b762e35099ad5123866bf introduced a stray
%endif. Remove it.

This fixes the build error:

  "error: /srv/autobuild-ceph/gitbuilder.git/build/ceph.spec:140: Got a
  %endif with no %if"

Reported-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agovstart.sh: sudo radosgw for low port numbers
Sage Weil [Wed, 3 Jun 2015 19:48:11 +0000 (12:48 -0700)]
vstart.sh: sudo radosgw for low port numbers

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agovstart.sh: show s3 creds at end
Sage Weil [Wed, 3 Jun 2015 19:48:00 +0000 (12:48 -0700)]
vstart.sh: show s3 creds at end

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4793 from SUSE/wip_ceph_spec_directories_not_owned_by_a_package
Ken Dreyer [Wed, 3 Jun 2015 22:27:57 +0000 (16:27 -0600)]
Merge pull request #4793 from SUSE/wip_ceph_spec_directories_not_owned_by_a_package

ceph.spec.in:ownership of dirs extension

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4821 from SUSE/wip_libcephfs_jni_postun
Ken Dreyer [Wed, 3 Jun 2015 22:24:34 +0000 (16:24 -0600)]
Merge pull request #4821 from SUSE/wip_libcephfs_jni_postun

ceph.spec.in libcephfs_jni1 has no %post and %postun

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4725 from SUSE/wip_suse_forward_conditionals
Ken Dreyer [Wed, 3 Jun 2015 22:19:37 +0000 (16:19 -0600)]
Merge pull request #4725 from SUSE/wip_suse_forward_conditionals

Add rpm conditionals

10 years agoMerge pull request #4808 from liewegas/wip-make-dist
Sage Weil [Wed, 3 Jun 2015 22:14:54 +0000 (15:14 -0700)]
Merge pull request #4808 from liewegas/wip-make-dist

make_dist_tarball.sh

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4850 from ktdreyer/wip-readme-simplify-deps
Sage Weil [Wed, 3 Jun 2015 21:29:33 +0000 (14:29 -0700)]
Merge pull request #4850 from ktdreyer/wip-readme-simplify-deps

README: simplify build deps section

10 years agoREADME: simplify build deps section 4850/head
Ken Dreyer [Wed, 3 Jun 2015 21:25:23 +0000 (15:25 -0600)]
README: simplify build deps section

The install-deps.sh step is the same for Debian and RPM-based systems.
Simplify the two README sections into a single section.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4828 from liewegas/wip-11798
Gregory Farnum [Wed, 3 Jun 2015 20:51:54 +0000 (13:51 -0700)]
Merge pull request #4828 from liewegas/wip-11798

make upstart less aggressive with respawn (11798)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4844 from ceph/wip-11860
Sage Weil [Wed, 3 Jun 2015 20:15:37 +0000 (13:15 -0700)]
Merge pull request #4844 from ceph/wip-11860

rgw: Do not enclose the Bucket header in quotes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoupstart: limit respawn to 3 in 30 mins (instead of 5 in 30s) 4828/head
Sage Weil [Wed, 3 Jun 2015 18:57:34 +0000 (14:57 -0400)]
upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)

It may take tens of seconds to restart each time, so 5 in 30s does not stop
the crash on startup respawn loop in many cases.  In particular, we'd like
to catch the case where the internal heartbeats fail.

This should be enough for all but the most sluggish of OSDs and capture
many cases of failure shortly after startup.

Fixes: #11798
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorgw: Do not enclose the Bucket header in quotes 4844/head
Wido den Hollander [Wed, 3 Jun 2015 11:13:33 +0000 (13:13 +0200)]
rgw: Do not enclose the Bucket header in quotes

Fixes: #11860
Signed-off-by: Wido den Hollander <wido@42on.com>
10 years agoMerge pull request #4836 from ceph/wip-11857
Kefu Chai [Wed, 3 Jun 2015 16:51:24 +0000 (00:51 +0800)]
Merge pull request #4836 from ceph/wip-11857

admin/build-doc: fix dependency checks

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4818 from dachary/wip-11272-ceph-disk-zap
Travis Rhoden [Wed, 3 Jun 2015 14:18:43 +0000 (10:18 -0400)]
Merge pull request #4818 from dachary/wip-11272-ceph-disk-zap

ceph-disk: always check zap is applied on a full device

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
10 years agoMerge pull request #4842 from liewegas/wip-install-deps
Sage Weil [Wed, 3 Jun 2015 14:14:23 +0000 (07:14 -0700)]
Merge pull request #4842 from liewegas/wip-install-deps

make install-deps clean up

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoinstall-deps.sh: clean up after ourselves 4842/head
Sage Weil [Wed, 3 Jun 2015 14:05:28 +0000 (10:05 -0400)]
install-deps.sh: clean up after ourselves

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoAdd rpm conditionals : libs_compat 4725/head
Owen Synge [Fri, 29 May 2015 11:35:19 +0000 (13:35 +0200)]
Add rpm conditionals : libs_compat

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoAdd rpm conditionals : tcmalloc
Owen Synge [Fri, 29 May 2015 11:34:39 +0000 (13:34 +0200)]
Add rpm conditionals : tcmalloc

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoAdd rpm conditionals : tests
Owen Synge [Fri, 29 May 2015 11:33:13 +0000 (13:33 +0200)]
Add rpm conditionals : tests

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoAdd rpm conditionals : cephfs_java
Owen Synge [Fri, 29 May 2015 11:28:24 +0000 (13:28 +0200)]
Add rpm conditionals : cephfs_java

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoadmin/build-doc: fix dependency checks 4836/head
John Spray [Wed, 3 Jun 2015 09:09:09 +0000 (10:09 +0100)]
admin/build-doc: fix dependency checks

Fixes: #11857
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4712 from dachary/wip-11663-verify-erasure-code-profile
Loic Dachary [Wed, 3 Jun 2015 08:47:50 +0000 (10:47 +0200)]
Merge pull request #4712 from dachary/wip-11663-verify-erasure-code-profile

normalize and verify the erasure code profile

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
10 years agoMerge pull request #4590 from ceph/wip-da-SCA-20150427
Gregory Farnum [Wed, 3 Jun 2015 06:21:41 +0000 (23:21 -0700)]
Merge pull request #4590 from ceph/wip-da-SCA-20150427

SCA and Coverity fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4823 from liewegas/wip-ceph-post-file
Kefu Chai [Wed, 3 Jun 2015 03:30:45 +0000 (11:30 +0800)]
Merge pull request #4823 from liewegas/wip-ceph-post-file

ceph-post-file: behave when sftp doesn't take -i

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4816 from dachary/wip-11624-cephtools-test
David Zafman [Wed, 3 Jun 2015 00:28:37 +0000 (17:28 -0700)]
Merge pull request #4816 from dachary/wip-11624-cephtools-test

tests: cephtool/test.sh wait_for_clean after PG (re)mapping

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4827 from ceph/wip-librbd-aio-submission
Josh Durgin [Tue, 2 Jun 2015 21:18:47 +0000 (14:18 -0700)]
Merge pull request #4827 from ceph/wip-librbd-aio-submission

librbd: new config option for legacy blocking aio behavior

Reviewed-by: Josh Durgin <jdurgin@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 agotests: verify librbd blocking aio code path 4827/head
Jason Dillaman [Tue, 2 Jun 2015 14:33:35 +0000 (10:33 -0400)]
tests: verify librbd blocking aio code path

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add rbd_non_blocking_aio option to image metadata
Jason Dillaman [Tue, 2 Jun 2015 14:32:41 +0000 (10:32 -0400)]
librbd: add rbd_non_blocking_aio option to image metadata

Signed-off-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 agoPut new variable initialization in its own block 4590/head
Greg Farnum [Tue, 2 Jun 2015 04:31:47 +0000 (21:31 -0700)]
Put new variable initialization in its own block

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agolibrbd: new rbd_non_blocking_aio config option
Jason Dillaman [Tue, 2 Jun 2015 02:56:11 +0000 (22:56 -0400)]
librbd: new rbd_non_blocking_aio config option

Setting this option to false reverts librbd to legacy behavior
where AIO operations could potentially block.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMakefile: install ceph-post-file keys with mode 600 4823/head
Sage Weil [Mon, 1 Jun 2015 22:10:14 +0000 (15:10 -0700)]
Makefile: install ceph-post-file keys with mode 600

Otherwise ssh (may) prompt for a password.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-post-file: improve check for a source install
Joseph McDonald [Mon, 1 Jun 2015 22:05:32 +0000 (15:05 -0700)]
ceph-post-file: improve check for a source install

Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
10 years agoceph-post-file: behave when sftp doesn't take -i
Joseph McDonald [Mon, 1 Jun 2015 22:00:39 +0000 (15:00 -0700)]
ceph-post-file: behave when sftp doesn't take -i

Fixes: #11836
Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
10 years agoerasure-code: verify the profile content matches get_profile() 4712/head
Loic Dachary [Sun, 17 May 2015 22:06:06 +0000 (00:06 +0200)]
erasure-code: verify the profile content matches get_profile()

The profile stored by the plugin may be different from the one set by
the user: it includes defaults. When the plugin is initialized, the
profile is modified to include the default values. Verify that the
modified profile matches what the get_profile() method returns, to guard
against inconsistencies from the erasure code plugin implementation.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: normalize erasure-code profile for storage and comparison
Loic Dachary [Sun, 17 May 2015 21:53:42 +0000 (23:53 +0200)]
mon: normalize erasure-code profile for storage and comparison

An erasure-code profile set by the user may be modified by the erasure
code plugin, most of the time to add default values for domain failure,
techniques etc.

Whenever the monitor gets an erasure code profile from the user or the
configuration file, it uses it to initialize the corresponding erasure
code plugin and:

 * validate the profile and get an error if it is invalid

 * get a normalized profile

The normalized profile is stored in the OSDMap. Should the user try
to set the same erasure code profile with the different values that lead
to the same normalized form, the modification will be accepted as a
noop, as if the same values were given. For instance:

   ceph osd erasure-code-profile set myprofile k=2

   ceph osd erasure-code-profile set myprofile k=2 m=1

are the same because the default value for m is 1 for the default
jerasure plugin.

If the normalized form is not used for storage and comparison, the
second call with m=1 will fail and require --force to override
myprofile, although the user can read from the documentation that it
matches the default value.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: implement get_profile for every plugins
Loic Dachary [Mon, 1 Jun 2015 17:50:05 +0000 (19:50 +0200)]
erasure-code: implement get_profile for every plugins

The ErasureCode::init function is implemented to store the profile and
is called by the init method of each plugin. The
ErasureCode::get_profile function is implemented to return the profile
that was stored. A specialized ostream<< function is implemented to
facilitate the display of the profile.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomake_dist.sh: bz2 only 4808/head
Sage Weil [Mon, 1 Jun 2015 18:20:03 +0000 (11:20 -0700)]
make_dist.sh: bz2 only

faster and smaler.  caller can convert to gz or xz if they need it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomake_dist.sh: improve version calc
Sage Weil [Mon, 1 Jun 2015 18:19:46 +0000 (11:19 -0700)]
make_dist.sh: improve version calc

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/: convert scrub to use the OpWQ 4717/head
Samuel Just [Fri, 15 May 2015 17:34:29 +0000 (10:34 -0700)]
osd/: convert scrub to use the OpWQ

Fixes: 8635
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoerasure-code: expect all plugins to implement get_profile
Loic Dachary [Mon, 1 Jun 2015 17:46:50 +0000 (19:46 +0200)]
erasure-code: expect all plugins to implement get_profile

Add the get_profile method to the interface and make it a pure virtual.
Each plugin is expected to return the profile currently in use. Although
the profile is also stored in the OSDMap, it provides a convenient
introspection method to validate that the profile being set is indeed
the profile being used.

Signed-off-by: Loic Dachary <ldachary@redhat.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 agoceph.spec.in libcephfs_jni1 has no %post and %postun 4821/head
Owen Synge [Mon, 1 Jun 2015 12:58:31 +0000 (14:58 +0200)]
ceph.spec.in libcephfs_jni1 has no %post and %postun

/usr/lib64/libcephfs_jni.so.1.0.0 requires /sbin/ldconfig to be
run after installing and after removing.

Signed-off-by: Owen Synge <osynge@suse.com>
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>