Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
373a4fde21 | ||
|
8c6c0bc84b | ||
|
c124767d87 | ||
|
d2c3e8a99e | ||
|
58a926ad22 | ||
|
a127e04b4b | ||
|
4ded3cb8c5 | ||
|
94662be077 | ||
|
aa5aa9c8cf | ||
|
6f8a9b9b1f | ||
|
822933e3ed | ||
|
dd200ec89a | ||
|
8b22c27cbd | ||
|
989a021ac8 |
@ -1,4 +1,4 @@
|
||||
From 8b0b78dc06ae1ed1c5f3c7a13271e7037091d0be Mon Sep 17 00:00:00 2001
|
||||
From 8ac49f54ad774324c1de344cd18620df7fa52256 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 15 Apr 2015 14:06:24 +0200
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
@ -25,5 +25,5 @@ index 9ca4fbb..147d57e 100644
|
||||
libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
|
||||
libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
--
|
||||
2.1.0
|
||||
2.5.5
|
||||
|
||||
|
@ -1,33 +0,0 @@
|
||||
From b2781fb5638afae7438b983a912ede126a8c5b85 Mon Sep 17 00:00:00 2001
|
||||
From: James Page <james.page@ubuntu.com>
|
||||
Date: Fri, 13 Mar 2015 19:46:04 +0000
|
||||
Subject: [PATCH] Add support for PPC architecture, provide fallback
|
||||
|
||||
Add high precision cpu cycles support for powerpc and powerpc64.
|
||||
|
||||
Provide a fallback for other architectures and warn during
|
||||
compilation.
|
||||
|
||||
Signed-off-by: James Page <james.page@ubuntu.com>
|
||||
|
||||
diff --git a/src/common/Cycles.h b/src/common/Cycles.h
|
||||
index 6e47cde..bb47d5c 100644
|
||||
--- a/src/common/Cycles.h
|
||||
+++ b/src/common/Cycles.h
|
||||
@@ -72,8 +72,15 @@ class Cycles {
|
||||
uint64_t cntvct;
|
||||
asm volatile ("isb; mrs %0, cntvct_el0; isb; " : "=r" (cntvct) :: "memory");
|
||||
return cntvct;
|
||||
+#elif defined(__powerpc__) || defined (__powerpc64__)
|
||||
+ // Based on:
|
||||
+ // https://github.com/randombit/botan/blob/net.randombit.botan/src/lib/entropy/hres_timer/hres_timer.cpp
|
||||
+ uint32_t lo = 0, hi = 0;
|
||||
+ asm volatile("mftbu %0; mftb %1" : "=r" (hi), "=r" (lo));
|
||||
+ return (((uint64_t)hi << 32) | lo);
|
||||
#else
|
||||
-#error No high-precision counter available for your OS/arch
|
||||
+#warning No high-precision counter available for your OS/arch
|
||||
+ return 0;
|
||||
#endif
|
||||
}
|
||||
|
@ -0,0 +1,37 @@
|
||||
From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
|
||||
From: Anthony Alba <ascanio.alba7@gmail.com>
|
||||
Date: Mon, 30 Nov 2015 16:44:31 +0800
|
||||
Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
|
||||
|
||||
Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
|
||||
---
|
||||
src/init-ceph.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/init-ceph.in b/src/init-ceph.in
|
||||
index e4cea7e..1f19ffa 100644
|
||||
--- a/src/init-ceph.in
|
||||
+++ b/src/init-ceph.in
|
||||
@@ -288,7 +288,7 @@ for name in $what; do
|
||||
lockfile=""
|
||||
fi
|
||||
|
||||
- get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
|
||||
+ get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
|
||||
|
||||
case "$command" in
|
||||
start)
|
||||
@@ -404,8 +404,8 @@ for name in $what; do
|
||||
# these keys. it's also true for legacy installs
|
||||
# via mkcephfs, which is fine too; there is no harm
|
||||
# in creating these keys.
|
||||
- get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
|
||||
- if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
|
||||
+ get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
|
||||
+ if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
|
||||
echo Starting ceph-create-keys on $host...
|
||||
cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
|
||||
do_cmd "$cmd2"
|
||||
--
|
||||
2.5.5
|
||||
|
26
0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
Normal file
26
0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 16 May 2016 15:47:20 +0200
|
||||
Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
src/rocksdb/configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
|
||||
index 855c6a8..fe914aa 100644
|
||||
--- a/src/rocksdb/configure.ac
|
||||
+++ b/src/rocksdb/configure.ac
|
||||
@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
|
||||
AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
|
||||
AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
|
||||
AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
|
||||
-AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
|
||||
+AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
|
||||
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++11"
|
||||
--
|
||||
2.5.5
|
||||
|
@ -1,33 +0,0 @@
|
||||
From fdd728c0872b34d1b6f96ee5601b619748afc9e8 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 18 May 2015 20:27:56 +0200
|
||||
Subject: [PATCH] Skip initialization if rtdsc is not implemented
|
||||
|
||||
Patch by James Page. See
|
||||
|
||||
https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1432786
|
||||
|
||||
for more details.
|
||||
---
|
||||
src/common/Cycles.cc | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc
|
||||
index a2efcf3..a5367f7 100644
|
||||
--- a/src/common/Cycles.cc
|
||||
+++ b/src/common/Cycles.cc
|
||||
@@ -52,6 +52,11 @@ void Cycles::init()
|
||||
if (cycles_per_sec != 0)
|
||||
return;
|
||||
|
||||
+
|
||||
+ // Skip initialization if rtdsc is not implemented
|
||||
+ if (rdtsc() == 0)
|
||||
+ return;
|
||||
+
|
||||
// Compute the frequency of the fine-grained CPU timer: to do this,
|
||||
// take parallel time readings using both rdtsc and gettimeofday.
|
||||
// After 10ms have elapsed, take the ratio between these readings.
|
||||
--
|
||||
2.1.0
|
||||
|
32
0004-Apply-init-ceph.in-fedora.patch.patch
Normal file
32
0004-Apply-init-ceph.in-fedora.patch.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 16 May 2016 15:48:23 +0200
|
||||
Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
src/init-ceph.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/init-ceph.in b/src/init-ceph.in
|
||||
index 1f19ffa..78eaf97 100644
|
||||
--- a/src/init-ceph.in
|
||||
+++ b/src/init-ceph.in
|
||||
@@ -1,11 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
-# chkconfig: 2345 60 80
|
||||
+# chkconfig: - 60 80
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ceph
|
||||
-# Default-Start: 2 3 4 5
|
||||
-# Default-Stop: 0 1 6
|
||||
+# Default-Start:
|
||||
+# Default-Stop:
|
||||
# Required-Start: $remote_fs $named $network $time
|
||||
# Required-Stop: $remote_fs $named $network $time
|
||||
# Short-Description: Start Ceph distributed file system daemons at boot time
|
||||
--
|
||||
2.5.5
|
||||
|
36
0005-Workaround-xfs.h-check.patch
Normal file
36
0005-Workaround-xfs.h-check.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 16 May 2016 20:53:28 +0200
|
||||
Subject: [PATCH] Workaround xfs.h check
|
||||
|
||||
The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
|
||||
|
||||
http://www.spinics.net/lists/ceph-devel/msg29467.html
|
||||
|
||||
This should not be too critical and the package should build just fine
|
||||
anyway. Commenting out the bits that check for xfs.h should help us,
|
||||
here.
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d1f98aa..e068fdb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
|
||||
[with_libxfs=yes])
|
||||
AS_IF([test "x$with_libxfs" != "xno"], [
|
||||
# xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
|
||||
- AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
|
||||
- [xfs/xfs.h not found (--without-libxfs to disable)]))
|
||||
+ #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
|
||||
+ # [xfs/xfs.h not found (--without-libxfs to disable)]))
|
||||
AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
|
||||
AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
|
||||
#include <xfs/xfs.h>
|
||||
--
|
||||
2.5.5
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc ceph-0.94.1/src/rocksdb/configure.ac
|
||||
--- ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc 2015-06-08 14:03:27.000000000 +0200
|
||||
+++ ceph-0.94.1/src/rocksdb/configure.ac 2015-06-08 14:03:41.000000000 +0200
|
||||
@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress]
|
||||
AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
|
||||
AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
|
||||
AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
|
||||
-AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
|
||||
+AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
|
||||
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++11"
|
72
ceph.spec
72
ceph.spec
@ -11,23 +11,23 @@
|
||||
# common
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 0.94.1
|
||||
Release: 5%{?dist}
|
||||
Version: 0.94.7
|
||||
Release: 2%{?dist}
|
||||
Epoch: 1
|
||||
Summary: User space components of the Ceph file system
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: http://ceph.com/
|
||||
Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2
|
||||
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
|
||||
Patch0: init-ceph.in-fedora.patch
|
||||
%endif
|
||||
Source0: http://ceph.com/download/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-Disable-erasure_codelib-neon-build.patch
|
||||
Patch2: 0002-Add-support-for-PPC-arch.patch
|
||||
Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
|
||||
Patch2: 0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch
|
||||
Patch3: 0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
|
||||
Patch4: 0004-Apply-init-ceph.in-fedora.patch.patch
|
||||
Patch5: 0005-Workaround-xfs.h-check.patch
|
||||
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
|
||||
%endif
|
||||
# fix build without tcmalloc
|
||||
# https://github.com/ceph/rocksdb/pull/5
|
||||
Patch10: ceph-0.94.1-tcmalloc.patch
|
||||
Requires: librbd1 = %{epoch}:%{version}-%{release}
|
||||
Requires: librados2 = %{epoch}:%{version}-%{release}
|
||||
Requires: libcephfs1 = %{epoch}:%{version}-%{release}
|
||||
@ -427,13 +427,13 @@ python-cephfs instead.
|
||||
#################################################################################
|
||||
%prep
|
||||
%setup -q
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
|
||||
%patch0 -p1 -b .init
|
||||
%endif
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch10 -p1 -b .tcmalloc
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Find jni.h
|
||||
@ -492,7 +492,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
|
||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/rbd-replay-prep.8*
|
||||
# Install init scripts and other files
|
||||
install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
|
||||
install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
|
||||
install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
|
||||
install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
|
||||
install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
||||
@ -632,6 +632,7 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/ceph
|
||||
%{_mandir}/man8/ceph-deploy.8*
|
||||
%{_mandir}/man8/ceph-disk.8*
|
||||
%{_mandir}/man8/ceph-create-keys.8*
|
||||
%{_mandir}/man8/ceph-mon.8*
|
||||
%{_mandir}/man8/ceph-mds.8*
|
||||
%{_mandir}/man8/ceph-osd.8*
|
||||
@ -936,6 +937,49 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
|
||||
# actually build this meta package.
|
||||
|
||||
%changelog
|
||||
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-2
|
||||
- New release (1:0.94.7-2)
|
||||
- Workaround xfs.h check
|
||||
|
||||
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-1
|
||||
- New version (1:0.94.7-1)
|
||||
- Disable erasure_codelib neon build
|
||||
- init-ceph.in: Allow custom cluster names during startup.
|
||||
- Apply 'ceph-0.94.1-tcmalloc.patch'
|
||||
- Apply 'init-ceph.in-fedora.patch'
|
||||
|
||||
* Tue Feb 23 2016 Boris Ranto <branto@redhat.com> - 0.94.6-1
|
||||
- Rebase to version 0.94.6
|
||||
|
||||
* Wed Dec 09 2015 Boris Ranto <branto@redhat.com> - 1:0.94.5-2
|
||||
- Allow setting custom cluster names in init script (#1269436)
|
||||
|
||||
* Tue Oct 27 2015 Boris Ranto <branto@redhat.com> - 1:0.94.5-1
|
||||
- Rebase to latest upstream version
|
||||
|
||||
* Tue Oct 20 2015 Boris Ranto <branto@redhat.com> - 1:0.94.4-1
|
||||
- Rebase to latest upstream version
|
||||
- The rtdsc patch got merged upstream and is already present in the release
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1:0.94.3-2
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Thu Aug 27 2015 Boris Ranto <branto@redhat.com> - 1:0.94.3-1
|
||||
- Rebase to latest upstream version
|
||||
- The boost patch got merged upstream and is already present in the release
|
||||
|
||||
* Fri Jul 31 2015 Richard W.M. Jones <rjones@redhat.com> - 1:0.94.2-4
|
||||
- Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Thu Jul 23 2015 David Tardon <dtardon@redhat.com> - 1:0.94.2-2
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Thu Jul 16 2015 Boris Ranto <branto@redhat.com> - 1:0.94.2-1
|
||||
- Rebase to latest upstream version
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
@ -1,18 +0,0 @@
|
||||
diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
|
||||
--- ceph-0.46/src/init-ceph.in.orig 2012-04-24 16:06:39.000000000 -0400
|
||||
+++ ceph-0.46/src/init-ceph.in 2012-05-09 16:41:36.500004052 -0400
|
||||
@@ -1,11 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
-# chkconfig: 2345 60 80
|
||||
+# chkconfig: - 60 80
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ceph
|
||||
-# Default-Start: 2 3 4 5
|
||||
-# Default-Stop: 0 1 6
|
||||
+# Default-Start:
|
||||
+# Default-Stop:
|
||||
# Required-Start: $remote_fs $named $network $time
|
||||
# Required-Stop: $remote_fs $named $network $time
|
||||
# Short-Description: Start Ceph distributed file system daemons at boot time
|
Loading…
Reference in New Issue
Block a user