]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoFix ceph --version (bnc#954116) SES2-GM rrygrvmctuzz-build-me ses2-gm
Nathan Cutler [Sun, 8 Nov 2015 08:29:19 +0000 (09:29 +0100)]
Fix ceph --version (bnc#954116)

SUSE/ceph.git was missing the new v0.94.4 and v0.94.5 tags, so
ceph --version was showing 0.94.3-... instead of 0.94.5-...

This is a technical commit that can be discarded in the next rebase.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoosd: remove unnecessary CMPEXT locking comment
David Disseldorp [Fri, 9 Oct 2015 11:56:46 +0000 (13:56 +0200)]
osd: remove unnecessary CMPEXT locking comment

COMPARE AND WRITE operations are implemented by the kernel RBD client
using compound cmpext + write OSD requests. Such requests are handled
by OSDs in a serialized fashion, ensuring that no extra locking is
required for object atomicity; (bnc#948986).

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 5993e81d5d73a137783e39df620d5a32c58e6d8f)

9 years agoceph.spec.in: Comment out fedora-specific patch
Nathan Cutler [Thu, 8 Oct 2015 11:29:39 +0000 (13:29 +0200)]
ceph.spec.in: Comment out fedora-specific patch

This satisfies maintenance's check script.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 90e321236bb6a47a880039cca55ac06bbb45d9d3)

9 years agoosd: add write same op
Mike Christie [Wed, 29 Jul 2015 09:25:46 +0000 (04:25 -0500)]
osd: add write same op

This goes with kernel patches:
    libceph: add support for write same requests
    rbd: add support for writesame requests

This adds a new ceph request writesame. Write a buffer of length
writesame.data_length bytes at writesame.offset over writesame.length
bytes.

On the kernel rbd client side, we map this command to the SCSI
WRITE_SAME request.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 801c01415873b1b52fa53bfcd6a2653bc09a2c25)

9 years agoceph.spec.in: grant radosgw fscaps (bnc#943471)
Nathan Cutler [Sat, 19 Sep 2015 18:24:31 +0000 (20:24 +0200)]
ceph.spec.in: grant radosgw fscaps (bnc#943471)

Use full radosgw path for set_permissions (the %set_permissions macro expands
into a "/usr/bin/chkstat --system" call, which requires the radosgw binary path
as a parameter to take effect).

Do not add fscap if system security profile is "paranoid".

Set ownership and file mode bits of radosgw binary.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
Signed-off-by: David Disseldorp <ddiss@suse.de>
9 years agoExtend rcceph to mange rgw
Owen Synge [Tue, 15 Sep 2015 16:16:59 +0000 (18:16 +0200)]
Extend rcceph to mange rgw

rgw also started and stopped enabled etc using one command.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit c78420419bf5f8e5b0109cde244a3b0def5dd278)

9 years agoceph.spec.in: Move net-tools BuildRequires back where it belongs
Nathan Cutler [Wed, 9 Sep 2015 13:56:30 +0000 (15:56 +0200)]
ceph.spec.in: Move net-tools BuildRequires back where it belongs

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit b414411620026f470f6598722c6d61005713d97f)

9 years agoceph.spec.in: use /bin/bash to interpret %postun scripts
Nathan Cutler [Wed, 9 Sep 2015 06:06:27 +0000 (08:06 +0200)]
ceph.spec.in: use /bin/bash to interpret %postun scripts

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 8b88b992e19685df9b0758af43aa1f1235899db1)

9 years agorgw: bypass civetweb dynamic ssl load and link libraries directly
Karol Mroz [Mon, 7 Sep 2015 23:14:27 +0000 (16:14 -0700)]
rgw: bypass civetweb dynamic ssl load and link libraries directly

dlopen() calls in civetweb are guarded by the NO_SSL_DL compiler flag.
Setting this during build, and linking the necessary libraries directly,
simplifies cases of differing library names/versions/locations/etc.
Fixes bsc#942874

(cherry picked from commit cf9e0229f3e54bff24a8f423bea2c430c1e0dfe0)

9 years agospec: add ssl requirements
Karol Mroz [Mon, 7 Sep 2015 22:42:14 +0000 (15:42 -0700)]
spec: add ssl requirements

Needed to directly link ssl and crypto libraries for civetweb and rgw.

Signed-off-by: Karol Mroz <kmroz@suse.com>
(cherry picked from commit 1f0d1c151097f18384ac4db96c98a22ead9cb7a0)

Conflicts:
ceph.spec.in
            conditionals

9 years agoceph.spec.in: enable OBS post-build-checks to find systemd-tmpfiles
Nathan Cutler [Tue, 6 Oct 2015 10:25:52 +0000 (12:25 +0200)]
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>
(cherry picked from commit 800d97461063b63b30f3cdc51eada6b3966a884c)

9 years agoetc/sysconfig/ceph: add CEPH_AUTO_RESTART_ON_UPGRADE
Nathan Cutler [Sat, 3 Oct 2015 10:04:33 +0000 (12:04 +0200)]
etc/sysconfig/ceph: add CEPH_AUTO_RESTART_ON_UPGRADE

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 498578dba84de61781fc437c074d3088410905d3)

9 years agoceph.spec: install /etc/sysconfig/ceph
Sage Weil [Fri, 4 Sep 2015 02:21:38 +0000 (22:21 -0400)]
ceph.spec: install /etc/sysconfig/ceph

