Commit Graph

52890 Commits

Author SHA1 Message Date
Sage Weil
3f310bd88e debian,rpm: add jq build dependency
Needed since db517ba917.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-04 16:01:47 -04:00
Nathan Cutler
ac643884fe Merge pull request #8720 from ceph/wip-13445
rpm: drop support for unsupported distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-05-04 21:31:04 +02:00
David Zafman
a1372673d8 Fixes for list-inconsistent-*
Improve rados scrub output
Add epoch for future repair-read feature
Add testing of rados scrub output

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
2016-05-04 10:07:50 -07:00
David Zafman
db517ba917 test: Add testing of new scrub commands in rados
Test list-inconsistent-pg
Test list-inconsistent-obj
Test inconsistent-snapset

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-04 10:03:23 -07:00
Kefu Chai
891082d0e4 Merge pull request #8916 from linuxbox2/xio-cmake
cmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-05 00:50:47 +08:00
Orit Wasserman
5f27957f10 Merge pull request #8768 from cbodley/wip-rgw-admin-zonegroup
radosgw-admin: add missing --zonegroup-id to usage
2016-05-04 16:46:02 +02:00
Gregory Farnum
b943e5937a Merge pull request #8300 from jcsp/wip-standby-replay-reorg
mds: Fix standby replay MDS in upgrades and simplify standby replay logic (#15591)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-04 07:28:19 -07:00
Nathan Cutler
e1514809ae rpm: do a full make check when --with-tests is given
The check-local target tests the CLI tools only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:46 +02:00
Nathan Cutler
20df58799a rpm: drop sysvinit bits from relabel_files function
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
e0346b36fc rpm: replace literal paths with RPM macros
The only place we should write out literal paths is in the RPM scriptlets,
and there only for things that are not installed by this package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
ee4acb3159 rpm: drop udev/95-ceph-osd-alt.rules
This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
bed92b6a86 rpm: global replace $RPM_BUILD_ROOT with %{buildroot}
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:42 +02:00
Nathan Cutler
66042c03df rpm: put dependencies in alphabetical order
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
7ae46e342e rpm: put /sbin/ldconfig into -p
This saves approximately 1 second per invocation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
c655cb896a rpm: drop sysvinit-specific dependencies
Obsolete in jewel and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
46b16c19f7 rpm: move boost-random dependency to appropriate section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
1d897da861 rpm: move unified python-sphinx build dependency
Now that the python-sphinx build dependency is unified, move it
to the proper section of the spec file.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
1332fac70e rpm: drop dead conditionals
This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
6c42066d48 rpm: drop python-argparse dependency
This was only necessary for older (now unsupported) distro versions.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
2ca6dd250b rpm: drop _with_systemd
Ceph versions jewel and above only support systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
e8cf501d0f rpm: drop init-ceph.in-fedora.patch
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
98d52120f8 rpm: drop python_sitelib/sitearch conditional
This conditional was required to support older versions of RHEL/CentOS that are
no longer supported in infernalis and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Sage Weil
83f6e12427 Merge pull request #8550 from xiexingguo/xxg-wip-cls
objclass: honour do_osd_ops() results before going any further

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:28:44 -04:00
Sage Weil
e1dd16f471 Merge pull request #8367 from Yan-waller/yj-wip-utthrottle
test/throttle: reassign the value of 'delay' in ThrottleTest.get

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-04 09:28:31 -04:00
Sage Weil
c990345989 Merge pull request #8392 from dachary/wip-virtualenv-jewel
Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 3)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-05-04 09:27:58 -04:00
Sage Weil
a2892a482d Merge pull request #8439 from ErwanAliasr1/evelu-file-leak
tests: Delete temporary files created by ceph_objectstore_tool.py

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:27:25 -04:00
Sage Weil
61773e9739 Merge pull request #8632 from xiexingguo/xxg-wip-deepscrub
osd: fix be_deep_scrub() can't catch omap error

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-04 09:26:47 -04:00
Sage Weil
5e80d97688 Merge pull request #8742 from majianpeng/bluestore-wal-transaction
os/bluestore: record released extents into bluestore_wal_transaction_t.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:26:30 -04:00
Sage Weil
449f81eede Merge pull request #8763 from wjwithagen/patch-10
os/filestore: Make sure str-pointer is not 0x0 when referenced

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-04 09:14:11 -04:00
Sage Weil
b84f9067d9 Merge pull request #8808 from wjin/fast_heartbeat
osd: fast dispatch heartbeat message

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:13:47 -04:00
Sage Weil
2c6b95eb70 Merge pull request #8811 from stiopaa1/log_includes
log: remove unnecessary includes from header file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:12:47 -04:00
Sage Weil
62a4264207 Merge pull request #8831 from wjin/clean
osd: clean heartbeat dispatch message

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:12:34 -04:00
Sage Weil
748fc66ebe Merge pull request #8821 from aderumier/deb-fix-default-ceph-location
debian: fix /etc/default/ceph location

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:07:57 -04:00
Sage Weil
3e71d8b699 osd/PG: update info.stats.* mappings on splitReviewed-by: Samuel Just <sjust@redhat.com>
osd/PG: update info.stats.* mappings on split

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-05-04 09:06:55 -04:00
Sage Weil
6d4ab4c791 Merge pull request #8733 from xiexingguo/xxg-wip-fix-reweightlessutil
mon/OSDMonitor: improve reweight_by_utilization() logic

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 09:06:08 -04:00
Sage Weil
034cf6875a Merge pull request #8837 from liewegas/wip-reweight
mon/OSDMonitor: max_osds must be > 0 for reweight-by-*

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-04 09:05:14 -04:00
Loic Dachary
ee9a957162 Merge pull request #8926 from ceph/wip-ec-test-check
test/ec: build the libs only when 'make check'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-05-04 14:03:37 +02:00
John Spray
7093e87762 Merge pull request #8546 from jcsp/wip-15465
mds: fix auth caps with hyphen in path (#15465)

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-05-04 05:50:03 -05:00
John Spray
0741b0c163 Merge pull request #8484 from jcsp/wip-15399
mds: use epoch as incarnation counter (#15399)

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-04 05:49:04 -05:00
Boris Ranto
0bbfea5cf1 test/ec: build the libs only when 'make check'
Currently, we are always building the erasure code libraries while we
need them only when 'make check' is run. Moving the test libraries to
check_LTLIBRARIES should fix this for us.

We no longer need to remove the libec libs manually, remove the lines
that do that.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-04 12:16:20 +02:00
Josh Durgin
ef972c6def Merge pull request #8876 from kmroz/wip-fix-rgw-lttng-segfault
global: don't link lttng into libglobal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-03 17:32:16 -07:00
Matt Benjamin
4df918ae8c cmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake
For uniformity, upcase all these variables.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-05-03 17:36:59 -04:00
Casey Bodley
75a9e437aa Merge pull request #8637 from roidayan/xio-remove_rdma_and_ibverbs_from_configure
confiugre.ac: remove rdma and ibverbs dependency from xio
2016-05-03 17:11:01 -04:00
Casey Bodley
251104faf8 Merge pull request #8704 from ceph/wip-cmake-xio-libs
cmake: removed rdmacm & ibverbs parallel to PR#8637
2016-05-03 17:10:26 -04:00
Gregory Farnum
747814f7c4 Merge pull request #8914 from adamemerson/wip-grr-warnings
I have a hatred for warnings

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-03 13:37:41 -07:00
Sage Weil
56edf3a428 Merge pull request #8917 from liewegas/wip-civetweb-fix
civetweb: combine various submodule changes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2016-05-03 16:01:41 -04:00
David Zafman
a551b6bd5c rados: Don't bother showing list-inconsistent-* errors that aren't set
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
David Zafman
fdca113fc2 osd, rados: Fixes for list-inconsistent-snapset
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
David Zafman
4fc4326b36 include, rados: Fixes for list-inconsistent-obj and librados
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-05-03 12:11:56 -07:00
Sage Weil
b99681de6a civetweb: combine various submodule changes
There were some accidental reverts, fixes, re-reverts,
and follow-on changes that are hard to follow and in the
end did not include what we want.  Merge it all together.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-03 15:01:19 -04:00