Merge pull request #24 from smkniazi/fixing-git

Fixing git

Author: smkniazi

Dir.go

@@ -18,11 +18,11 @@ import (
 
 // Encapsulates state and operations for directory node on the HDFS file system
 type Dir struct {
-	FileSystem   *FileSystem        // Pointer to the owning filesystem
-	Attrs        Attrs              // Cached attributes of the directory, TODO: add TTL
-	Parent       *Dir               // Pointer to the parent directory (allows computing fully-qualified paths on demand)
-	Entries      map[string]fs.Node // Cahed directory entries
-	EntriesMutex sync.Mutex         // Used to protect Entries
+	FileSystem   *FileSystem         // Pointer to the owning filesystem
+	Attrs        Attrs               // Cached attributes of the directory, TODO: add TTL
+	Parent       *Dir                // Pointer to the parent directory (allows computing fully-qualified paths on demand)
+	Entries      map[string]*fs.Node // Cahed directory entries
+	EntriesMutex sync.Mutex          // Used to protect Entries
 }
 
 // Verify that *Dir implements necesary FUSE interfaces
@@ -63,27 +63,44 @@ func (dir *Dir) Attr(ctx context.Context, a *fuse.Attr) error {
 	return dir.Attrs.Attr(a)
 }
 
-func (dir *Dir) EntriesGet(name string) fs.Node {
+func (dir *Dir) EntriesGet(name string) *fs.Node {
 	dir.EntriesMutex.Lock()
 	defer dir.EntriesMutex.Unlock()
 	if dir.Entries == nil {
-		dir.Entries = make(map[string]fs.Node)
+		dir.Entries = make(map[string]*fs.Node)
 		return nil
 	}
 	return dir.Entries[name]
 }
 
-func (dir *Dir) EntriesSet(name string, node fs.Node) {
+func (dir *Dir) EntriesSet(name string, node *fs.Node) {
 	dir.EntriesMutex.Lock()
 	defer dir.EntriesMutex.Unlock()
 
 	if dir.Entries == nil {
-		dir.Entries = make(map[string]fs.Node)
+		dir.Entries = make(map[string]*fs.Node)
 	}
 
 	dir.Entries[name] = node
 }
 
+func (dir *Dir) EntriesUpdate(name string, attr Attrs) {
+	dir.EntriesMutex.Lock()
+	defer dir.EntriesMutex.Unlock()
+
+	if dir.Entries == nil {
+		dir.Entries = make(map[string]*fs.Node)
+	}
+
+	if node, ok := dir.Entries[name]; ok {
+		if fnode, ok := (*node).(*File); ok {
+			fnode.Attrs = attr
+		} else if dnode, ok := (*node).(*Dir); ok {
+			dnode.Attrs = attr
+		}
+	}
+}
+
 func (dir *Dir) EntriesRemove(name string) {
 	dir.EntriesMutex.Lock()
 	defer dir.EntriesMutex.Unlock()
@@ -99,7 +116,7 @@ func (dir *Dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
 	}
 
 	if node := dir.EntriesGet(name); node != nil {
-		return node, nil
+		return *node, nil
 	}
 
 	if dir.FileSystem.ExpandZips && strings.HasSuffix(name, ".zip@") {
@@ -174,7 +191,13 @@ func (dir *Dir) NodeFromAttrs(attrs Attrs) fs.Node {
 	} else {
 		node = &Dir{FileSystem: dir.FileSystem, Parent: dir, Attrs: attrs}
 	}
-	dir.EntriesSet(attrs.Name, node)
+
+	if n := dir.EntriesGet(attrs.Name); n != nil {
+		dir.EntriesUpdate(attrs.Name, attrs)
+	} else {
+		dir.EntriesSet(attrs.Name, &node)
+	}
+
 	return node
 }
 
@@ -242,9 +265,9 @@ func (dir *Dir) Rename(ctx context.Context, req *fuse.RenameRequest, newDir fs.N
 	if err == nil {
 		// Upon successful rename, updating in-memory representation of the file entry
 		if node := dir.EntriesGet(req.OldName); node != nil {
-			if fnode, ok := node.(*File); ok {
+			if fnode, ok := (*node).(*File); ok {
 				fnode.Attrs.Name = req.NewName
-			} else if dnode, ok := node.(*Dir); ok {
+			} else if dnode, ok := (*node).(*Dir); ok {
 				dnode.Attrs.Name = req.NewName
 			}
 			dir.EntriesRemove(req.OldName)

FileSystemOperations_test.go

@@ -20,7 +20,7 @@ func TestSimple(t *testing.T) {
 		//create a file, make sure that use and group information is correct
 		testFile := filepath.Join(mountPoint, "somefile")
 		loginfo(fmt.Sprintf("New file: %s", testFile), nil)
-		createFile(t, testFile)
+		createFile(t, testFile, "some data")
 		fi, _ := os.Stat(testFile)
 		fstat := fi.Sys().(*syscall.Stat_t)
 		grupInfo, _ := user.LookupGroupId(fmt.Sprintf("%d", fstat.Gid))
@@ -30,6 +30,48 @@ func TestSimple(t *testing.T) {
 	})
 }
 
+// testing multiple read write clients perfile
+func TestMultipleRWCllients(t *testing.T) {
+
+	withMount(t, "/", func(mountPoint string, hdfsAccessor HdfsAccessor) {
+		//create a file, make sure that use and group information is correct
+		// mountPoint = "/tmp"
+		testFile1 := filepath.Join(mountPoint, "somefile")
+		testFile2 := filepath.Join(mountPoint, "somefile.bak")
+		loginfo(fmt.Sprintf("New file: %s", testFile1), nil)
+		createFile(t, testFile1, "initial data\nadsf\n")
+
+		c1, _ := os.OpenFile(testFile1, os.O_RDWR, 0600)
+		c2, _ := os.OpenFile(testFile1, os.O_RDWR, 0600)
+		c3, _ := os.OpenFile(testFile1, os.O_RDWR, 0600)
+
+		c1.WriteString("First client\n")
+		c1.Close()
+
+		os.Rename(testFile1, testFile2)
+
+		c2.WriteString("Second client\nSecond client\n")
+		c3.WriteString("Third client\nThird client\nThird Client\n")
+		c2.Close()
+		c3.Close()
+
+		c5, err := os.Open(testFile2)
+
+		if err != nil {
+			t.Error("The file should have opened successfully")
+		} else {
+			loginfo("File opened successfully", nil)
+			buffer := make([]byte, 1024)
+			c5.Read(buffer)
+			//fmt.Printf("%s", buffer)
+		}
+		c5.Close()
+
+		os.Remove(testFile1)
+		os.Remove(testFile2)
+	})
+}
+
 func TestMountSubDir(t *testing.T) {
 	//mount and create some files and dirs
 	dirs := 5
@@ -41,7 +83,7 @@ func TestMountSubDir(t *testing.T) {
 			mkdir(t, dir)
 			for j := 0; j < filesPdir; j++ {
 				f := filepath.Join(dir, "file"+strconv.Itoa(j))
-				createFile(t, f)
+				createFile(t, f, "initial data")
 			}
 		}
 
@@ -57,8 +99,7 @@ func TestMountSubDir(t *testing.T) {
 		if len(content) != filesPdir {
 			t.Errorf("Failed. Expected == %d, Got %d ", filesPdir, len(content))
 			for _, ent := range content {
-				loginfo(fmt.Sprintf("%s", ent.Name()), nil)
-
+				loginfo(fmt.Sprintf("file/dir %s", ent.Name()), nil)
 			}
 		}
 	})
@@ -78,8 +119,6 @@ func TestMountSubDir(t *testing.T) {
 }
 
 func withMount(t testing.TB, srcDir string, fn func(mntPath string, hdfsAccessor HdfsAccessor)) {
-	initLogger("error", false, "")
-
 	hdfsAccessor, err := NewHdfsAccessor("localhost:8020", WallClock{}, TLSConfig{TLS: false})
 	if err != nil {
 		logfatal(fmt.Sprintf("Error/NewHdfsAccessor: %v ", err), nil)
@@ -115,13 +154,13 @@ func mkdir(t testing.TB, dir string) {
 
 }
 
-func createFile(t testing.TB, filePath string) {
+func createFile(t testing.TB, filePath string, data string) {
 	t.Helper()
 	out, err := os.Create(filePath)
 	if err != nil {
 		t.Errorf("Faile to create test file %s. Error: %v", filePath, err)
 	}
-	out.WriteString("This is some test string")
+	out.WriteString(data)
 	out.Close()
 }