Make it easy to enable jemalloc, too.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c8bfc354e108a159f6c9a79086c6dbd2fde0c9aa)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: Standardize systemd preun and postun scripts
Nathan Cutler [Tue, 8 Sep 2015 08:09:35 +0000 (10:09 +0200)]
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>
(cherry picked from commit f8895fc70b4ad51bce975dfc5b3574a39e7278e8)

9 years agoceph.spec.in: use %fillup_only macro in SLE/openSUSE
Nathan Cutler [Sat, 3 Oct 2015 07:05:03 +0000 (09:05 +0200)]
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>
(cherry picked from commit 9e226a808101c186ff3f32ede2a5cc1ad7da4128)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: Use _smp_mflags instead of _NPROCESSORS_ONLN
Nathan Cutler [Fri, 2 Oct 2015 13:30:41 +0000 (15:30 +0200)]
ceph.spec.in: Use _smp_mflags instead of _NPROCESSORS_ONLN

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit db4727f943a5517dd69b27b364f197cc22e51e19)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: fix for out-of-memory errors in OBS
Nathan Cutler [Fri, 2 Oct 2015 10:15:08 +0000 (12:15 +0200)]
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>
(cherry picked from commit 404ffab739c7646d8d4ff5d52f0728e0883ac91b)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: move systemd-tmpfiles stuff to ceph-common
Nathan Cutler [Fri, 2 Oct 2015 21:23:17 +0000 (23:23 +0200)]
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>
(cherry picked from commit 0dd9313628da1385b16fb02169101103aa3d0497)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: remove SUSE-specific curses hack
Nathan Cutler [Fri, 2 Oct 2015 09:01:44 +0000 (11:01 +0200)]
ceph.spec.in: remove SUSE-specific curses hack

Unclear what this was supposed to fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d58d885dacb59010d204368f200cecd8a0461a6a)

9 years agoceph.spec.in: drop %insserv_prereq (obsoleted by systemd)
Nathan Cutler [Tue, 29 Sep 2015 22:08:04 +0000 (00:08 +0200)]
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>
(cherry picked from commit 50567b49644f253180f0b570d2fb98ca7d1e72fe)

9 years agoWrap changes for key retrieval in one method
Joshua Schmid [Fri, 28 Aug 2015 10:59:29 +0000 (12:59 +0200)]
Wrap changes for key retrieval in one method

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit 9c2eea1e4327ea1a9d48a5eacb042820b940d215)

9 years agoceph.spec.in: finish dropping obsolete sysvinit code (bnc#943067)
Nathan Cutler [Thu, 27 Aug 2015 08:45:46 +0000 (10:45 +0200)]
ceph.spec.in: finish dropping obsolete sysvinit code (bnc#943067)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9c820386ec1491038129239db7456ab914575978)

Conflicts:
ceph.spec.in

9 years agoAdd modularity to key-retrieval.
Joshua Schmid [Tue, 25 Aug 2015 14:12:15 +0000 (16:12 +0200)]
Add modularity to key-retrieval.

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit 7dd64c70bcb8d986568d6f379a6fbf9a0e40a441)

9 years agoWait for network to become ready to avoid early key retrieval.
Joshua Schmid [Tue, 25 Aug 2015 09:55:36 +0000 (11:55 +0200)]
Wait for network to become ready to avoid early key retrieval.

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit 5a0718dd0a7f4b6f075f33de0301c47bf5e9921b)

9 years agoChange udev files for systemd (adapt dmcrypt+luks journal TYPE)
Joshua Schmid [Tue, 25 Aug 2015 09:53:28 +0000 (11:53 +0200)]
Change udev files for systemd (adapt dmcrypt+luks journal TYPE)

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit 18a6b23df3b2fa5e8b69ed14f7a2af5e9c1faf40)

9 years agoenable dmcrypt-plain and luks and add key-server to retrieve keys
Joshua Schmid [Thu, 13 Aug 2015 13:57:55 +0000 (15:57 +0200)]
enable dmcrypt-plain and luks and add key-server to retrieve keys

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit fee26890c24bd3a7b8865295546297e3f144e6d0)

9 years agoosd.rules.systemd: add entries to handle LUKS partitions
David Disseldorp [Sun, 9 Aug 2015 20:49:25 +0000 (22:49 +0200)]
osd.rules.systemd: add entries to handle LUKS partitions

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit c3df07b6f9ab24977db891c70c4fb01a69512c7c)

9 years agoceph-disk: fix dmcrypt_map() usage for LUKS activate
David Disseldorp [Sun, 9 Aug 2015 15:52:32 +0000 (17:52 +0200)]
ceph-disk: fix dmcrypt_map() usage for LUKS activate

29431944c77adbc3464a8faeb7e052b24f821780 added a call to dmcrypt_map()
during disk activation. The change is not suitable for use alongside
the recently added dmcrypt LUKS support, because:
- The callers don't correctly provide cryptsetup_parameters or luks
  arguments.
- dmcrypt_map() calls LuksFormat, which should never be performed
  during disk activation.
- The key file paths don't carry the luks suffix when required.

This commit addresses these issues. Corresponding tests and a udev file
update will follow.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 507fd24b87d0e0757d98cca01b04d6479e5cc3f5)

9 years agorbdnamer: drop unneccessary tr usage
David Disseldorp [Fri, 7 Aug 2015 17:30:43 +0000 (19:30 +0200)]
rbdnamer: drop unneccessary tr usage

