Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: slave node cannot transfer files to other slave node

Browse source
This commit is contained in:
HFO4 2021-11-30 19:26:07 +08:00
parent 7ea72cf364
commit af4d9767c2
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/filesystem/filesystem.go
View file

@ -247,9 +247,6 @@ func (fs *FileSystem) SwitchToSlaveHandler(node cluster.Node) {
// SwitchToShadowHandler 将负责上传的 Handler 切换为从机节点转存使用的影子处理器 // SwitchToShadowHandler 将负责上传的 Handler 切换为从机节点转存使用的影子处理器
func (fs *FileSystem) SwitchToShadowHandler(master cluster.Node, masterURL, masterID string) { func (fs *FileSystem) SwitchToShadowHandler(master cluster.Node, masterURL, masterID string) {
switch fs.Policy.Type { switch fs.Policy.Type {
case "remote":
fs.Policy.Type = "local"
fs.DispatchHandler()
case "local": case "local":
fs.Policy.Type = "remote" fs.Policy.Type = "remote"
fs.Policy.Server = masterURL fs.Policy.Server = masterURL

14
pkg/filesystem/filesystem_test.go
View file

@ -292,17 +292,17 @@ func TestFileSystem_SwitchToShadowHandler(t *testing.T) {
Model: &model.Node{}, Model: &model.Node{},
} }
// remote to local
{
fs.Policy.Type = "remote"
fs.SwitchToShadowHandler(mockNode, "", "")
a.IsType(&masterinslave.Driver{}, fs.Handler)
}
// local to remote // local to remote
{ {
fs.Policy.Type = "local" fs.Policy.Type = "local"
fs.SwitchToShadowHandler(mockNode, "", "") fs.SwitchToShadowHandler(mockNode, "", "")
a.IsType(&masterinslave.Driver{}, fs.Handler) a.IsType(&masterinslave.Driver{}, fs.Handler)
} }
// onedrive
{
fs.Policy.Type = "onedrive"
fs.SwitchToShadowHandler(mockNode, "", "")
a.IsType(&masterinslave.Driver{}, fs.Handler)
}
} }