Fix: add recycleLock preventing recycle FileSystem used by another go…

…routine
popyang · Nov 21, 2020 · d97bc26 · d97bc26
1 parent 11c218e
commit d97bc26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/assets b/assets
diff --git a/pkg/filesystem/filesystem.go b/pkg/filesystem/filesystem.go
@@ -97,6 +97,9 @@ type FileSystem struct {
 	   文件系统处理适配器
 	*/
 	Handler Handler
+
+	// 回收锁
+	recycleLock sync.Mutex
 }
 
 // getEmptyFS 从pool中获取新的FileSystem
@@ -107,6 +110,7 @@ func getEmptyFS() *FileSystem {
 
 // Recycle 回收FileSystem资源
 func (fs *FileSystem) Recycle() {
+	fs.recycleLock.Lock()
 	fs.reset()
 	FSPool.Put(fs)
 }
@@ -120,6 +124,7 @@ func (fs *FileSystem) reset() {
 	fs.Handler = nil
 	fs.Root = nil
 	fs.Lock = sync.Mutex{}
+	fs.recycleLock = sync.Mutex{}
 }
 
 // NewFileSystem 初始化一个文件系统

diff --git a/pkg/filesystem/hooks.go b/pkg/filesystem/hooks.go
@@ -228,7 +228,9 @@ func GenericAfterUpdate(ctx context.Context, fs *FileSystem) error {
 
 	// 尝试清空原有缩略图并重新生成
 	if originFile.GetPolicy().IsThumbGenerateNeeded() {
+		fs.recycleLock.Lock()
 		go func() {
+			defer fs.recycleLock.Unlock()
 			if originFile.PicInfo != "" {
 				_, _ = fs.Handler.Delete(ctx, []string{originFile.SourceName + conf.ThumbConfig.FileSuffix})
 				fs.GenerateThumbnail(ctx, &originFile)
@@ -297,7 +299,11 @@ func GenericAfterUpload(ctx context.Context, fs *FileSystem) error {
 
 	// 异步尝试生成缩略图
 	if fs.User.Policy.IsThumbGenerateNeeded() {
-		go fs.GenerateThumbnail(ctx, file)
+		fs.recycleLock.Lock()
+		go func() {
+			defer fs.recycleLock.Unlock()
+			fs.GenerateThumbnail(ctx, file)
+		}()
 	}
 
 	return nil
+8 −1		src/component/Admin/Dialogs/AddPolicy.js
+63 −39		src/component/Admin/Setting/Aria2.js
+2 −2		src/component/Dial/Create.js
+12 −12		src/component/FileManager/ContextMenu.js
+0 −1		src/component/FileManager/Explorer.js
+1 −4		src/component/FileManager/FileManager.js
+1 −1		src/component/FileManager/Navigator/Navigator.js
+1 −6		src/component/Modals/Loading.js
+4 −0		src/redux/viewUpdate/reducer.ts