tr is not present by default in Dracut generated initramfs images. The
same logic can anyhow be performed via the existing sed call.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit b98b104829abec3e1965f233c8a18ab8c926ccb9)

9 years agoceph.spec: install the new systemd-based udev rules from ddiss
Sage Weil [Fri, 31 Jul 2015 19:16:30 +0000 (15:16 -0400)]
ceph.spec: install the new systemd-based udev rules from ddiss

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8a67561220e47392a13df14a34cbd23b4c85629a)
[ddiss@suse.de: rebase against SES2 spec file]

9 years agoceph.spec: ship ceph-disk-* units
Sage Weil [Thu, 30 Jul 2015 13:41:35 +0000 (09:41 -0400)]
ceph.spec: ship ceph-disk-* units

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e034c2af43385389210616be211f659c4d608e7f)
[ddiss@suse.de: rebase against SES2 spec file]

Conflicts:
ceph.spec.in

9 years agosystemd: activate disks via systemd service instead of udev
David Disseldorp [Mon, 11 May 2015 23:45:34 +0000 (01:45 +0200)]
systemd: activate disks via systemd service instead of udev

The udev(7) man page states:
  RUN
  ...
  This can only be used for very short-running foreground tasks. Running
  an event process for a long period of time may block all further
  events for this or a dependent device.

  Starting daemons or other long-running processes is not appropriate
  for udev; the forked processes, detached or not, will be
  unconditionally killed after the event handling has finished.

ceph-disk activate is far from a short-running task:
- check whether path is a block dev, for dirs call through to
  activate_dir()
- call blkid to obtain the filesystem type for the block dev
- pull mount options from hard-coded ceph.conf file
- mount the OSD dev at a temporary path
- check the ceph magic for mounted filesystem
- read cluster uuid and locate corresponding /etc/ceph/{cluster}.conf
  path
- read or generate (if missing) the OSD uuid
- create a file indicating init system usage (systemd)
- mount the device at a second (final) location
- umount (lazy) the temporary mount path
- enable the systemd ceph-osd@{osd_id} service
- start the systemd ceph-osd@{osd_id} service

This logic is therefore best left in a systemd service for execution. As
it is less limited in terms of execution time, and also allows for
improved event handling in future (fsck, dmcrypt mapping etc.).

This change sees 95-ceph-osd.rules.systemd trigger ceph-disk activate or
ceph-disk activate-journal via new ceph-disk-activate-journal@.service,
ceph-disk-activate@.service and ceph-disk-dmcrypt-activate@.service
systemd service files.

ceph-disk-dmcrypt-activate@.service makes use of the newly added
--dmcrypt parameter for ceph-disk activate.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 85a894697e6be1240567f10ba2415eb45e58b22c)
[ddiss@suse.de: rebase without systemd/Makefile.am]

9 years agoceph-disk: map dmcrypt devices prior to activation
David Disseldorp [Tue, 12 May 2015 15:07:30 +0000 (17:07 +0200)]
ceph-disk: map dmcrypt devices prior to activation

Support mapping of dmcrypt devices during activation via the new
ceph-disk activate[-journal] --dmcrypt and --dmcrypt-key-dir parameters.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 29431944c77adbc3464a8faeb7e052b24f821780)

9 years agoceph-disk: split get_dmcrypt_key_path from key creation
David Disseldorp [Wed, 13 May 2015 10:58:50 +0000 (12:58 +0200)]
ceph-disk: split get_dmcrypt_key_path from key creation

In preparation for mapping dmcrypt cyphertext devs during activation.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 4fd9cf2710672732253a4062d2b14263b59a29f6)

9 years agoceph-disk: add --log-stdout parameter
David Disseldorp [Tue, 12 May 2015 12:08:16 +0000 (14:08 +0200)]
ceph-disk: add --log-stdout parameter

This can be used when ceph-disk is run by systemd services, to ensure
that output is captured in the journal.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 6cfb4b35ea13f7953d25bf0d2baae75bfe3fb5d0)

9 years agoceph.spec.in: put distro conditional around Group:
Nathan Cutler [Sat, 1 Aug 2015 07:30:59 +0000 (09:30 +0200)]
ceph.spec.in: put distro conditional around Group:

Neither RHEL and Fedora require a Group: line, so retain
only for SLE/openSUSE (and set the right value for these distros)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1c522be10993282842b403260478bcc4adbc445f)

9 years agoceph.spec.in: fix License line
Nathan Cutler [Thu, 3 Sep 2015 18:30:50 +0000 (20:30 +0200)]
ceph.spec.in: fix License line

This is closer to my reading of
https://github.com/ceph/ceph/blob/master/COPYING than the previous version.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ef7418421b3748c712019c8aedd02b8005c1e1ea)

9 years agoosd: fix CMPEXT tracepoint call
David Disseldorp [Thu, 30 Jul 2015 12:39:48 +0000 (14:39 +0200)]
osd: fix CMPEXT tracepoint call

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 9ded6e876dcbdfef60f076d689f514973db9f9e8)

9 years agotracing: add missing tracepoints for writesame and extent_cmp
David Disseldorp [Thu, 30 Jul 2015 12:17:25 +0000 (14:17 +0200)]
tracing: add missing tracepoints for writesame and extent_cmp

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit a360b852de3e79616e77e9edef462ac7a27a23ff)

