Merge pull request #120 from afking/fix-singlenn

Fix rpc.resolveConnection() deadlock

Author: colinmarc

rpc/namenode.go

@@ -151,10 +151,6 @@ func (c *NamenodeConnection) resolveConnection() error {
 	}
 
 	for _, host := range c.hostList {
-		if c.host == host {
-			continue
-		}
-
 		if host.lastErrorAt.After(time.Now().Add(-backoffDuration)) {
 			continue
 		}

rpc/namenode_test.go

@@ -0,0 +1,19 @@
+package rpc
+
+import (
+	"io"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNamenodeConnection_resolveConnection(t *testing.T) {
+	conn := getNamenode(t)
+	conn.markFailure(io.EOF)
+
+	assert.Error(t, conn.resolveConnection())
+	conn.host.lastErrorAt = time.Now().Add(-backoffDuration)
+	assert.NoError(t, conn.resolveConnection())
+	cachedNamenode = nil
+}