cmd/sync: add the jfs specific prefix to distinguish business files from internal files

Author: zhijian-pro

cmd/object.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"os"
 	"path"
 	"runtime"
@@ -139,7 +138,7 @@ func (j *juiceFS) Put(rCtx context.Context, key string, in io.Reader, getters ..
 		if len(name) > 200 {
 			name = name[:200]
 		}
-		tmp = path.Join(path.Dir(p), fmt.Sprintf(".jfs.%s.tmp.%d", name, rand.Int()))
+		tmp = object.TmpFilePath(p, name)
 		defer func() {
 			if err != nil {
 				if e := j.jfs.Delete(ctx, tmp); e != 0 {

pkg/object/cifs.go

@@ -24,7 +24,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
 	"net"
 	"net/url"
 	"os"
@@ -237,7 +236,7 @@ func (c *cifsStore) Put(ctx context.Context, key string, in io.Reader, getters .
 			if len(name) > 200 {
 				name = name[:200]
 			}
-			tmp = path.Join(path.Dir(p), fmt.Sprintf(".%s.tmp.%d", name, rand.Int()))
+			tmp = TmpFilePath(p, name)
 			defer func() {
 				if err != nil {
 					_ = conn.share.Remove(tmp)

pkg/object/file.go

@@ -22,13 +22,11 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"math/rand"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"sort"
-	"strconv"
 	"strings"
 
 	"github.com/juicedata/juicefs/pkg/utils"
@@ -160,7 +158,7 @@ func (d *filestore) Put(ctx context.Context, key string, in io.Reader, getters .
 		if len(name) > 200 {
 			name = name[:200]
 		}
-		tmp = filepath.Join(filepath.Dir(p), ".jfs."+name+".tmp"+strconv.Itoa(rand.Int()))
+		tmp = TmpFilePath(p, name)
 		defer func() {
 			if err != nil {
 				_ = os.Remove(tmp)

pkg/object/hdfs.go

@@ -26,7 +26,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"math/rand"
 	"os"
 	"os/user"
 	"path"
@@ -139,7 +138,7 @@ func (h *hdfsclient) Put(ctx context.Context, key string, in io.Reader, getters
 		if len(name) > 200 {
 			name = name[:200]
 		}
-		tmp = path.Join(path.Dir(p), fmt.Sprintf(".%s.tmp.%d", name, rand.Int()))
+		tmp = TmpFilePath(p, name)
 		defer func() {
 			if err != nil {
 				_ = h.c.Remove(tmp)

pkg/object/nfs.go

@@ -24,7 +24,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
 	"os"
 	"os/user"
 	"path"
@@ -176,7 +175,7 @@ func (n *nfsStore) Put(ctx context.Context, key string, in io.Reader, getters ..
 		if len(name) > 200 {
 			name = name[:200]
 		}
-		tmp = path.Join(path.Dir(p), fmt.Sprintf(".%s.tmp.%d", name, rand.Int()))
+		tmp = TmpFilePath(p, name)
 		defer func() {
 			if err != nil {
 				_ = n.target.Remove(tmp)

pkg/object/object_storage.go

@@ -20,8 +20,10 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"math/rand"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -315,3 +317,7 @@ func decodeKey(value string, typ *string) (string, error) {
 	}
 	return value, nil
 }
+
+func TmpFilePath(parent, name string) string {
+	return filepath.Join(filepath.Dir(parent), ".jfs."+name+".tmp"+strconv.Itoa(rand.Int()))
+}

pkg/object/sftp.go

@@ -11,7 +11,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
 	"net"
 	"net/url"
 	"os"
@@ -236,7 +235,7 @@ func (f *sftpStore) Put(ctx context.Context, key string, in io.Reader, getters .
 		if len(name) > 200 {
 			name = name[:200]
 		}
-		tmp = path.Join(path.Dir(p), fmt.Sprintf(".%s.tmp.%d", name, rand.Int()))
+		tmp = TmpFilePath(p, name)
 		defer func() {
 			if err != nil {
 				_ = c.sftpClient.Remove(tmp)