1
0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-12 13:28:30 +00:00

Don't merge virtual repo when get a error which isn't path no exist (#548)

* Don't merge virtual repo when get a error which isn't path no exist

* Modify log info
This commit is contained in:
feiniks
2022-03-22 16:42:29 +08:00
committed by GitHub
parent 96b33251ce
commit c31e5dd25d
3 changed files with 27 additions and 5 deletions

View File

@@ -1,6 +1,7 @@
package main
import (
"errors"
"fmt"
"path/filepath"
"strings"
@@ -35,7 +36,10 @@ func mergeVirtualRepo(args ...string) error {
}
if virtual {
mergeRepo(repoID)
err := mergeRepo(repoID)
if err != nil {
log.Printf("%v", err)
}
go updateSizePool.AddTask(repoID)
@@ -52,7 +56,10 @@ func mergeVirtualRepo(args ...string) error {
continue
}
mergeRepo(id)
err := mergeRepo(id)
if err != nil {
log.Printf("%v", err)
}
}
go updateSizePool.AddTask(repoID)
@@ -88,7 +95,11 @@ func mergeRepo(repoID string) error {
}
var origRoot string
origRoot, _ = fsmgr.GetSeafdirIDByPath(origRepo.StoreID, origHead.RootID, vInfo.Path)
origRoot, err = fsmgr.GetSeafdirIDByPath(origRepo.StoreID, origHead.RootID, vInfo.Path)
if err != nil && !errors.Is(err, fsmgr.ErrPathNoExist) {
err := fmt.Errorf("failed to get seafdir id by path in origin repo %.10s: %v", origRepo.StoreID, err)
return err
}
if origRoot == "" {
newPath, _ := handleMissingVirtualRepo(origRepo, origHead, vInfo)
if newPath != "" {