Include the patch from Issue 255.

This brings in a test which fails without the patch, and passes with the
patch. Still to be tested, manual tcpkill of a socket.

.gitignore

@@ -0,0 +1,2 @@
+_harness
+

cluster.go

@@ -646,6 +646,11 @@ func (cluster *mongoCluster) AcquireSocket(mode Mode, slaveOk bool, syncTimeout
 				cluster.syncServers()
 				time.Sleep(100 * time.Millisecond)
 				continue
+			} else {
+				// We've managed to successfully reconnect to the master, we are no longer abnormaly ended
+				server.Lock()
+				server.abended = false
+				server.Unlock()
 			}
 		}
 		return s, nil

cluster_test.go

@@ -1477,7 +1477,6 @@ func (s *S) TestSecondaryModeWithMongosInsert(c *C) {
 	c.Assert(result.A, Equals, 1)
 }
 
-
 func (s *S) TestRemovalOfClusterMember(c *C) {
 	if *fast {
 		c.Skip("-fast")

export_test.go

@@ -1,8 +1,8 @@
 package mgo
 
 import (
-	"time"
 	"net"
+	"time"
 )
 
 func HackPingDelay(newDelay time.Duration) (restore func()) {

harness/setup.sh

@@ -30,7 +30,7 @@ start() {
         UP=$(svstat daemons/* | grep ' up ' | grep -v ' [0-3] seconds' | wc -l)
         echo "$UP processes up..."
         if [ x$COUNT = x$UP ]; then
-            echo "Running setup.js with mongo..."
+            echo "Running init.js with mongo..."
             mongo --nodb ../harness/mongojs/init.js
             exit 0
         fi

server_test.go

@@ -42,22 +42,23 @@ func (s *S) TestServerRecoversFromAbend(c *C) {
 	server := cluster.Server("127.0.0.1:40001")
 	sock, abended, err := server.AcquireSocket(100, time.Second)
 	c.Assert(err, IsNil)
-	c.Check(abended, Equals, false)
 	c.Assert(sock, NotNil)
-	sock.Close()
+	sock.Release()
+	c.Check(abended, Equals, false)
 	// Forcefully abend this socket
+	sock.Close()
 	server.AbendSocket(sock)
 	// Next acquire notices the connection was abnormally ended
 	sock, abended, err = server.AcquireSocket(100, time.Second)
 	c.Assert(err, IsNil)
+	sock.Release()
 	c.Check(abended, Equals, true)
-	sock.Close()
 	// cluster.AcquireSocket should fix the abended problems
 	sock, err = cluster.AcquireSocket(mgo.Primary, false, time.Minute, time.Second, nil, 100)
 	c.Assert(err, IsNil)
-	sock.Close()
+	sock.Release()
 	sock, abended, err = server.AcquireSocket(100, time.Second)
 	c.Assert(err, IsNil)
 	c.Check(abended, Equals, false)
-	sock.Close()
+	sock.Release()
 }