Compare commits
100
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
439eb70dcf | ||
|
|
d8048b573b | ||
|
|
7ebc469b21 | ||
|
|
3b0b0e04e8 | ||
|
|
290a036741 | ||
|
|
a4d87e63c6 | ||
|
|
628a5cfe1f | ||
|
|
7da3554afd | ||
|
|
34495d4d5f | ||
|
|
273aebea8d | ||
|
|
ac3de9eccb | ||
|
|
e46d0f152b | ||
|
|
b3185457ec | ||
|
|
7f6844291d | ||
|
|
25b47f32a9 | ||
|
|
e44806fede | ||
|
|
830e99f484 | ||
|
|
a236dbbbe2 | ||
|
|
c81d313d7c | ||
|
|
5311ad2942 | ||
|
|
08b7207d61 | ||
|
|
d1845800ed | ||
|
|
9a1331d776 | ||
|
|
ed8d9af197 | ||
|
|
4be65c200b | ||
|
|
57cc7e9923 | ||
|
|
10fcd5ea45 | ||
|
|
e605c9c549 | ||
|
|
560f971731 | ||
|
|
cca983bdeb | ||
|
|
6c2f2c4e79 | ||
|
|
9c82455d7f | ||
|
|
e579d551c9 | ||
|
|
aac817e15f | ||
|
|
c28233e26b | ||
|
|
f082c040b2 | ||
|
|
4c912aebbb | ||
|
|
b4b867b0c4 | ||
|
|
f07f612bc9 | ||
|
|
c523b37b4d | ||
|
|
a69f0258b3 | ||
|
|
975579a765 | ||
|
|
8ee25c7ded | ||
|
|
52a2b9bf64 | ||
|
|
77906caf26 | ||
|
|
e11916a191 | ||
|
|
7d8598d9d5 | ||
|
|
f6f6a625d7 | ||
|
|
522d4bf6a9 | ||
|
|
fc25307343 | ||
|
|
20d29cd716 | ||
|
|
b0e4352954 | ||
|
|
9cd0433a2c | ||
|
|
c0e66ef34e | ||
|
|
7d1f840a1f | ||
|
|
6bb58e5016 | ||
|
|
15e2e4694f | ||
|
|
514a2a17d7 | ||
|
|
5b135f1378 | ||
|
|
3991b7a14d | ||
|
|
ffa978b691 | ||
|
|
f5c462a933 | ||
|
|
0521dc9b41 | ||
|
|
9855df9139 | ||
|
|
ff794c7017 | ||
|
|
6449f95424 | ||
|
|
19726c103f | ||
|
|
d02143ac96 | ||
|
|
8f23225f59 | ||
|
|
ba92463cc7 | ||
|
|
50e073a68a | ||
|
|
563583e5c0 | ||
|
|
6eb8fdf3f0 | ||
|
|
0f5f195c33 | ||
|
|
b003ada4bc | ||
|
|
f32a9e4df7 | ||
|
|
3cf1ae6df2 | ||
|
|
dc8a12beda | ||
|
|
9097f5d573 | ||
|
|
c0a0a52a8b | ||
|
|
ca214a19e5 | ||
|
|
11db7b3461 | ||
|
|
36be982698 | ||
|
|
d10f18bd8e | ||
|
|
b89a3dc9a3 | ||
|
|
fd6c2fa998 | ||
|
|
454e443680 | ||
|
|
9b4a6bb004 | ||
|
|
81c2739f9a | ||
|
|
95cfe03536 | ||
|
|
555889fa91 | ||
|
|
ca6b4d7645 | ||
|
|
10fd17e5ff | ||
|
|
d83fdbd3cc | ||
|
|
3dcda9e51f | ||
|
|
bfda65c8f0 | ||
|
|
cf2b700b23 | ||
|
|
c87f553439 | ||
|
|
a48a736e33 | ||
|
|
5dd73cb626 |
+2
-1
@@ -1 +1,2 @@
|
||||
ceph-0.20.2.tar.gz
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
|
||||
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
|
||||
@@ -12,8 +12,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include <google/heap-profiler.h>
|
||||
-#include <google/malloc_extension.h>
|
||||
+#include <gperftools/heap-profiler.h>
|
||||
+#include <gperftools/malloc_extension.h>
|
||||
#include "heap_profiler.h"
|
||||
#include "common/environment.h"
|
||||
#include "common/LogClient.h"
|
||||
@@ -1,62 +0,0 @@
|
||||
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