[Pkg-ceph-commits] [ceph] 01/01: new init-osd.patch to fix OSD startup failure

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit f4cbfd4 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Mar 29 01:07:53 2014

    new init-osd.patch to fix OSD startup failure
---
 debian/patches/init-osd.patch | 24 ++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/init-osd.patch b/debian/patches/init-osd.patch
new file mode 100644
index 0000000..433c92d
--- /dev/null
+++ b/debian/patches/init-osd.patch
@@ -0,0 +1,24 @@
+Last-Update: 2014-03-29
+Forwarded: https://github.com/ceph/ceph/pull/1562
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: fix OSD startup issue
+ On machines with MON and OSDs (on boot) OSDs started shortly after MON startup
+ but MON needs time to become oprational so OSDs fail to start due to short
+ timeout because they don't have enough time to establish communication with
+ cluster. This is even more likely to happen when there are other monitors down
+ which is not unusual when servers are rebooting after power failure.
+ Increasing timeout significantly improves chances for successful OSD start.
+
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -324,9 +324,9 @@
+ 		    osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`
+ 		    get_conf osd_weight "" "osd crush initial weight"
+ 		    defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.2f",$2/1073741824) }')"
+ 		    get_conf osd_keyring "$osd_data/keyring" "keyring"
+-		    do_cmd "timeout 10 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
++		    do_cmd "timeout 30 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
+ 		fi
+ 	    fi
+ 
+ 	    echo Starting Ceph $name on $host...
diff --git a/debian/patches/series b/debian/patches/series
index 37347c5..d2cba7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ ceph-conf-no-log.patch
 #defaults-leveldb-osd.patch
 fix-defaultweight.patch
 gcj.patch
+init-osd.patch
 init.patch
 logrotate.patch
 modules.patch

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git