From 921231268b182620aa004fb49c7e318225b0b3bd Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 5 Apr 2019 00:04:00 -0700 Subject: [PATCH] weed filer.copy: skip files that can not be opened such as socket --- weed/command/filer_copy.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index 6750617db..bd4c7d166 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -1,25 +1,24 @@ package command import ( + "context" "fmt" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/server" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/wdclient" "github.com/spf13/viper" "google.golang.org/grpc" + "io" "io/ioutil" + "net/http" "net/url" "os" "path/filepath" - "strings" - - "context" - "github.com/chrislusf/seaweedfs/weed/operation" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/chrislusf/seaweedfs/weed/util" - "io" - "net/http" "strconv" + "strings" "time" ) @@ -123,6 +122,10 @@ func doEachCopy(ctx context.Context, fileOrDir string, filerAddress, filerGrpcAd f, err := os.Open(fileOrDir) if err != nil { fmt.Printf("Failed to open file %s: %v\n", fileOrDir, err) + if _, ok := err.(*os.PathError); ok { + fmt.Printf("skipping %s\n", fileOrDir) + return true + } return false } defer f.Close()