remove lock on edge to avoid deadlock (#3677)

juicedata · Aug 31, 2023 · b2b9d84 · b2b9d84
1 parent 772c67c
commit b2b9d84
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/pkg/meta/sql.go b/pkg/meta/sql.go
@@ -1130,7 +1130,7 @@ func (m *dbMeta) doMknod(ctx Context, parent Ino, name string, _type uint8, mode
 			return syscall.ENOTDIR
 		}
 		var e = edge{Parent: parent, Name: []byte(name)}
-		ok, err = s.ForUpdate().Get(&e)
+		ok, err = s.Get(&e)
 		if err != nil {
 			return err
 		}
@@ -1146,7 +1146,7 @@ func (m *dbMeta) doMknod(ctx Context, parent Ino, name string, _type uint8, mode
 		if foundIno != 0 {
 			if _type == TypeFile || _type == TypeDirectory {
 				foundNode := node{Inode: foundIno}
-				ok, err = s.ForUpdate().Get(&foundNode)
+				ok, err = s.Get(&foundNode)
 				if err != nil {
 					return err
 				} else if ok {
@@ -1229,7 +1229,7 @@ func (m *dbMeta) doUnlink(ctx Context, parent Ino, name string) syscall.Errno {
 			return syscall.ENOTDIR
 		}
 		var e = edge{Parent: parent, Name: []byte(name)}
-		ok, err = s.ForUpdate().Get(&e)
+		ok, err = s.Get(&e)
 		if err != nil {
 			return err
 		}
@@ -1360,7 +1360,7 @@ func (m *dbMeta) doRmdir(ctx Context, parent Ino, name string) syscall.Errno {
 			return syscall.ENOTDIR
 		}
 		var e = edge{Parent: parent, Name: []byte(name)}
-		ok, err = s.ForUpdate().Get(&e)
+		ok, err = s.Get(&e)
 		if err != nil {
 			return err
 		}
@@ -1383,7 +1383,7 @@ func (m *dbMeta) doRmdir(ctx Context, parent Ino, name string) syscall.Errno {
 		if err != nil {
 			return err
 		}
-		exist, err := s.ForUpdate().Exist(&edge{Parent: e.Inode})
+		exist, err := s.Exist(&edge{Parent: e.Inode})
 		if err != nil {
 			return err
 		}
@@ -1475,7 +1475,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
 			return syscall.ENOTDIR
 		}
 		var se = edge{Parent: parentSrc, Name: []byte(nameSrc)}
-		ok, err := s.ForUpdate().Get(&se)
+		ok, err := s.Get(&se)
 		if err != nil {
 			return err
 		}
@@ -1497,7 +1497,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
 			return nil
 		}
 		var sn = node{Inode: se.Inode}
-		ok, err = s.ForUpdate().Get(&sn)
+		ok, err = s.Get(&sn)
 		if err != nil {
 			return err
 		}
@@ -1506,7 +1506,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
 		}
 
 		var de = edge{Parent: parentDst, Name: []byte(nameDst)}
-		ok, err = s.ForUpdate().Get(&de)
+		ok, err = s.Get(&de)
 		if err != nil {
 			return err
 		}
@@ -1548,7 +1548,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
 				}
 			} else {
 				if de.Type == TypeDirectory {
-					exist, err := s.ForUpdate().Exist(&edge{Parent: de.Inode})
+					exist, err := s.Exist(&edge{Parent: de.Inode})
 					if err != nil {
 						return err
 					}
@@ -1718,7 +1718,7 @@ func (m *dbMeta) doLink(ctx Context, inode, parent Ino, name string, attr *Attr)
 			return syscall.ENOTDIR
 		}
 		var e = edge{Parent: parent, Name: []byte(name)}
-		ok, err = s.ForUpdate().Get(&e)
+		ok, err = s.Get(&e)
 		if err != nil {
 			return err
 		}