9 years agoosd: add new extent comparison op
Mike Christie [Wed, 29 Jul 2015 09:25:45 +0000 (04:25 -0500)]
osd: add new extent comparison op

This goes with kernel patch
    libceph: add support for CMPEXT compare extent requests
and
    rbd: add support for COMPARE_AND_WRITE/CMPEXT

This adds support for the CMPEXT request. The request will compare
extent.length bytes and compare them to extent.length bytes at
extent.offset on disk. If there is a miscompare the osd will return
-EILSEQ, the offset in the buffer where it occurred, and the buffer.

This op is going to be used for SCSI COMPARE_AND_WRITE support. For this
SCSI command, we are required to atomically do the CMPEXT operation and if
successful do a WRITE operation. The kernel rbd client is sending those
two ops in a multi op request.

Note: I am still working on the locking for this operation. Is there
a local lock I can take?

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 54fbbe64754d2641c84605159122168ecd144bec)

9 years agoceph.spec.in: test %preun argument is zero for removal-only operations
Nathan Cutler [Thu, 13 Aug 2015 13:36:02 +0000 (15:36 +0200)]
ceph.spec.in: test %preun argument is zero for removal-only operations

The %preun section now contains logic for disabling and stopping all the
Ceph systemd units when the ceph package is removed. However, there is no
conditional around it, so the units are disabled and stopped on RPM upgrade
as well as removal.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 6c803cdf4230a3ce51f1ceb05ed3d08fa1f981ec)

Conflicts:
ceph.spec.in
            prefer upstream version

9 years agoceph.spec.in: fix lttng/babeltrace conditionals
Nathan Cutler [Wed, 15 Jul 2015 10:54:20 +0000 (12:54 +0200)]
ceph.spec.in: fix lttng/babeltrace conditionals

lttng and babeltrace are build dependencies for rbd-replay-prep. However, they
are available only in SLE12, not in openSUSE.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 34c72f85410b362314ba130ae6bb7c1df2e70fe6)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: fix babeltrace handling on SUSE
Nathan Cutler [Fri, 10 Jul 2015 08:12:22 +0000 (10:12 +0200)]
ceph.spec.in: fix babeltrace handling on SUSE

Since we BuildRequire: babeltrace-devel, autoconf will see that babeltrace
is available during the build, and make will build/install the rbd-replay-prep
utility.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 80f3c95b60f49f782c3d4c03974fadf66b6d03f5)

9 years agoceph.spec.in: fix 95-ceph-osd.rules installation
Nathan Cutler [Fri, 10 Jul 2015 06:28:16 +0000 (08:28 +0200)]
ceph.spec.in: fix 95-ceph-osd.rules installation

The 95-ceph-osd.rules files was not getting installed properly on SUSE to a
faulty conditional.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit f83d9477eecd85ec43e526e3497c1261f7fd510e)

9 years agoceph.spec.in: remove duplicate ceph-osd-prestart.sh
Nathan Cutler [Thu, 9 Jul 2015 19:18:31 +0000 (21:18 +0200)]
ceph.spec.in: remove duplicate ceph-osd-prestart.sh

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6b76cec554c1c616ae414d745e5e04167a921d89)

9 years agosystemd/tmpfiles.d_ceph-rgw.conf: add missing file
Nathan Cutler [Thu, 9 Jul 2015 17:32:27 +0000 (19:32 +0200)]
systemd/tmpfiles.d_ceph-rgw.conf: add missing file

After the rebase to 0.94.2 this file was missing.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 05a313bd1a4269e3906953436b7c2b99ff840535)

9 years agoceph.spec.in: add a bcond_with for jemalloc
Owen Synge [Wed, 24 Jun 2015 18:16:54 +0000 (20:16 +0200)]
ceph.spec.in: add a bcond_with for jemalloc

jemalloc like tcmalloc is a high performance replacement for glibc malloc.
Which is better for ceph can only be told via benchmarks and testing.
This patch makes it easer to test this as an rpm install.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 7b24b9bfc0a49c9eac6f07eee4d5a52eceddbb34)

Conflicts:
ceph.spec.in
            _udevrulesdir

9 years agoceph.spec.in:Add %bcond_with librocksdb
Owen Synge [Wed, 24 Jun 2015 17:28:41 +0000 (19:28 +0200)]
ceph.spec.in:Add %bcond_with librocksdb

librocksdb is an experimental feature that is not by default enabled in configure.

Therefore if some one wants to enable it in the spec file they should enable it in the build rpm flags also.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit e600743330336a5d7d0c68dd4c8eee2193723eb1)

9 years agoceph.spec.in: systemd-related mods to ceph and ceph-common %files
Nathan Cutler [Thu, 9 Jul 2015 13:45:33 +0000 (15:45 +0200)]
ceph.spec.in: systemd-related mods to ceph and ceph-common %files

without introducing duplicate %{_initrddir}/ceph

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 897815774b2c8eb76503628ff3b82092b24effed)

Conflicts:
ceph.spec.in
            refrain from duplicating %{_sbindir}/rcceph

9 years agoceph.spec.in: systemd-ify radosgw
Nathan Cutler [Thu, 9 Jul 2015 13:14:48 +0000 (15:14 +0200)]
ceph.spec.in: systemd-ify radosgw

without introducing a second %preun radosgw

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6d7a07203da2fc268a9c51246694f693389b4426)

Conflicts:
ceph.spec.in
            omit old sysvinit stuff

