Commit Graph

578 Commits

Author SHA1 Message Date
Samuel Just
35542eb6ed Revert "makefiles: remove bz2-dev from dependencies" 2015-12-15 15:12:19 -08:00
Piotr Dałek
a8b5920259 makefiles: remove bz2-dev from dependencies
The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.

Fixes: #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-12-15 14:01:51 +01:00
Josh Durgin
701a6626a2 Merge pull request #6768 from marcan/cython
pybind: port the rbd bindings to Cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-12-09 15:45:17 -08:00
Loic Dachary
84ee7c3399 Merge remote-tracking branch 'ceph/jewel' 2015-12-08 09:03:55 +01:00
Sage Weil
e62954e07b deb,rpm: package buffer_fwd.h
Introduced by 206b8e2cc6.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-06 09:24:17 -05:00
Hector Martin
8931875e3f ceph.spec: Cython is spelled python-Cython in OpenSuSE
Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-03 02:59:37 +09:00
Jason Dillaman
1786fa8aa9 Merge pull request #6657 from kylinstorage/wip-rbd-nbd
rbd-nbd: network block device (NBD) support for RBD 

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-02 10:38:54 -05:00
Hector Martin
9cca28a917 pybind: convert librbd bindings to Cython
ctypes is fundamentally incapable of providing safe callback support
(exceptions during callbacks are not handled properly). To fix this, and also
gain more flexibility, rewrite/port the librbd bindings to Cython instead.
Other Python bindings are expected to migrate to Cython in the future.

Reference: http://tracker.ceph.com/issues/13115

To support this, this change also:
- Introduces a Makefile for pybind which calls setup.py
- Updates the installation files for packages
- Adds a hack to admin/build-doc to build a dummy librbd, avoiding the need to
  build the entire client library just to generate documentation (Sphinx needs
  to be able to import rbd.so, which depends on librbd.so symbols).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:41:17 +09:00
Hector Martin
5113c962ee configure/packaging: introduce Cython dependency
To prepare for the migration of rbd.py to Cython, add Cython as a package
dependency and have the configure script look for it.

Also adds Cython as a dependency for admin/build-doc, and changes the
virtualenv to allow usage of system packages (to avoid having to compile
Cython inside the virtualenv).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:54 +09:00
Sage Weil
a12efa204e Merge pull request #6276 from david-z/wip-systemd-finegrain-ceph-service
systemd: start/stop/restart ceph services by daemon type

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil  <sage@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-11-28 08:25:40 -05:00
Nathan Cutler
095c29c3c4 ceph.spec.in: make --with lowmem_builder limit _smp_mflags
The limit, -j8, may seem arbitrary but works nicely in the openSUSE Build
Service.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-24 15:45:40 +01:00
Yunchuan Wen
7bbd54a1e6 add rbd-nbd package
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2015-11-21 23:26:44 +08:00
Josh Durgin
426450472a Merge branch 'wip-11286' of https://github.com/dillaman/ceph
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 21:19:37 -08:00
Yehuda Sadeh
a5651b867a Revert 0374bb4a2f 2015-11-09 15:24:29 -08:00
Yehuda Sadeh
0374bb4a2f Merge pull request #6419 from ceph/wip-openssl
rgw: link against system openssl (instead of dlopen at runtime)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-09 13:56:29 -08:00
Boris Ranto
9224ac2ad2 rbdmap: systemd support
Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-06 10:26:22 +01:00
Jason Dillaman
78dbd13839 ceph.spec.in: add new cls_journal RADOS class
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-05 20:43:49 -05:00
Boris Ranto
c0980af3c7 rbdmap: Move do_map and do_unmap shell functions to rbdmap script
This patch creates rbdmap shell script that is called from init-rbdmap
init script. The patch also renames src/rbdmap configuration file to
src/etc-rbdmap so that rbdmap shell script can be installed via build
system directly. Finally, the patch accomodates these changes in spec
file and build system.

Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-05 21:04:50 +01:00
Sage Weil
3eccde9d9c Merge tag 'v9.2.0'
v9.2.0
2015-11-04 19:40:17 -05:00
Sage Weil
173bfd03c4 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-29 01:06:36 -04:00
Zhi Zhang
cfa2d0a08a fine-grained control systemd to start/stop/restart ceph services at once
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2015-10-26 15:13:19 +08:00
Boris Ranto
1560057226 ceph.spec.in: We no longer need redhat-lsb-core
Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-23 16:53:41 +02:00
Sage Weil
08b381e2fc Merge pull request #5219 from ceph/wip-12315-libs-compat-conditional
ceph.spec.in: fix libs-compat / devel-compat conditional

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-10-18 14:34:47 -04:00
Josh Durgin
28131505b8 Merge pull request #6249 from dillaman/wip-13274-infernalis
LTTng-UST tracing should be dynamically enabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-15 18:07:09 -04:00
Jason Dillaman
477bb064e8 ceph.spec.in: only run systemd-tmpfiles on ceph run directory
There is a kmod bug that affects RHEL7 derivatives which will
result in device permissions being reset back to defaults.

Fixes: #13305
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-14 16:41:32 -04:00
Jason Dillaman
f4feee2f9d ceph.spec.in: add new tracepoint probe shared libraries
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-14 12:06:47 -04:00
Sage Weil
1e017ef63d Merge pull request #6190 from SUSE/wip-drop-my-conf-opt
ceph.spec.in: drop MY_CONF_OPTS

