Shorten the timeout for when queued requests get punted to the next

level up (i.e. multipath)

svn path=/trunk/packages/xvm-iscsi-config/; revision=1984

diff --git a/debian/changelog b/debian/changelog
index a0e216d..94be91e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-iscsi-config (0.0.8) unstable; urgency=low
+
+  * Lower the timeout to re-establish a connection after a failure.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 15 Jan 2009 02:06:02 -0500
+

 xvm-iscsi-config (0.0.7) unstable; urgency=low
 
   * Configure iSCSI for multipath on eth0 and eth1.
 xvm-iscsi-config (0.0.7) unstable; urgency=low
 
   * Configure iSCSI for multipath on eth0 and eth1.

diff --git a/debian/transform_iscsid.conf.xvm.mako b/debian/transform_iscsid.conf.xvm.mako
index 14075b0..7ef78b1 100755 (executable)
--- a/debian/transform_iscsid.conf.xvm.mako
+++ b/debian/transform_iscsid.conf.xvm.mako
@@ -7,12 +7,16 @@ from invirt.config import structs as cfg
 EOF
 }
 
 EOF
 }
 

-s/^node.startup = manual/node.startup = automatic/m;
+s/^node\.startup = manual/node.startup = automatic/m;

 # mako just generally doesn't deal well with lines that start with
 # hashes, so we'll strip them
 #
 # And empty lines too, just for cleanliness
 s/^#.*$//m;
 # mako just generally doesn't deal well with lines that start with
 # hashes, so we'll strip them
 #
 # And empty lines too, just for cleanliness
 s/^#.*$//m;

+
+# This is how long requests will sit in the queue before being failed
+# up to the next layer (i.e. multipath)
+s/^#?(node\.session\.timeo\.replacement_timeout).*$/\1 = 15/m;

 print unless /^$/;
 
 END {
 print unless /^$/;
 
 END {