9 years agoceph.spec.in: add systemd %pre, %post, and %preun scripts
Nathan Cutler [Thu, 9 Jul 2015 12:53:06 +0000 (14:53 +0200)]
ceph.spec.in: add systemd %pre, %post, and %preun scripts

Signed-off-by: Owen Synge <osynge@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 58c1fdedfae0dd7b5734d0d760efd73089a2df08)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: systemd/sysvinit installs
Nathan Cutler [Thu, 9 Jul 2015 12:03:22 +0000 (14:03 +0200)]
ceph.spec.in: systemd/sysvinit installs

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 321708f426b2b11df0bc18ca9af93287dd84b767)

Conflicts:
ceph.spec.in
            Always install /etc/ceph/rbdmap

9 years agoceph.spec.in: use MAKE_JOBS for make check-local, too
Nathan Cutler [Thu, 9 Jul 2015 11:57:01 +0000 (13:57 +0200)]
ceph.spec.in: use MAKE_JOBS for make check-local, too

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3f50c1983c178960991ccbad6f63163e9522d3f0)

9 years agoceph.spec.in: do not run %debug_package
Nathan Cutler [Thu, 9 Jul 2015 11:44:40 +0000 (13:44 +0200)]
ceph.spec.in: do not run %debug_package

And remove superfluous 0%{?opensuse} conditionals.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e8dd6f0fc82286559938eec7e848ccbcdce83516)

9 years agoceph.spec.in: clean up suse_version conditionals
Nathan Cutler [Thu, 9 Jul 2015 11:42:50 +0000 (13:42 +0200)]
ceph.spec.in: clean up suse_version conditionals

Use 0%{?suse_version} throughout for consistency.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 75f2a983211668bd127336ff07d447a0f5525734)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: make systemd a BuildRequires as well as a Requires
Nathan Cutler [Thu, 2 Jul 2015 15:15:35 +0000 (17:15 +0200)]
ceph.spec.in: make systemd a BuildRequires as well as a Requires

Factory and Tumbleweed builds attempt to run systemd-tmpfiles -- probably
because they run %post -- and were failing with "command not found".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fa9d84913f4289f211f4e97950f9c6538db77a67)

9 years agobuildtool:define variable for setting make jobs
Owen Synge [Fri, 15 May 2015 01:01:39 +0000 (03:01 +0200)]
buildtool:define variable for setting make jobs

OBS build hosts are memory-limited, limiting the jobs to 6 prevents build errors.
Original work by Thorsten

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit ea851029823c335bde2c70f684fc2bb307f5037d)
(cherry picked from commit 351b2b7a418b4dad3271c4eec1830d4f4bf32cdf)

9 years agoceph.spec.in: strip out all instances of %{epoch}:
Nathan Cutler [Thu, 9 Jul 2015 10:20:59 +0000 (12:20 +0200)]
ceph.spec.in: strip out all instances of %{epoch}:

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7ec18822f33bd30df04463dd9d02cde90d71986b)

Conflicts:
ceph.spec.in
            missing -{%release} in libradosstriper1 requires

9 years agoceph.spec.in: add SUSE header boilerplate
Nathan Cutler [Thu, 9 Jul 2015 09:15:31 +0000 (11:15 +0200)]
ceph.spec.in: add SUSE header boilerplate

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fe7d760c15e035f46ed0e4f2456ea4d9da475d2f)

9 years agoceph.spec.in: move specific BuildRequires to where they belong
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>
(cherry picked from commit e1cb7e51041c4e646ac9b9b32a525ec0bbd46149)

Conflicts:
     ceph.spec.in
         reinstated missing libbz2-devel build dependency

9 years agoceph.spec.in: remove the right stray %endif
Nathan Cutler [Thu, 2 Jul 2015 16:26:11 +0000 (18:26 +0200)]
ceph.spec.in: remove the right stray %endif

While making sure CentOS, etc. get their proper BuildRequires.

This replaces upstream commits f94f23275e87a2 and 34e4dd9.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9a83b0ac268704f01a42ef952502722f5f852d0e)

9 years agoAdd rpm conditionals : libs_compat
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>
(cherry picked from commit c6c3a3bca2078f5dbd991a5062f9f2f4e66cca35)

9 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>
(cherry picked from commit d8abde3338b0c7df373b762e35099ad5123866bf)

9 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>
(cherry picked from commit 5747ea1910c842cf8db38bdff367c3ca150ddaf6)

9 years agoceph.spec.in summary-ended-with-dot
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>
(cherry picked from commit 042e8ff4dc71795d957bbfac12fade2bc0fc4674)

9 years agoceph.spec.in libcephfs_jni1 has no %post and %postun
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>
(cherry picked from commit 0742d82b5561634a5f4ed73fc6cbe4d4f26b0d42)

9 years agoTemplate systemd/ceph-osd@.service with autotools,
Owen Synge [Tue, 26 May 2015 17:02:36 +0000 (19:02 +0200)]
Template systemd/ceph-osd@.service with autotools,

The libexec path is different for different distributions.
systemd. This path is defined by a new variable on the
configure path.

This variable can be set with enviroment SYSTEMD_LIBEXEC_DIR.
The parameter --with-systemd-libexec-dir overrides the enviroment
variable.

Appropriate conditionals are set for SUSE and RHEL derivatives.

