Merge pull request #1892 from wuh-fnst/listMultipartIsLast

make “List” correctly judge whether it is the last file

1 files changed, 12 insertions, 2 deletions

diff --git a/weed/pb/filer_pb/filer_client.go b/weed/pb/filer_pb/filer_client.go
index 079fbd671..e4d8bee34 100644
--- a/weed/pb/filer_pb/filer_client.go
+++ b/weed/pb/filer_pb/filer_client.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"os"
 	"strings"
 	"time"
@@ -101,12 +102,16 @@ func SeaweedList(client SeaweedFilerClient, parentDirectoryPath, prefix string,
 }
 
 func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
-
+	// Redundancy limit to make it correctly judge whether it is the last file.
+	redLimit := limit
+	if limit != math.MaxInt32 && limit != 0{
+		redLimit = limit + 1
+	}
 	request := &ListEntriesRequest{
 		Directory:          string(fullDirPath),
 		Prefix:             prefix,
 		StartFromFileName:  startFrom,
-		Limit:              limit,
+		Limit:              redLimit,
 		InclusiveStartFrom: inclusive,
 	}
 
@@ -119,6 +124,7 @@ func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix
 	}
 
 	var prevEntry *Entry
+	count := 0
 	for {
 		resp, recvErr := stream.Recv()
 		if recvErr != nil {
@@ -139,6 +145,10 @@ func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix
 			}
 		}
 		prevEntry = resp.Entry
+		count++
+		if count > int(limit) && limit != 0 {
+			prevEntry = nil
+		}
 	}
 
 	return nil