Synchronous changes from the master branch

Signed-off-by: Mofei Zhang <[email protected]>
amasser · Jan 19, 2020 · 6eba8cb · 6eba8cb
2 parents d108d93 + e0b25a6
commit 6eba8cb
Show file tree

Hide file tree

Showing 4 changed files with 159 additions and 150 deletions.
diff --git a/client/fuse.go b/client/fuse.go
@@ -148,6 +148,7 @@ func main() {
 
 	fsConn, super, err := mount(opt)
 	if err != nil {
+		syslog.Println("mount err", err)
 		log.LogFlush()
 		daemonize.SignalOutcome(err)
 		os.Exit(1)

diff --git a/objectnode/fs_volume.go b/objectnode/fs_volume.go
@@ -1331,7 +1331,7 @@ func (v *volume) CopyFile(targetPath, sourcePath string) (info *FSFileInfo, err
 	newDirs, newFilename := splitPath(targetPath)
 	// process source targetPath
 	var newParentId uint64
-	if newParentId, err = v.lookupDirectories(newDirs, false); err != nil {
+	if newParentId, err = v.lookupDirectories(newDirs, true); err != nil {
 		return nil, err
 	}
 

diff --git a/objectnode/policy_action.go b/objectnode/policy_action.go
@@ -37,15 +37,17 @@ const (
 	GetObjectAclAction                      = "s3:GetObjectAcl"
 	GetObjectVersionAction                  = "s3:GetObjectVersion"
 	PutObjectVersionAction                  = "s3:PutObjectVersion"
-	GetObjectTorrentAction                  = "s3:GetObjectTorrent"
-	PutObjectTorrentAction                  = "s3:PutObjectTorrent"
-	PutObjectAclAction                      = "s3:PutObjectAcl"
-	GetObjectVersionAclAction               = "s3:GetObjectVersionAcl"
-	PutObjectVersionAclAction               = "s3:PutObjectVersionAcl"
-	DeleteBucketPolicyAction                = "s3:DeleteBucketPolicy"
-	ListMultipartUploadPartsAction          = "s3:ListMultipartUploadParts"
-	AbortMultipartUploadAction              = "s3:AbortMultipartUpload"
-	GetBucketLocationAction                 = "s3:GetBucketLocation"
+	GetObjectTorrentAction         = "s3:GetObjectTorrent"
+	PutObjectTorrentAction         = "s3:PutObjectTorrent"
+	PutObjectAclAction             = "s3:PutObjectAcl"
+	GetObjectVersionAclAction      = "s3:GetObjectVersionAcl"
+	PutObjectVersionAclAction      = "s3:PutObjectVersionAcl"
+	DeleteBucketPolicyAction       = "s3:DeleteBucketPolicy"
+	ListMultipartUploadPartsAction = "s3:ListMultipartUploadParts"
+	AbortMultipartUploadAction     = "s3:AbortMultipartUpload"
+	GetBucketLocationAction        = "s3:GetBucketLocation"
+	PutObjectAttrAction            = "s3:PutObjectAttr"
+	PutObjectTaggingAction         = "s3:PutObjectTagging"
 )
 
 func (s Statement) checkActions(p *RequestParam) bool {