fix: Fix race conditions

Author: efirs

core/dir.go

@@ -1864,10 +1864,12 @@ func (parent *Inode) insertSubTree(path string, obj *BlobItemOutput, dirs map[*I
 				inode.SetFromBlobItem(obj)
 				sealPastDirs(dirs, inode)
 			} else {
+				inode.mu.Lock()
 				now := time.Now()
 				if inode.AttrTime.Before(now) {
 					inode.SetAttrTime(now)
 				}
+				inode.mu.Unlock()
 			}
 
 			// mark this dir but don't seal anything else
@@ -1905,9 +1907,29 @@ func (parent *Inode) LookUpCached(name string) (inode *Inode, err error) {
 	parent.mu.Lock()
 	ok := false
 	inode = parent.findChildUnlocked(name)
+	if inode == nil {
+		ok = false
+		if parent.dir.DeletedChildren != nil {
+			if _, ok := parent.dir.DeletedChildren[name]; ok {
+				// File is deleted locally
+				parent.mu.Unlock()
+				return nil, syscall.ENOENT
+			}
+		}
+		if !expired(parent.dir.DirTime, parent.fs.flags.StatCacheTTL) {
+			// Don't recheck from the server if directory cache is actual
+			parent.mu.Unlock()
+			return nil, syscall.ENOENT
+		}
+	}
+
+	ttl := parent.fs.flags.StatCacheTTL
+	parent.mu.Unlock()
+
 	if inode != nil {
+		inode.mu.Lock()
 		ok = true
-		if expired(inode.AttrTime, parent.fs.flags.StatCacheTTL) {
+		if expired(inode.AttrTime, ttl) {
 			ok = false
 			if atomic.LoadInt32(&inode.CacheState) != ST_CACHED ||
 				inode.isDir() && atomic.LoadInt64(&inode.dir.ModifiedChildren) > 0 {
@@ -1921,22 +1943,9 @@ func (parent *Inode) LookUpCached(name string) (inode *Inode, err error) {
 				inode.logFuse("lookup expired")
 			}
 		}
-	} else {
-		ok = false
-		if parent.dir.DeletedChildren != nil {
-			if _, ok := parent.dir.DeletedChildren[name]; ok {
-				// File is deleted locally
-				parent.mu.Unlock()
-				return nil, syscall.ENOENT
-			}
-		}
-		if !expired(parent.dir.DirTime, parent.fs.flags.StatCacheTTL) {
-			// Don't recheck from the server if directory cache is actual
-			parent.mu.Unlock()
-			return nil, syscall.ENOENT
-		}
+		inode.mu.Unlock()
 	}
-	parent.mu.Unlock()
+
 	if !ok {
 		inode, err = parent.recheckInode(inode, name)
 		err = mapAwsError(err)
@@ -1947,6 +1956,7 @@ func (parent *Inode) LookUpCached(name string) (inode *Inode, err error) {
 			return nil, syscall.ENOENT
 		}
 	}
+
 	return inode, nil
 }
 

core/tigris_test.go

@@ -29,7 +29,17 @@ import (
 	"github.com/tigrisdata/tigrisfs/core/cfg"
 )
 
+var (
+	triedDetect bool
+	detected    bool
+	localTigris bool
+)
+
 func tigrisDetected(flags *cfg.FlagStorage) (bool, bool) {
+	if triedDetect {
+		return detected, localTigris
+	}
+
 	endpoint := flags.Endpoint
 	if endpoint == "" {
 		endpoint = os.Getenv("AWS_ENDPOINT_URL")
@@ -42,7 +52,11 @@ func tigrisDetected(flags *cfg.FlagStorage) (bool, bool) {
 		return false, local
 	}
 
-	return strings.Contains(r.Header.Get("Server"), "Tigris"), local
+	triedDetect = true
+	localTigris = local
+	detected = r.StatusCode == http.StatusOK && strings.Contains(r.Header.Get("Server"), "Tigris")
+
+	return detected, local
 }
 
 func LocalTigrisDetected(flags *cfg.FlagStorage) bool {

test/cluster/test_random.sh

@@ -32,11 +32,11 @@ _cluster_setup() {
   touch "$TEST_ARTIFACTS/test_random/log1" "$TEST_ARTIFACTS/test_random/log2" "$TEST_ARTIFACTS/test_random/log3"
 
   #opts="--debug_fuse --debug_grpc --log-format console --log-level debug --no-log-color"
-  opts="--log-format console --no-log-color"
+  opts="--log-format console --log-level info --no-log-color"
   nodes="--cluster-peer=1:localhost:1337 --cluster-peer=2:localhost:1338 --cluster-peer=3:localhost:1339"
 
   MNT1=$(mktemp --suffix .node1 -d)
-  _mount "$MNT1" $opts -f --log-file="$TEST_ARTIFACTS/test_random/log1" --pprof=6060 --cluster-me=1:localhost:1337 $nodes #--debug_fuse --debug_grpc
+  _mount "$MNT1" $opts -f --log-file="$TEST_ARTIFACTS/test_random/log1" --pprof=6060 --cluster-me=1:localhost:1337 $nodes
 
   MNT2=$(mktemp --suffix .node2 -d)
   _mount "$MNT2" $opts -f --log-file="$TEST_ARTIFACTS/test_random/log2" --pprof=6070 --cluster-me=2:localhost:1338 $nodes

test/run-proxy.sh

@@ -33,7 +33,7 @@ if [ $CLOUD == "s3" ]; then
         echo jclouds.provider=filesystem >>test/s3proxy_test.properties
         echo jclouds.filesystem.basedir=/tmp/s3proxy >>test/s3proxy_test.properties
     fi
-    PROXY_BIN="java -Xms512m -Xmx8g --add-opens java.base/java.lang=ALL-UNNAMED -jar s3proxy.jar --properties test/s3proxy_test.properties"
+    PROXY_BIN="java --add-opens java.base/java.lang=ALL-UNNAMED -jar s3proxy.jar --properties test/s3proxy_test.properties"
     export AWS_ACCESS_KEY_ID=foo
     export AWS_SECRET_ACCESS_KEY=bar
     export ENDPOINT=http://localhost:$PROXY_PORT