Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79ba39cd11 | |||
| f6bd21aaa2 | |||
| 07057e050a | |||
| 18879ad313 | |||
| 0e4cc7c1b7 | |||
| 8cb6eae323 |
+7
-2
@@ -1,2 +1,7 @@
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,17 @@
|
||||
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
|
||||
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -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 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
|
||||
@@ -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