Reviewed-by: Ken Dreyer, <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-09 16:34:25 -04:00
Sage Weil
4b7cf9ce83 Merge pull request #6183 from ceph/wip-fix-selinux-man-page
Fix selinux man page

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-10-09 16:33:48 -04:00
Nathan Cutler
5a11d7618e ceph.spec.in: move python-sphinx BuildRequires to the right section
These belong in the section for distro-conditional dependencies.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
96aabe7610 ceph.spec.in: move BuildRequires out of subpackages
Since the main package and all the subpackages are built in the
same environment, concentrate all the BuildRequires in the main
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
d258bf5852 ceph.spec.in: drop MY_CONF_OPTS
http://tracker.ceph.com/issues/13402 Fixes: #13402

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:32:27 +02:00
Nathan Cutler
378d56d1e2 man/Makefile-server.am: conditionalize make ceph_selinux manpage
http://tracker.ceph.com/issues/13353 Fixes: #13353

Modified-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 18:08:15 +02:00
branto1
e5a6529afc Merge pull request #6171 from SUSE/wip-infernalis-obs
Get infernalis to build in openSUSE Build Service

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-06 18:05:52 +02:00
Nathan Cutler
1045291594 ceph.spec.in: remove comments regarding ceph UID/GID in SUSE
It is possible that the ceph user/group will not have fixed UID/GID in SUSE.
Instead, it is possible that the ceph package will depend on a separate package
whose sole purpose will be to create the ceph user/group if they do not exist.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
800d974610 ceph.spec.in: enable OBS post-build-checks to find systemd-tmpfiles
The openSUSE Build Service runs a number of "post-build checks" after the RPMs
have been generated. One of these tests the RPM scriptlets for idempotence.
Without this line in the specfile, the check fails on SLE_12 because it cannot
find the systemd-tmpfiles binary.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
f8895fc70b ceph.spec.in: Standardize systemd preun and postun scripts
Currently, the main ceph package and the ceph-radosgw behave
differently on upgrade. This commit unifies their behavior
to the following:

On package removal, disable and stop all related systemd units.

On package upgrade, do nothing unless there is a file /etc/sysconfig/ceph
containing a parameter CEPH_AUTO_RESTART_ON_UPGRADE. If parameter is set
to "yes", restart the systemd units iff they are running.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:25 +02:00
Nathan Cutler
404ffab739 ceph.spec.in: fix for out-of-memory errors in OBS
Add "--param ggc-min-expand=20 --param ggc-min-heapsize=32768"
to RPM_OPT_FLAGS, ensuring gcc does not add debug symbols and is
more aggressive about garbage collection.

Thanks to Berthold Gunreben for debugging this issue.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
db4727f943 ceph.spec.in: Use _smp_mflags instead of _NPROCESSORS_ONLN
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
5dd93d7de1 ceph.spec.in: selinux by default on RHEL/Fedora, non-default on SUSE
Surround it with an appropriate conditional.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
9e226a8081 ceph.spec.in: use %fillup_only macro in SLE/openSUSE
SUSE does not allow /etc/sysconfig/ceph to be owned by the ceph
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
2c6977cd5f ceph.spec.in: distro-conditional groupadd and useradd
The -o option to groupadd/useradd is not recognized in SLE12. For
SLE/openSUSE, follow the openSUSE packaging guidelines.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:40 +02:00
Nathan Cutler
0dd9313628 ceph.spec.in: move systemd-tmpfiles stuff to ceph-common
Since the ceph user and group are created in the ceph-common
%pre scriptlet, the systemd-tmpfiles --create command needs
to run in that package.

tracker.ceph.com/issues/13346 Fixes: #13346

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:38 +02:00
Nathan Cutler
d58d885dac ceph.spec.in: remove SUSE-specific curses hack
Unclear what this was supposed to fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:33:57 +02:00
Nathan Cutler
bf9ca1eb10 ceph.spec.in: lttng in SLES12 only
Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
build targets. The lttng/babeltrace stuff is currently available only in
SLE_12.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
50567b4964 ceph.spec.in: drop %insserv_prereq (obsoleted by systemd)
The %post, etc. scriptlets are no longer calling %insserv, et al.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
c84722a9a6 ceph.spec.in: fix boost-random build dependency for SLE/openSUSE
In Fedora, RHEL and CentOS there is a package called boost-random.
In SLE/openSUSE, there is no such package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:33:26 +02:00
Sage Weil
42a2c340e1 Merge pull request #6142 from ceph/wip-13061
ceph.spec.in: Do not always restart the daemons on upgrades/removal

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-10-05 16:12:57 -04:00
Nathan Cutler
929e5d04a0 ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7b1882f875)
2015-10-02 21:24:09 +02:00
Boris Ranto
b9159521f4 ceph.spec.in: Do not always restart the daemons on removal
There is no need to restart the daemons when removing ceph-selinux
package if SELinux is not enabled.

Fixes: #13061
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:14 +02:00
Boris Ranto
c95c14ba25 ceph.spec.in: Do not always restart the daemons on upgrades
This patch minimizes the amount of daemon stop/start procedures when
upgrading ceph-selinux package. With this patch, the daemons get
restarted only if SELinux is enabled and the SELinux policy version
changed in the meantime.

Fixes: #13061
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:07 +02:00