This is then used to template out systemd/ceph-osd@.service

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit ac347dc3402a50fa0ba8c04cf2f93c36283eca87)

Conflicts:
configure.ac
            do not include doc/Makefile

9 years agoceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead
Ken Dreyer [Mon, 16 Mar 2015 16:02:35 +0000 (10:02 -0600)]
ceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead

Fedora 12 has been EOL for a long time. Remove the reference in the
RPM .spec file.

Since RHEL 5 support for Ceph is a work in progress, we won't remove
this entire python_sitelib / python_sitearch conditional for now, since
those are still needed on RHEL 5.

Add the rhel_version macro to make the conditional compatible with
SUSE's OBS.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 353a3258968f76deaea4542d2165e9ab32b88de8)

9 years agoceph.spec.in: add missing -%{release}
Nathan Cutler [Thu, 9 Jul 2015 10:05:24 +0000 (12:05 +0200)]
ceph.spec.in: add missing -%{release}

We have it everywhere else and I can't think of any reason why
it should be omitted here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d952d59ae95d5f66aa4b98fd7aa4f4ecb36a4848)

9 years agoceph.spec.in: remove duplicate BuildRequires: sharutils
Nathan Cutler [Fri, 26 Jun 2015 18:21:59 +0000 (20:21 +0200)]
ceph.spec.in: remove duplicate BuildRequires: sharutils

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c418bd9615e6f23f3c14ae9e71003c66d31d4b78)

Conflicts:
        ceph.spec.in

9 years agoceph.spec.in: fix python-flask dependency for SUSE
Nathan Cutler [Mon, 15 Jun 2015 10:58:00 +0000 (12:58 +0200)]
ceph.spec.in: fix python-flask dependency for SUSE

In SLE and openSUSE, the package is called python-Flask with an upper-case F.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490)

Conflicts:
ceph.spec.in
            add missing SUSE-specific build deps

9 years agoceph.spec.in: clarify two important comments
Nathan Cutler [Thu, 25 Jun 2015 16:55:39 +0000 (18:55 +0200)]
ceph.spec.in: clarify two important comments

First, the terms "common" and "specific" are vague. Second,
"common" can easily be confused with the ceph-common subpackage.

Fix this by rephrasing to "distro-unconditional dependencies" and
"distro-conditional dependencies", respectively.

Third, move the "distro-unconditional dependencies" header so it
is above the part where these dependencies are actually defined.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit dd212fd1d367f70c61f65a97599959668b44aa53)

Conflicts:
ceph.spec.in

9 years agoceph.spec.in: rm reference to EOL Fedoras (< 20)
Ken Dreyer [Wed, 24 Jun 2015 22:37:58 +0000 (16:37 -0600)]
ceph.spec.in: rm reference to EOL Fedoras (< 20)

Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20.
"%{fedora}" effectively implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit f3e4a91c458ca7b11706fe4608cb739499f5d3cc)

Conflicts:
ceph.spec.in
           added xmlstarlet dependency to ceph-test package

9 years agoceph.spec.in: package rbd-replay-prep on all Fedoras
Ken Dreyer [Wed, 24 Jun 2015 22:39:30 +0000 (16:39 -0600)]
ceph.spec.in: package rbd-replay-prep on all Fedoras

This reverts the change in commit
85517d611b7bf4cb6cbffcd2c65303be0d038264. Since we BuildRequire:
libbabeltrace-devel, autoconf will see that babeltrace is available
during the build, and make will build/install the rbd-replay-prep
utility.

This change also simplifies Fedora selection logic, because Fedora 19 is
EOL, so "%{fedora}" implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 2db9480fa2646de776f0076d82747e202e574ddd)

9 years agoceph.spec.in: rbd-replay-prep is not being built on f21+
Boris Ranto [Tue, 16 Jun 2015 21:07:04 +0000 (23:07 +0200)]
ceph.spec.in: rbd-replay-prep is not being built on f21+

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 85517d611b7bf4cb6cbffcd2c65303be0d038264)

9 years agoceph.spec.in:BuildRequires sharutils
Owen Synge [Mon, 8 Jun 2015 15:48:55 +0000 (17:48 +0200)]
ceph.spec.in:BuildRequires sharutils

The uudecode binary is used to build Java-related components, and
uudecode is provided by the sharutils package on all supported
RPM platforms. When building with "--without=cephfs_java",
sharutils is not needed.

Thanks to Nathan Cutler <ncutler@suse.cz> for going into the
details with me.

On OBS without this patch we get the error message:

[  170s] -----------------------------------------------------------------
[  170s] ----- building ceph.spec (user abuild)
[  170s] -----------------------------------------------------------------
[  170s] -----------------------------------------------------------------
[  170s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/home:osynge:ceph:wip:wip_obs_fedora/Fedora_20/c0bbbc1e62228ca956ac3d367edc4fba-master' /home/abuild/rpmbuild/SOURCES/ceph.spec
[  170s] error: Failed build dependencies:
[  170s]    sharutils is needed by ceph-1:2+git.1435043747.c1bd02c-1.1.x86_64

With this patch we can build fedora 22 and fedora 20 rpms fine.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 43c1784640538b813f0575c50f721ac911a30b3e)

Conflicts:
ceph.spec.in
            _with_systemd -> trivial resolution

9 years agoceph.spec.in: fix:Add missing directories breaking build
Owen Synge [Wed, 10 Jun 2015 10:11:50 +0000 (12:11 +0200)]
ceph.spec.in: fix:Add missing directories breaking build

