Fix some obvious bugs in lease renewal

file_writer_test.go

@@ -58,20 +58,21 @@ func TestFileWrite(t *testing.T) {
 	assert.Equal(t, "foobar", string(bytes))
 }
 
-func TestFileWriteAfterIdleTime(t *testing.T) {
+func TestFileWriteLeaseRenewal(t *testing.T) {
 	client := getClient(t)
 
 	baleet(t, "/_test/create/1.txt")
 	mkdirp(t, "/_test/create")
+
 	writer, err := client.Create("/_test/create/1.txt")
 	require.NoError(t, err)
 
 	n, err := writer.Write([]byte("foo"))
 	require.NoError(t, err)
 	assert.Equal(t, 3, n)
 
-	//Check that write after idle time doesn't fail
-	time.Sleep(90 * time.Second)
+	// Sleep long enough for the lease to expire.
+	time.Sleep(95 * time.Second)
 
 	n, err = writer.Write([]byte("bar"))
 	require.NoError(t, err)

internal/rpc/namenode.go

@@ -285,27 +285,32 @@ func (c *NamenodeConnection) renewLeases() {
 	ticker := time.NewTicker(leaseRenewInterval)
 	defer ticker.Stop()
 
-	select {
-	case <-ticker.C:
-		req := &hdfs.RenewLeaseRequestProto{ClientName: proto.String(c.ClientName)}
-		resp := &hdfs.RenewLeaseResponseProto{}
-
-		// Ignore any errors.
-		c.Execute("renewLease", req, resp)
-	case <-c.done:
-		return
+	for {
+		select {
+		case <-ticker.C:
+			req := &hdfs.RenewLeaseRequestProto{ClientName: proto.String(c.ClientName)}
+			resp := &hdfs.RenewLeaseResponseProto{}
+
+			// Ignore any errors.
+			c.Execute("renewLease", req, resp)
+		case <-c.done:
+			return
+		}
 	}
 }
 
 // Close terminates all underlying socket connections to remote server.
 func (c *NamenodeConnection) Close() error {
+	close(c.done)
+
+	// Ensure that we're not concurrently renewing leases.
 	c.reqLock.Lock()
+	defer c.reqLock.Unlock()
 
 	if c.conn != nil {
 		return c.conn.Close()
 	}
 
-	close(c.done)
 	return nil
 }