3 files changed, 24 insertions, 19 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go
index dd21ef364..4dbc04a0c 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -5,6 +5,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"runtime"
 	"time"
 
 	"google.golang.org/grpc/reflection"
@@ -248,18 +249,6 @@ func (fo *FilerOptions) startFiler() {
 		glog.Fatalf("Filer listener error: %v", e)
 	}
 
-	// start on local unix socket
-	if *fo.localSocket == "" {
-		*fo.localSocket = fmt.Sprintf("/tmp/seaweefs-filer-%d.sock", *fo.port)
-		if err := os.Remove(*fo.localSocket); err != nil && !os.IsNotExist(err) {
-			glog.Fatalf("Failed to remove %s, error: %s", *fo.localSocket, err.Error())
-		}
-	}
-	filerSocketListener, err := net.Listen("unix", *fo.localSocket)
-	if err != nil {
-		glog.Fatalf("Failed to listen on %s: %v", *fo.localSocket, err)
-	}
-
 	// starting grpc server
 	grpcPort := *fo.portGrpc
 	grpcL, grpcLocalL, err := util.NewIpAndLocalListeners(*fo.bindIp, grpcPort, 0)
@@ -275,9 +264,22 @@ func (fo *FilerOptions) startFiler() {
 	go grpcS.Serve(grpcL)
 
 	httpS := &http.Server{Handler: defaultMux}
-	go func() {
-		httpS.Serve(filerSocketListener)
-	}()
+	if runtime.GOOS != "windows" {
+		if *fo.localSocket == "" {
+			*fo.localSocket = fmt.Sprintf("/tmp/seaweefs-filer-%d.sock", *fo.port)
+			if err := os.Remove(*fo.localSocket); err != nil && !os.IsNotExist(err) {
+				glog.Fatalf("Failed to remove %s, error: %s", *fo.localSocket, err.Error())
+			}
+		}
+		go func() {
+			// start on local unix socket
+			filerSocketListener, err := net.Listen("unix", *fo.localSocket)
+			if err != nil {
+				glog.Fatalf("Failed to listen on %s: %v", *fo.localSocket, err)
+			}
+			httpS.Serve(filerSocketListener)
+		}()
+	}
 	if filerLocalListener != nil {
 		go func() {
 			if err := httpS.Serve(filerLocalListener); err != nil {
diff --git a/weed/command/filer_sync.go b/weed/command/filer_sync.go
index 37ce2aa73..e3d3b97bc 100644
--- a/weed/command/filer_sync.go
+++ b/weed/command/filer_sync.go
@@ -267,7 +267,10 @@ func genProcessFunction(sourcePath string, targetPath string, dataSink sink.Repl
 				return nil
 			}
 			key := buildKey(dataSink, message, targetPath, sourceOldKey, sourcePath)
-			return dataSink.DeleteEntry(key, message.OldEntry.IsDirectory, message.DeleteChunks, message.Signatures)
+			if !dataSink.IsIncremental() {
+				return dataSink.DeleteEntry(key, message.OldEntry.IsDirectory, message.DeleteChunks, message.Signatures)
+			}
+			return nil
 		}
 
 		// handle new entries
diff --git a/weed/command/master.go b/weed/command/master.go
index 37cfaf252..9587df055 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -1,9 +1,9 @@
 package command
 
 import (
+	"golang.org/x/exp/slices"
 	"net/http"
 	"os"
-	"sort"
 	"strings"
 	"time"
 
@@ -274,8 +274,8 @@ func checkPeers(masterIp string, masterPort int, masterGrpcPort int, peers strin
 }
 
 func isTheFirstOne(self pb.ServerAddress, peers []pb.ServerAddress) bool {
-	sort.Slice(peers, func(i, j int) bool {
-		return strings.Compare(string(peers[i]), string(peers[j])) < 0
+	slices.SortFunc(peers, func(a, b pb.ServerAddress) bool {
+		return strings.Compare(string(a), string(b)) < 0
 	})
 	if len(peers) <= 0 {
 		return true