Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c5cb23e3c0 | |||
| 23d404f669 | |||
| b54c831ea5 | |||
| c77bf31040 |
+1
-2
@@ -1,2 +1 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
ceph-0.20.2.tar.gz
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
|
||||
index 65ba10b0f1..eeedc29c37 100644
|
||||
--- a/src/common/CMakeLists.txt
|
||||
+++ b/src/common/CMakeLists.txt
|
||||
@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
|
||||
crc32c_aarch64.c)
|
||||
endif(HAVE_INTEL)
|
||||
|
||||
-add_library(crc32 ${crc32_srcs})
|
||||
+add_library(crc32 STATIC ${crc32_srcs})
|
||||
if(HAVE_ARMV8_CRC)
|
||||
set_target_properties(crc32 PROPERTIES
|
||||
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
|
||||
@@ -1,26 +0,0 @@
|
||||
<<<<<<< HEAD
|
||||
--- ceph-15.1.0/src/common/bit_str.h.orig 2020-02-03 09:47:20.047149798 -0500
|
||||
+++ ceph-15.1.0/src/common/bit_str.h 2020-02-03 09:47:50.213149798 -0500
|
||||
=======
|
||||
--- ceph-14.2.6/src/common/bit_str.h.orig 2020-01-24 11:37:20.547679336 -0500
|
||||
+++ ceph-14.2.6/src/common/bit_str.h 2020-01-24 11:37:55.351904895 -0500
|
||||
>>>>>>> origin/f32
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <cstdint>
|
||||
#include <iosfwd>
|
||||
#include <functional>
|
||||
+#include <ostream>
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
--- ceph-15.2.4/src/global/signal_handler.h.orig 2020-07-17 12:57:54.763628429 -0400
|
||||
+++ ceph-15.2.4/src/global/signal_handler.h 2020-07-17 12:58:10.610628429 -0400
|
||||
@@ -16,6 +16,8 @@
|
||||
#define CEPH_GLOBAL_SIGNAL_HANDLER_H
|
||||
|
||||
#include <signal.h>
|
||||
+#include <string>
|
||||
+
|
||||
#include "acconfig.h"
|
||||
|
||||
typedef void (*signal_handler_t)(int);
|
||||
@@ -0,0 +1,62 @@
|
||||
diff -up ceph-0.20/src/init-ceph.in.init ceph-0.20/src/init-ceph.in
|
||||
--- ceph-0.20/src/init-ceph.in.init 2010-04-22 16:11:34.000000000 -0400
|
||||
+++ ceph-0.20/src/init-ceph.in 2010-05-05 15:37:11.185677759 -0400
|
||||
@@ -1,10 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
+# 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
|
||||
@@ -28,6 +29,8 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
+lockfile=/var/lock/subsys/ceph
|
||||
+
|
||||
usage_exit() {
|
||||
echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
|
||||
printf "\t-c ceph.conf\n"
|
||||
@@ -244,6 +247,7 @@ for name in $what; do
|
||||
[ -n "$pre_start" ] && do_cmd "$pre_start"
|
||||
do_cmd "$cmd" $runarg
|
||||
[ -n "$post_start" ] && do_cmd "$post_start"
|
||||
+ [ "$?" = 0 ] && touch $lockfile
|
||||
;;
|
||||
|
||||
stop)
|
||||
@@ -252,19 +256,27 @@ for name in $what; do
|
||||
[ -n "$pre_stop" ] && do_cmd "$pre_stop"
|
||||
stop_daemon $name c$type $pid_file
|
||||
[ -n "$post_stop" ] && do_cmd "$post_stop"
|
||||
+ [ "$?" = 0 ] && rm -f $lockfile
|
||||
;;
|
||||
|
||||
+ status)
|
||||
+ pid=`cat $pid_file`
|
||||
+ ps $pid &> /dev/null
|
||||
+ exit $?
|
||||
+ ;;
|
||||
forcestop)
|
||||
get_conf pre_forcestop "" "pre forcestop command"
|
||||
get_conf post_forcestop "" "post forcestop command"
|
||||
[ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
|
||||
stop_daemon $name c$type $pid_file -9
|
||||
[ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
|
||||
+ [ "$?" = 0 ] && rm -f $lockfile
|
||||
;;
|
||||
|
||||
killall)
|
||||
echo "killall c$type on $host"
|
||||
do_cmd "pkill ^c$type || true"
|
||||
+ [ "$?" = 0 ] && rm -f $lockfile
|
||||
;;
|
||||
|
||||
force-reload | reload)
|
||||
Reference in New Issue
Block a user