SUSE builds on OBS are failing with the missing dir entries:

    /usr/share/ceph
    /usr/lib/ceph

On suse these correspond to:

    %dir %{_datarootdir}/ceph/
    %dir %{_libexecdir}/ceph/

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit f1ff3e4dcb5dd7eddd2c346a05cfa78d860a5ce6)

9 years agopackaging: make logrotate a hard dependency across all distros
Nathan Cutler [Thu, 25 Jun 2015 14:55:10 +0000 (16:55 +0200)]
packaging: make logrotate a hard dependency across all distros

Given ceph's reputation for voluminous logs, it makes sense for
logrotate to be a hard dependency for all distros.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0734cd1ec3ca3bd012686dc1bdda675909224a49)

Conflicts:
debian/control

9 years agoceph.spec.in: make /var/run/ceph conditional
Nathan Cutler [Thu, 9 Jul 2015 10:44:19 +0000 (12:44 +0200)]
ceph.spec.in: make /var/run/ceph conditional

/var/run/ceph should only be installed on Fedora, RH/CentOS, and
all supported SUSE distros that do not have systemd (e.g. SLE11-SP3).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1abaebd86956d159998560e78f18ac41bccb195b)

9 years agoceph.spec.in: fix _with_systemd conditional
Nathan Cutler [Thu, 2 Jul 2015 09:26:55 +0000 (11:26 +0200)]
ceph.spec.in: fix _with_systemd conditional

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 4dd1e67de5afbe147e898421df6635fd6273dd8b)

9 years agoceph.spec.in: consolidate centos/rhel macros
Nathan Cutler [Fri, 15 May 2015 19:39:39 +0000 (21:39 +0200)]
ceph.spec.in: consolidate centos/rhel macros

0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 46404dd381e240634d224e77adc69f0ba4807045)

Conflicts:
ceph.spec.in
            https://github.com/ceph/ceph/pull/4068 has not been backported

9 years agoceph.spec.in: include SUSE in _with_systemd
Nathan Cutler [Wed, 13 May 2015 12:57:48 +0000 (14:57 +0200)]
ceph.spec.in: include SUSE in _with_systemd

The master specfile newly defines a _with_systemd variable that should be true
for the set of distros that are using systemd. Since this set of distros
includes SUSE/openSUSE (at least for the more recent versions where ceph is
supported), this commit sets _with_systemdto true on SUSE/openSUSE.

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

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 61303656faa913880008e6a6a1725d2fd7002c1f)

Conflicts:
ceph.spec.in
            _udevrulesdir definition has been added -> trivial resolution

9 years agoceph.spec.in: set _with_systemd on RHEL 7 and Fedora
Ken Dreyer [Thu, 9 Apr 2015 17:10:52 +0000 (11:10 -0600)]
ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

Commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd added a "_with_systemd"
conditional to the RPMs, but I erred with the version comparison
operator, so this only applied to RHEL 8+, not RHEL 7+.

Adjust the conditional so that it will really apply to RHEL 7+. While
we're here, add Fedora as well.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Reported-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit aa88364f30e2d2f254ade185a83ba263b48e2a73)

9 years agopackaging: Add rgw placeholder dirs in proper packages
Travis Rhoden [Fri, 8 May 2015 00:13:53 +0000 (20:13 -0400)]
packaging: Add rgw placeholder dirs in proper packages

Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
(cherry picked from commit bf93128f664ac74383806530a1f974edde8df5b6)

9 years agoceph.spec.in: fix _with_systemd conditional
Ken Dreyer [Wed, 25 Mar 2015 18:16:03 +0000 (12:16 -0600)]
ceph.spec.in: fix _with_systemd conditional

The RPM conditional needs a "?" in the event that it is not defined.

(cherry picked from commit c5cf81dd91b5fceab2125e8cb435b2691f152e71)

9 years agoceph.spec.in: fix handling of /var/run/ceph
Ken Dreyer [Mon, 9 Mar 2015 20:14:57 +0000 (14:14 -0600)]
ceph.spec.in: fix handling of /var/run/ceph

Prior to this commit, we didn't install /var/run/ceph as a normal
directory. We used the %ghost directive and created the directory with
a "mkdir" command in %post.

This was lacking in several ways:

  1) Simplicy: there is no need to use %ghost; other packages (eg.
     mariadb) simply use a normal %dir for their socket directory.

  2) RPM does not have control over the permissions of the /var/run/ceph
     directory. This does not interact well with "rpm -V". Moreover,
     once Ceph itself gets unprivileged user support, RPM itself won't
     be able to set the permissions of the directory for a (future)
     unprivileged UID.

  3) On distributions that use systemd as an init system, /var/run is a
     symlink to /run, which is tmpfs. This means that /var/run/ceph does
     not persist across reboots on those systems.

Remove the %ghost directive; it makes more sense for RPM to simply
install this directory like the rest of the %files.

Add a "_with_systemd" conditional so we know which distros use systemd
as their init system.  Add the /etc/tmpfiles.d/ceph.conf file on those
distros. See
http://www.freedesktop.org/software/systemd/man/tmpfiles.d.html

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd)

Conflicts:
ceph.spec.in
            _udevrulesdir definition has been added -> trivial resolution

9 years agologrotate.conf: fixes for systemd
Nathan Cutler [Fri, 26 Jun 2015 11:13:33 +0000 (13:13 +0200)]
logrotate.conf: fixes for systemd

