consistently return the same list of xattrs

also, if we are requesting s3.* xattrs then we can use the cached values
from LIST

Author: kahing

internal/goofys.go

@@ -857,6 +857,17 @@ func (fs *Goofys) LookUpInodeMaybeDir(parent *Inode, name string, fullName strin
 				inode = NewInode(parent, &name, &fullName, fs.flags)
 				inode.Attributes = &fs.rootAttrs
 				inode.KnownSize = &inode.Attributes.Size
+				if len(resp.Contents) != 0 && *resp.Contents[0].Key == name+"/" {
+					// it's actually a dir blob
+					entry := resp.Contents[0]
+					if entry.ETag != nil {
+						inode.s3Metadata["etag"] = []byte(*entry.ETag)
+					}
+					if entry.StorageClass != nil {
+						inode.s3Metadata["storage-class"] = []byte(*entry.StorageClass)
+					}
+
+				}
 				// if cheap is not on, the dir blob
 				// could exist but this returned first
 				if fs.flags.Cheap {
@@ -1064,6 +1075,12 @@ func (fs *Goofys) insertInodeFromDirEntry(parent *Inode, entry *DirHandleEntry)
 		path := parent.getChildName(*entry.Name)
 		inode = NewInode(parent, entry.Name, &path, fs.flags)
 		inode.Attributes = entry.Attributes
+		if entry.ETag != nil {
+			inode.s3Metadata["etag"] = []byte(*entry.ETag)
+		}
+		if entry.StorageClass != nil {
+			inode.s3Metadata["storage-class"] = []byte(*entry.StorageClass)
+		}
 		// these are fake dir entries, we will realize the refcnt when
 		// lookup is done
 		inode.refcnt = 0

internal/goofys_test.go

@@ -1398,7 +1398,9 @@ func (s *GoofysTest) TestXAttrGet(t *C) {
 
 	names, err = emptyDir2.ListXattr(s.fs)
 	t.Assert(err, IsNil)
-	t.Assert(names, DeepEquals, []string{"s3.etag", "user.name"})
+	// https://github.com/andrewgaul/s3proxy/issues/234 means that
+	// s3proxy may or may not return the storage class
+	t.Assert(len(names) == 2 || len(names) == 3, Equals, true)
 
 	emptyDir, err := s.LookUpInode(t, "empty_dir")
 	t.Assert(err, IsNil)
@@ -1434,6 +1436,20 @@ func (s *GoofysTest) TestXAttrGet(t *C) {
 	}
 }
 
+func (s *GoofysTest) TestXAttrGetCached(t *C) {
+	s.fs.flags.StatCacheTTL = 1 * time.Minute
+	s.fs.flags.TypeCacheTTL = 1 * time.Minute
+	s.readDirIntoCache(t, fuseops.RootInodeID)
+	s.disableS3()
+
+	in, err := s.LookUpInode(t, "file1")
+	t.Assert(err, IsNil)
+	t.Assert(in.userMetadata, IsNil)
+
+	_, err = in.GetXattr(s.fs, "s3.etag")
+	t.Assert(err, IsNil)
+}
+
 func (s *GoofysTest) TestXAttrCopied(t *C) {
 	root := s.getRoot(t)
 

internal/handles.go

@@ -506,8 +506,7 @@ func (inode *Inode) fillXattrFromHead(resp *s3.HeadObjectOutput) {
 
 // LOCKS_REQUIRED(inode.mu)
 func (inode *Inode) fillXattr(fs *Goofys) (err error) {
-	if !inode.ImplicitDir &&
-		(len(inode.s3Metadata) == 0 && inode.userMetadata == nil) {
+	if !inode.ImplicitDir && inode.userMetadata == nil {
 
 		fullName := *inode.FullName
 		if inode.isDir() {
@@ -537,11 +536,6 @@ func (inode *Inode) fillXattr(fs *Goofys) (err error) {
 func (inode *Inode) getXattrMap(fs *Goofys, name string, userOnly bool) (
 	meta map[string][]byte, newName string, err error) {
 
-	err = inode.fillXattr(fs)
-	if err != nil {
-		return nil, "", err
-	}
-
 	if strings.HasPrefix(name, "s3.") {
 		if userOnly {
 			return nil, "", syscall.EACCES
@@ -550,6 +544,11 @@ func (inode *Inode) getXattrMap(fs *Goofys, name string, userOnly bool) (
 		newName = name[3:]
 		meta = inode.s3Metadata
 	} else if strings.HasPrefix(name, "user.") {
+		err = inode.fillXattr(fs)
+		if err != nil {
+			return nil, "", err
+		}
+
 		newName = name[5:]
 		meta = inode.userMetadata
 	} else {