[DRBD-cvs] svn commit by lars - r2288 - branches/drbd-0.7/drbd -
don't put interpretation into error messages. just stat
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Thu Jul 20 12:57:58 CEST 2006
Author: lars
Date: 2006-07-20 12:57:56 +0200 (Thu, 20 Jul 2006)
New Revision: 2288
Modified:
branches/drbd-0.7/drbd/drbd_receiver.c
Log:
don't put interpretation into error messages. just state the facts
Modified: branches/drbd-0.7/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_receiver.c 2006-07-19 14:34:20 UTC (rev 2287)
+++ branches/drbd-0.7/drbd/drbd_receiver.c 2006-07-20 10:57:56 UTC (rev 2288)
@@ -2043,20 +2043,20 @@
return 1;
break_c_loop:
- WARN( "My msock connect got accepted onto peer's sock!\n");
- /* In case a tcp connection set-up takes longer than
+ WARN( "Network error during initial handshake. I'll try again.\n");
+ /* In case a tcp connection set-up takes longer than
connect-int, we might get into the situation that this
node's msock gets connected to the peer's sock!
-
- To break out of this endless loop behaviour, we need to
- wait unti the peer's msock connect tries are over. (1 Second)
- Additionally we wait connect-int/2 to hit with our next
- connect try exactly in the peer's window of expectation. */
+ To break out of this endless loop behaviour, we need to
+ wait until the peer's msock connect tries are over. (1 Second)
+ Additionally we wait connect-int/2 to increase the chance for
+ our next connect() to hit exactly the peer's accept() window. */
+
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ + (mdev->conf.try_connect_int*HZ)/2);
-
+
return 0;
}
More information about the drbd-cvs
mailing list