Before this patch, the command 'logrotate -f /etc/logrotate.d/ceph'
was generating an error "Failed to reload ceph.target: Job type reload is not
applicable for unit ceph.target".

Before we issue systemctl reload, check that there is at least
one active ceph-* service. (The hyphen is significant.)

Since we use grep, make the grep package a dependency.

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

Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 05424a803b817068f0a06b0ac6709aa8a8a3a717)

9 years agologrotate.conf: prefer service over invoke-rc.d
Sage Weil [Tue, 21 Apr 2015 23:08:09 +0000 (16:08 -0700)]
logrotate.conf: prefer service over invoke-rc.d

On trusty 14.04, service works but invoke-rc.d does not (but is present).

Fixes: #11330
Reported-by: Wim Heirman <wim@heirman.net>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6063a21f9edbbf80e44d45ff52a9f4ba1a1cb2c9)

9 years agoNew rich init system detection.
Owen Synge [Mon, 26 Jan 2015 15:20:20 +0000 (16:20 +0100)]
New rich init system detection.

Uses both a database and detecting management commands to find init system.
Logs error is one of these two systems fails.
Raises error if both systems disgree.

Testing notes:
- works on SLE12
- works on openSUSE 13.1
- works on Scientific 6.4
- works on debian 7.7 (wheezy)
- works on debian 8 (jessie)

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit a818d4327b29056cfdb4ad54872a65eb277efe7b)

9 years agoradosgw systemd support
Owen Synge [Wed, 7 Jan 2015 10:36:24 +0000 (11:36 +0100)]
radosgw systemd support

Added a radosgw systemd support and associated prestart script.
  - With improved checking over first revison.
  - ceph-radosgw-prestart.sh now installed in /usr/lib/ceph-radosgw

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit cd3cb8bb009a55a6eb6fe3c650b4611a33fab374)

9 years agoceph-osd-prestart.sh: check OSD exists.
Owen Synge [Tue, 6 Jan 2015 12:16:22 +0000 (13:16 +0100)]
ceph-osd-prestart.sh: check OSD exists.

if the directory ${dir_osd-/var/lib/ceph/osd/}/${cluster:-ceph}-${id}
does not exist fail with a clear error message.

https://bugzilla.suse.com/show_bug.cgi?id=895759 fixes # 895759

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 460ef1c25014060c14b9217224355ef3e1ca7284)

9 years agoFix overflowing journel partitions.
Owen Synge [Wed, 3 Dec 2014 11:32:34 +0000 (12:32 +0100)]
Fix overflowing journel partitions.

This fixes bnc#896406. When useing ceph-disk to create a journel
parititon in the next available partition and thier is not enough
space ceph-disk did not provide a clear error message.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 5690eb1c4d40ea3fd2e84894fa24400289357802)

9 years ago0.94.5 v0.94.5
Jenkins [Mon, 26 Oct 2015 14:05:32 +0000 (07:05 -0700)]
0.94.5

9 years agoMerge pull request #6348 from dillaman/wip-13567-hammer
Loic Dachary [Fri, 23 Oct 2015 18:41:33 +0000 (20:41 +0200)]
Merge pull request #6348 from dillaman/wip-13567-hammer

librbd: potential assertion failure during cache read

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6362 from liewegas/wip-shut-up-osd-hammer
Loic Dachary [Fri, 23 Oct 2015 13:20:32 +0000 (15:20 +0200)]
Merge pull request #6362 from liewegas/wip-shut-up-osd-hammer

osd/ReplicatedPG: remove stray debug line

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd/ReplicatedPG: remove stray debug line 6362/head
Sage Weil [Sat, 12 Sep 2015 12:33:44 +0000 (08:33 -0400)]
osd/ReplicatedPG: remove stray debug line

This snuck in

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ff9600a6cef613d40e875597b6392778df1bb04c)

9 years agolibrbd: potential assertion failure during cache read 6348/head
Jason Dillaman [Wed, 21 Oct 2015 17:12:48 +0000 (13:12 -0400)]
librbd: potential assertion failure during cache read

It's possible for a cache read from a clone to trigger a writeback if a
previous read op determined the object doesn't exist in the clone,
followed by a cached write to the non-existent clone object, followed
by another read request to the same object.  This causes the cache to
flush the pending writeback ops while not holding the owner lock.

Fixes: #13559
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4692c330bd992a06b97b5b8975ab71952b22477a)

9 years agotests: reproduce crash during read-induced CoW
Jason Dillaman [Wed, 21 Oct 2015 17:09:54 +0000 (13:09 -0400)]
tests: reproduce crash during read-induced CoW

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 382219b6bba09156f8cf3d420c6348738e7ed4c6)

9 years agoMerge pull request #6330 from dachary/wip-13550-hammer
Jason Dillaman [Thu, 22 Oct 2015 16:14:42 +0000 (12:14 -0400)]
Merge pull request #6330 from dachary/wip-13550-hammer

qemu workunit refers to apt-mirror.front.sepia.ceph.com

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa: Use public qemu repo 6330/head
Yuan Zhou [Thu, 18 Jun 2015 16:02:20 +0000 (00:02 +0800)]
qa: Use public qemu repo

This would allow some external tests outside of sepia lab

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
(cherry picked from commit 4731c1e35539c9506ff3fe3141553fad099d0eee)