Commit Graph

42082 Commits

Author SHA1 Message Date
Kefu Chai
b501c41831 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>
2015-06-04 19:07:52 +08:00
Loic Dachary
9d8ae1ed2f Merge pull request #4859 from ceph/wip-fix-i386-test-11870
test: fix the plugin_exists()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-04 12:14:10 +02:00
Kefu Chai
6bd425b025 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>
2015-06-04 17:51:58 +08:00
Loic Dachary
1957c88c81 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>
2015-06-04 10:52:10 +02:00
Owen Synge
75e87a20da ceph.spec.in: remove extra %else statement
Remove extra conditional.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-06-04 10:11:34 +02:00
Kefu Chai
17a74ed292 install-deps.sh: s/get_pip_and_wheel/populate_wheelhouse/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-06-04 16:01:17 +08:00
Kefu Chai
b23fd403bd install-deps.sh: create virtualenv only if necessary
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-06-04 16:01:17 +08:00
Kefu Chai
f81f651663 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>
2015-06-04 16:00:56 +08:00
Boris Ranto
35c5fd0091 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>
2015-06-04 09:20:25 +02:00
Kefu Chai
0d845255c7 install-deps.sh: refactor pip install a little bit
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-06-04 13:52:04 +08:00
Kefu Chai
779360cd96 Merge pull request #4855 from tchaikov/wip-man-page-fix
man/create-create-keys: minor fixes

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-06-04 13:24:22 +08:00
Kefu Chai
f04c8829cf 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>
2015-06-04 11:27:11 +08:00
Kefu Chai
a308c11308 Merge pull request #4853 from ceph/wip-rpm-rm-endif
ceph.spec.in: fix rpm build errors

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-04 11:21:39 +08:00
Ken Dreyer
0eabf27e5b Revert "ceph.spec.in:ownership of dirs extension"
This reverts commit 6f495974a8.

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>
2015-06-03 17:48:12 -06:00
Ken Dreyer
f94f23297c ceph.spec.in: rm stray %endif
Commit d8abde3338 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>
2015-06-03 17:40:58 -06:00
Sage Weil
91dbc7871a vstart.sh: sudo radosgw for low port numbers
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-03 16:17:50 -07:00
Sage Weil
f2a4c2ae00 vstart.sh: show s3 creds at end
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-03 16:17:43 -07:00
Ken Dreyer
5feb806905 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>
2015-06-03 16:28:01 -06:00
Ken Dreyer
7d5a8f74fb 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>
2015-06-03 16:24:39 -06:00
Ken Dreyer
799432ab48 Merge pull request #4725 from SUSE/wip_suse_forward_conditionals
Add rpm conditionals
2015-06-03 16:19:37 -06:00
Sage Weil
0dbae1a8bc Merge pull request #4808 from liewegas/wip-make-dist
make_dist_tarball.sh

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-06-03 15:14:54 -07:00
Sage Weil
048a2263ee Merge pull request #4850 from ktdreyer/wip-readme-simplify-deps
README: simplify build deps section
2015-06-03 14:29:33 -07:00
Ken Dreyer
fbb9279799 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>
2015-06-03 15:25:23 -06:00
Gregory Farnum
172d3ac874 Merge pull request #4828 from liewegas/wip-11798
make upstart less aggressive with respawn (11798)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-06-03 13:51:54 -07:00
Sage Weil
0e66dae959 Merge pull request #4844 from ceph/wip-11860
rgw: Do not enclose the Bucket header in quotes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-03 13:15:37 -07:00
Sage Weil
eaff6cb24e 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>
2015-06-03 14:57:34 -04:00
Wido den Hollander
8af25faed9 rgw: Do not enclose the Bucket header in quotes
Fixes: #11860
Signed-off-by: Wido den Hollander <wido@42on.com>
2015-06-03 20:20:16 +02:00
Kefu Chai
3fb1186d1a 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>
2015-06-04 00:51:24 +08:00
Travis Rhoden
54e1d9d0a8 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>
2015-06-03 10:18:43 -04:00
Sage Weil
1f0d3ca04e Merge pull request #4842 from liewegas/wip-install-deps
make install-deps clean up

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-03 07:14:23 -07:00
Sage Weil
db2d83cb3e install-deps.sh: clean up after ourselves
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-03 10:05:28 -04:00
Owen Synge
c6c3a3bca2 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>
2015-06-03 15:57:39 +02:00
Owen Synge
d8abde3338 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>
2015-06-03 15:57:16 +02:00
Owen Synge
5747ea1910 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>
2015-06-03 15:55:14 +02:00
Owen Synge
c65538f489 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>
2015-06-03 15:55:00 +02:00
John Spray
539c1ba721 admin/build-doc: fix dependency checks
Fixes: #11857
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-03 10:09:09 +01:00
Loic Dachary
3ca1b50975 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>
2015-06-03 10:47:50 +02:00
Gregory Farnum
b7eec9ab68 Merge pull request #4590 from ceph/wip-da-SCA-20150427
SCA and Coverity fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-06-02 23:21:41 -07:00
Kefu Chai
323918a3d6 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>
2015-06-03 11:30:45 +08:00
David Zafman
17f73fafc4 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>
2015-06-02 17:28:37 -07:00
Sage Weil
fdcc0072dd arm: fix build on older kernels
that don't define HWCAP_CRC32

Fixes: #11461
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-02 14:33:36 -07:00
Josh Durgin
eb92254099 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>
2015-06-02 14:18:47 -07:00
John Spray
0de68ebbe5 qa: fix multiple_rsync.sh to avoid using /usr/ directly
While we're at it, take only /usr/lib instead of all of /usr
to keep the overall file count more modest.

Fixes: #11807
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-02 18:53:14 +01:00
Jason Dillaman
3d39a9bc69 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>
2015-06-02 11:34:45 -04:00
Jason Dillaman
4cf41486e9 tests: verify librbd blocking aio code path
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-06-02 10:33:35 -04:00
Jason Dillaman
008a9c4f6f librbd: add rbd_non_blocking_aio option to image metadata
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-06-02 10:32:41 -04:00
Kefu Chai
c2b06ab372 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>
2015-06-02 20:43:26 +08:00
Kefu Chai
aa3d2693d3 Merge pull request #4760 from ketor/fix_mutex_memory_leak
Mutex: fix memory leak in lockdep _register

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-02 20:37:10 +08:00
Loic Dachary
ddfc589975 Merge pull request #4802 from isserrano/master
doc: Fixed example sintax in Absolute Sizing

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-02 14:36:35 +02:00
Ismael
de14093fe2 doc: s/osd pool hot-storage/osd pool set hot-storage/
Signed-off-by: Ismael Serrano <ismael.serrano@gmail.com>
2015-06-02 13:30:15 +01:00