]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Loic Dachary [Tue, 9 Jun 2015 11:49:14 +0000 (13:49 +0200)]
tests: automake 1.11 needs parallel-tests
Prior to automake 1.13 the default behavior was serial-tests meaning
tests from make check were run one after the other and their output sent
to stdout/stderr. From automake 1.13 up the default became
parallel-tests which logs the output of each individual test in a
separate .log file and allows them to run in parallel.
http://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
Enable parallel-tests so that tests can always run in parallel, even
with automake 1.11 which is the version found in CentOS 6.5 and Ubuntu
12.04 precise.
A nice side effect of always having the logs in separate files is that
tests do not need to worry about being too verbose because their output
will only be read for diagnostic purposes.
http://tracker.ceph.com/issues/11931 Fixes: #11931
http://tracker.ceph.com/issues/11906 Fixes: #11906
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Josh Durgin [Mon, 8 Jun 2015 19:36:35 +0000 (12:36 -0700)]
Merge pull request #4903 from theanalyst/doc/arch-watch-notify
doc: architecture minor fixes in watch notify
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Abhishek Lekshmanan [Mon, 8 Jun 2015 18:51:58 +0000 (00:21 +0530)]
doc: architecture minor fixes in watch notify
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Ken Dreyer [Mon, 8 Jun 2015 16:27:16 +0000 (10:27 -0600)]
Merge pull request #4880 from SUSE/wip-master-specfile-cleanup2
ceph.spec.in: move specific BuildRequires to where they belong
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Kefu Chai [Mon, 8 Jun 2015 14:12:46 +0000 (22:12 +0800)]
Merge pull request #4893 from dachary/wip-11272-ceph-disk-false-negative
tests: ceph-disk.sh test zap gitbuilder false negative
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 8 Jun 2015 02:38:52 +0000 (10:38 +0800)]
Merge pull request #4888 from dachary/wip-11905-test-isa
tests: skip isa tests if the plugin is not available
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Sun, 7 Jun 2015 11:52:01 +0000 (13:52 +0200)]
tests: ceph-disk.sh test zap gitbuilder false negative
When looking for an error message and testing ceph disk zap, use grep -q
to not display the error message that will be mistaken for a real error
by the gitbuilder parser.
http://tracker.ceph.com/issues/11272 Refs: #11272
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 7 Jun 2015 08:53:49 +0000 (10:53 +0200)]
tests: skip isa tests if the plugin is not available
http://tracker.ceph.com/issues/11905 Fixes: #11905
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 7 Jun 2015 08:52:31 +0000 (10:52 +0200)]
tests: use erasure_code_plugin_exists from ceph-helpers.sh
Instead of the local plugin_exists helper that does the same.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 7 Jun 2015 08:51:07 +0000 (10:51 +0200)]
tests: implement erasure_code_plugin_exists in ceph-helpers.sh
Return 0 if the erasure code *plugin* is available, 1 otherwise.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 7 Jun 2015 07:58:26 +0000 (09:58 +0200)]
Merge pull request #4713 from dachary/wip-10358-erasure-code-k-1-m-1
ceph osd erasure-code-profile set myprofile k=1 should fail
Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
Loic Dachary [Sat, 6 Jun 2015 22:12:11 +0000 (00:12 +0200)]
Merge pull request #4811 from dachary/wip-11346-isa
ceph-erasure-code-corpus: isa: add k=10 m=4
Reviewed-by: Yuan Zhou <yuan.zhou@intel.com>
Loic Dachary [Sun, 17 May 2015 22:29:31 +0000 (00:29 +0200)]
erasure-code: add sanity check to guard against k=1
Add a call to ErasureCode::sanity_check_k for the isa and jerasure
plugins, with associated tests.
http://tracker.ceph.com/issues/10358 Fixes: #10358
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Sat, 6 Jun 2015 13:24:17 +0000 (06:24 -0700)]
Merge pull request #4882 from SUSE/wip-submitting-patches-clarification
SubmittingPatches: clarify how Reviewed-by lines are added
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Sat, 6 Jun 2015 13:16:16 +0000 (15:16 +0200)]
SubmittingPatches: clarify how Reviewed-by lines are added
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Loic Dachary [Sat, 6 Jun 2015 12:37:23 +0000 (14:37 +0200)]
Merge pull request #4878 from dachary/wip-11901-spec
ceph.spec.in: add missing BuildRequires from SUSE block
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Nathan Cutler [Sat, 6 Jun 2015 11:44:20 +0000 (13:44 +0200)]
ceph.spec.in: move specific BuildRequires to where they belong
Move distro-specific BuildRequires out of "common" section and
into the appropriate %if statement in the "specific" section.
Also remove a duplicated "Requires: gdisk".
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sat, 6 Jun 2015 10:28:03 +0000 (12:28 +0200)]
install-deps.sh: detect yum-builddep errors
yum-builddep does not exit on error when an error happens: grep the
output for the error: string instead.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sat, 6 Jun 2015 08:20:02 +0000 (10:20 +0200)]
ceph.spec.in: add missing BuildRequires from SUSE block
The %endif removed by
f94f23297c05019db754ec53b4ceaea7706152c9 is restored.
The %else removed by
75e87a20dac05441b97ce99dea76fff8e3a863ac is restored.
The stray %endif added by
d8abde3338b0c7df373b762e35099ad5123866bf is removed.
May 29th, in
d8abde3338b0c7df373b762e35099ad5123866bf Owen added a stray
%endif after
BuildRequires: gperftools-devel
around line 133. June 3rd, in
f94f23297c05019db754ec53b4ceaea7706152c9
Ken correctly attributed the error
"error: /srv/autobuild-ceph/gitbuilder.git/build/ceph.spec:140: Got a
%endif with no %if"
to a stray %endif but did not remove the one causing problem and in
doing so created another problem. June 4th, in
75e87a20dac05441b97ce99dea76fff8e3a863ac Owen incorrectly fixed
this new problem by removing the %else that is near
BuildRequires: gperftools-devel
around line 116, instead of reverting
f94f23297c05019db754ec53b4ceaea7706152c9 . As a consequence the
ceph.spec.in became syntactically correct but implemented an if/else
logic different from what was intended originally and a number of
BuildRequires became exclusive to SUSE and were not installed for CentOS
7 etc.
http://tracker.ceph.com/issues/11901 Fixes: #11901
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 17 May 2015 22:16:04 +0000 (00:16 +0200)]
erasure-code: implement ErasureCode::sanity_check_k
Implement the ErasureCode::sanity_check_k helper for plugins
that need to verify k >= 2.
http://tracker.ceph.com/issues/10358 Fixes: #10358
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Noah Watkins [Fri, 5 Jun 2015 19:12:13 +0000 (12:12 -0700)]
Merge pull request #4834 from liewegas/wip-11461
fix build on arm w/ old kernels
Signed-off-by: Noah Watkins <nwatkins@redhat.com>
Greg Farnum [Fri, 5 Jun 2015 18:25:21 +0000 (11:25 -0700)]
Merge remote-tracking branch 'origin/wip-client-fsync'
Conflicts:
src/client/Client.cc
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 5 Jun 2015 18:22:53 +0000 (11:22 -0700)]
Merge pull request #4831 from ceph/wip-11807
qa: fix multiple_rsync.sh to avoid using /usr/ directly
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Gregory Farnum [Fri, 5 Jun 2015 18:21:20 +0000 (11:21 -0700)]
Merge pull request #4743 from ceph/wip-client-oldest-tid
Wip client oldest tid
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 5 Jun 2015 18:16:50 +0000 (11:16 -0700)]
Merge pull request #4723 from ceph/wip-snap-misc
Wip snap misc
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 5 Jun 2015 18:15:25 +0000 (11:15 -0700)]
Merge pull request #4702 from tchaikov/wip-fix-11590
mon: always reply mdsbeacon
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)]
Merge pull request #4602 from ceph/wip-11504
mon: refine check_remove_tier checks
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Josh Durgin [Fri, 5 Jun 2015 15:59:15 +0000 (08:59 -0700)]
Merge pull request #4781 from ceph/wip-librbd-perf-counters
librbd: re-add missing discard perf counters
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Fri, 5 Jun 2015 13:22:48 +0000 (15:22 +0200)]
Merge pull request #4870 from joaquimrocha/extra_doc_info_for_debug_option
build: Add info about tests to --with-debug option
Reviewed-by: Loic Dachary <ldachary@redhat.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>