Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dan Horák
|
0a05e8b2a2 | ||
|
Josef Bacik
|
4707fdaea8 |
+10
-2
@@ -1,2 +1,10 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
ceph-0.20.tar.gz
|
||||
/ceph-0.21.3.tar.gz
|
||||
/ceph-0.25.1.tar.gz
|
||||
/ceph-0.26.tar.gz
|
||||
/ceph-0.31.tar.gz
|
||||
/ceph-0.37.tar.gz
|
||||
/ceph-0.39.tar.gz
|
||||
/ceph-0.43.tar.bz2
|
||||
/ceph-0.44.tar.bz2
|
||||
/ceph-0.45.tar.bz2
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 11 Nov 2015 17:08:06 +0100
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
|
||||
---
|
||||
src/erasure-code/jerasure/Makefile.am | 6 +++---
|
||||
src/erasure-code/shec/Makefile.am | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
|
||||
index 6ffe3ed..01f5112 100644
|
||||
--- a/src/erasure-code/jerasure/Makefile.am
|
||||
+++ b/src/erasure-code/jerasure/Makefile.am
|
||||
@@ -75,9 +75,9 @@ if LINUX
|
||||
libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
+#endif
|
||||
|
||||
libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
|
||||
libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
|
||||
index cd93132..948979b 100644
|
||||
--- a/src/erasure-code/shec/Makefile.am
|
||||
+++ b/src/erasure-code/shec/Makefile.am
|
||||
@@ -81,9 +81,9 @@ if LINUX
|
||||
libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
+#endif
|
||||
|
||||
libec_shec_sse3_la_SOURCES = ${shec_sources}
|
||||
libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From d3bcac241f25f681a585c2115a79befe43dd7d6c Mon Sep 17 00:00:00 2001
|
||||
From: Jim Schutt <jaschut@sandia.gov>
|
||||
Date: Wed, 21 Mar 2012 10:09:09 -0600
|
||||
Subject: [PATCH] Makefile: fix modules that cannot find pk11pub.h when
|
||||
compiling with NSS on RHEL6
|
||||
|
||||
Signed-off-by: Jim Schutt <jaschut@sandia.gov>
|
||||
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
|
||||
---
|
||||
src/Makefile.am | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index a6e6a95..80802bc 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -48,7 +48,7 @@ if LINUX
|
||||
ceph_osd_LDADD += -ldl
|
||||
endif
|
||||
bin_PROGRAMS += ceph-osd
|
||||
-ceph_osd_CXXFLAGS = ${AM_CXXFLAGS} \
|
||||
+ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} \
|
||||
-I$(top_srcdir)/src/leveldb/include
|
||||
|
||||
# mds
|
||||
@@ -111,6 +111,7 @@ osdmaptool_LDADD = $(LIBGLOBAL_LDA)
|
||||
bin_PROGRAMS += monmaptool crushtool osdmaptool
|
||||
|
||||
ceph_dencoder_SOURCES = test/encoding/ceph_dencoder.cc
|
||||
+ceph_dencoder_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
ceph_dencoder_LDADD = $(LIBGLOBAL_LDA) libosd.la libmds.a libos.la libmon.la
|
||||
bin_PROGRAMS += ceph-dencoder
|
||||
|
||||
@@ -1002,6 +1003,7 @@ libmon_la_SOURCES = \
|
||||
mon/AuthMonitor.cc \
|
||||
mon/Elector.cc \
|
||||
mon/MonitorStore.cc
|
||||
+libmon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libmon_la_LIBADD = libglobal.la
|
||||
noinst_LTLIBRARIES += libmon.la
|
||||
|
||||
@@ -1070,6 +1072,7 @@ libosdc_la_SOURCES = \
|
||||
osdc/ObjectCacher.cc \
|
||||
osdc/Filer.cc \
|
||||
osdc/Journaler.cc
|
||||
+libosdc_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
|
||||
libosdc_la_LIBADD = libcommon.la
|
||||
noinst_LTLIBRARIES += libosdc.la
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From f7abffec751e454d119df273dc6e49e5f7106078 Mon Sep 17 00:00:00 2001
|
||||
From: Sage Weil <sage@redhat.com>
|
||||
Date: Wed, 7 Dec 2016 18:25:55 -0600
|
||||
Subject: [PATCH] msg/simple/Pipe: avoid returning 0 on poll timeout
|
||||
|
||||
If poll times out it will return 0 (no data to read on socket). In
|
||||
165e5abdbf6311974d4001e43982b83d06f9e0cc we changed tcp_read_wait from
|
||||
returning -1 to returning -errno, which means we return 0 instead of -1
|
||||
in this case.
|
||||
|
||||
This makes tcp_read() get into an infinite loop by repeatedly trying to
|
||||
read from the socket and getting EAGAIN.
|
||||
|
||||
Fix by explicitly checking for a 0 return from poll(2) and returning
|
||||
EAGAIN in that case.
|
||||
|
||||
Fixes: http://tracker.ceph.com/issues/18184
|
||||
Signed-off-by: Sage Weil <sage@redhat.com>
|
||||
(cherry picked from commit 6c3d015c6854a12cda40673848813d968ff6afae)
|
||||
---
|
||||
src/msg/simple/Pipe.cc | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
|
||||
index 80b948d..cfb1986 100644
|
||||
--- a/src/msg/simple/Pipe.cc
|
||||
+++ b/src/msg/simple/Pipe.cc
|
||||
@@ -2500,8 +2500,11 @@ int Pipe::tcp_read_wait()
|
||||
if (has_pending_data())
|
||||
return 0;
|
||||
|
||||
- if (poll(&pfd, 1, msgr->timeout) <= 0)
|
||||
+ int r = poll(&pfd, 1, msgr->timeout);
|
||||
+ if (r < 0)
|
||||
return -errno;
|
||||
+ if (r == 0)
|
||||
+ return -EAGAIN;
|
||||
|
||||
evmask = POLLERR | POLLHUP | POLLNVAL;
|
||||
#if defined(__linux__)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
diff -up ceph-0.45/src/leveldb/configure.ac.atomic ceph-0.45/src/leveldb/configure.ac
|
||||
--- ceph-0.45/src/leveldb/configure.ac.atomic 2012-04-23 18:56:15.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure.ac 2012-04-23 19:33:27.000000000 +0200
|
||||
@@ -10,11 +10,11 @@ AC_CONFIG_FILES([
|
||||
])
|
||||
AC_PROG_RANLIB
|
||||
|
||||
-AC_MSG_CHECKING(whether compiler supports C++11 cstdatomic)
|
||||
+AC_MSG_CHECKING(whether compiler supports C++11 atomic)
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
])], [
|
||||
AC_MSG_RESULT(yes)
|
||||
diff -up ceph-0.45/src/leveldb/configure.atomic ceph-0.45/src/leveldb/configure
|
||||
--- ceph-0.45/src/leveldb/configure.atomic 2012-04-23 18:56:19.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/configure 2012-04-23 18:56:43.000000000 +0200
|
||||
@@ -3885,15 +3885,15 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 cstdatomic" >&5
|
||||
-$as_echo_n "checking whether compiler supports C++11 cstdatomic... " >&6; }
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 atomic" >&5
|
||||
+$as_echo_n "checking whether compiler supports C++11 atomic... " >&6; }
|
||||
OLD_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
int main() {}
|
||||
|
||||
_ACEOF
|
||||
diff -up ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic ceph-0.45/src/leveldb/port/atomic_pointer.h
|
||||
--- ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic 2012-04-23 18:56:54.000000000 +0200
|
||||
+++ ceph-0.45/src/leveldb/port/atomic_pointer.h 2012-04-23 18:57:00.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#ifdef LEVELDB_CSTDATOMIC_PRESENT
|
||||
-#include <cstdatomic>
|
||||
+#include <atomic>
|
||||
#endif
|
||||
#ifdef OS_WIN
|
||||
#include <windows.h>
|
||||
@@ -0,0 +1,18 @@
|
||||
diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
|
||||
--- ceph-0.41/src/init-ceph.in.init 2012-01-17 15:33:20.000000000 -0500
|
||||
+++ ceph-0.41/src/init-ceph.in 2012-02-16 12:48:50.887279921 -0500
|
||||
@@ -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 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
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
|
||||
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
|
||||
@@ -4,7 +4,7 @@
|
||||
compress
|
||||
sharedscripts
|
||||
postrotate
|
||||
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
|
||||
+ service ceph reload >/dev/null 2>/dev/null || true
|
||||
endscript
|
||||
missingok
|
||||
}
|
||||
Reference in New Issue
Block a user