func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFolder { return &rwFolder{ stateTracker: stateTracker{ folder: cfg.ID, mut: sync.NewMutex(), }, model: m, progressEmitter: m.progressEmitter, virtualMtimeRepo: db.NewVirtualMtimeRepo(m.db, cfg.ID), folder: cfg.ID, dir: cfg.Path(), scanIntv: time.Duration(cfg.RescanIntervalS) * time.Second, ignorePerms: cfg.IgnorePerms, copiers: cfg.Copiers, pullers: cfg.Pullers, shortID: shortID, order: cfg.Order, encrypt: cfg.Encrypt, key: cfg.Passphrase, stop: make(chan struct{}), queue: newJobQueue(), pullTimer: time.NewTimer(shortPullIntv), scanTimer: time.NewTimer(time.Millisecond), // The first scan should be done immediately. delayScan: make(chan time.Duration), scanNow: make(chan rescanRequest), remoteIndex: make(chan struct{}, 1), // This needs to be 1-buffered so that we queue a notification if we're busy doing a pull when it comes. errorsMut: sync.NewMutex(), } }
func (m *Model) AddFolder(cfg config.FolderConfiguration) { if m.started { panic("cannot add folder to started model") } if len(cfg.ID) == 0 { panic("cannot add empty folder id") } m.fmut.Lock() m.folderCfgs[cfg.ID] = cfg m.folderFiles[cfg.ID] = db.NewFileSet(cfg.ID, m.db) m.folderDevices[cfg.ID] = make([]protocol.DeviceID, len(cfg.Devices)) for i, device := range cfg.Devices { m.folderDevices[cfg.ID][i] = device.DeviceID m.deviceFolders[device.DeviceID] = append(m.deviceFolders[device.DeviceID], cfg.ID) } ignores := ignore.New(m.cfg.Options().CacheIgnoredFiles) _ = ignores.Load(filepath.Join(cfg.Path(), ".stignore")) // Ignore error, there might not be an .stignore m.folderIgnores[cfg.ID] = ignores m.fmut.Unlock() }
func TestFolderWithoutRestart(t *testing.T) { log.Println("Cleaning...") err := removeAll("testfolder-p1", "testfolder-p4", "h1/index*", "h4/index*") if err != nil { t.Fatal(err) } defer removeAll("testfolder-p1", "testfolder-p4") if err := generateFiles("testfolder-p1", 50, 18, "../LICENSE"); err != nil { t.Fatal(err) } p1 := startInstance(t, 1) defer checkedStop(t, p1) p4 := startInstance(t, 4) defer checkedStop(t, p4) if ok, err := p1.ConfigInSync(); err != nil || !ok { t.Fatal("p1 should be in sync;", ok, err) } if ok, err := p4.ConfigInSync(); err != nil || !ok { t.Fatal("p4 should be in sync;", ok, err) } // Add a new folder to p1, shared with p4. Back up and restore the config // first. log.Println("Adding testfolder to p1...") os.Remove("h1/config.xml.orig") os.Rename("h1/config.xml", "h1/config.xml.orig") defer os.Rename("h1/config.xml.orig", "h1/config.xml") cfg, err := p1.GetConfig() if err != nil { t.Fatal(err) } newFolder := config.FolderConfiguration{ ID: "testfolder", RawPath: "testfolder-p1", RescanIntervalS: 86400, Copiers: 1, Hashers: 1, Pullers: 1, Devices: []config.FolderDeviceConfiguration{{DeviceID: p4.ID()}}, } newDevice := config.DeviceConfiguration{ DeviceID: p4.ID(), Name: "p4", Addresses: []string{"dynamic"}, Compression: protocol.CompressMetadata, } cfg.Folders = append(cfg.Folders, newFolder) cfg.Devices = append(cfg.Devices, newDevice) if err = p1.PostConfig(cfg); err != nil { t.Fatal(err) } // Add a new folder to p4, shared with p1. Back up and restore the config // first. log.Println("Adding testfolder to p4...") os.Remove("h4/config.xml.orig") os.Rename("h4/config.xml", "h4/config.xml.orig") defer os.Rename("h4/config.xml.orig", "h4/config.xml") cfg, err = p4.GetConfig() if err != nil { t.Fatal(err) } newFolder.RawPath = "testfolder-p4" newFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: p1.ID()}} newDevice.DeviceID = p1.ID() newDevice.Name = "p1" newDevice.Addresses = []string{"127.0.0.1:22001"} cfg.Folders = append(cfg.Folders, newFolder) cfg.Devices = append(cfg.Devices, newDevice) if err = p4.PostConfig(cfg); err != nil { t.Fatal(err) } // The change should not require a restart, so the config should be "in sync" if ok, err := p1.ConfigInSync(); err != nil || !ok { t.Fatal("p1 should be in sync;", ok, err) } if ok, err := p4.ConfigInSync(); err != nil || !ok { t.Fatal("p4 should be in sync;", ok, err) } // The folder should start and scan - wait for the event that signals this // has happened. log.Println("Waiting for testfolder to scan...") since := 0 outer: for { events, err := p4.Events(since) if err != nil { t.Fatal(err) } for _, event := range events { if event.Type == "StateChanged" { data := event.Data.(map[string]interface{}) folder := data["folder"].(string) from := data["from"].(string) to := data["to"].(string) if folder == "testfolder" && from == "scanning" && to == "idle" { break outer } } since = event.ID } } // It should sync to the other side successfully log.Println("Waiting for p1 and p4 to connect and sync...") rc.AwaitSync("testfolder", p1, p4) }
func TestSanityCheck(t *testing.T) { fcfg := config.FolderConfiguration{ ID: "folder", Path: "testdata/testfolder", } cfg := config.Wrap("/tmp/test", config.Configuration{ Folders: []config.FolderConfiguration{fcfg}, }) for _, file := range []string{".stfolder", "testfolder", "testfolder/.stfolder"} { _, err := os.Stat("testdata/" + file) if err == nil { t.Error("Found unexpected file") } } db, _ := leveldb.Open(storage.NewMemStorage(), nil) // Case 1 - new folder, directory and marker created m := model.NewModel(cfg, "device", "syncthing", "dev", db) sanityCheckFolders(cfg, m) if cfg.Folders()["folder"].Invalid != "" { t.Error("Unexpected error", cfg.Folders()["folder"].Invalid) } s, err := os.Stat("testdata/testfolder") if err != nil || !s.IsDir() { t.Error(err) } _, err = os.Stat("testdata/testfolder/.stfolder") if err != nil { t.Error(err) } os.Remove("testdata/testfolder/.stfolder") os.Remove("testdata/testfolder/") // Case 2 - new folder, marker created fcfg.Path = "testdata/" cfg = config.Wrap("/tmp/test", config.Configuration{ Folders: []config.FolderConfiguration{fcfg}, }) m = model.NewModel(cfg, "device", "syncthing", "dev", db) sanityCheckFolders(cfg, m) if cfg.Folders()["folder"].Invalid != "" { t.Error("Unexpected error", cfg.Folders()["folder"].Invalid) } _, err = os.Stat("testdata/.stfolder") if err != nil { t.Error(err) } os.Remove("testdata/.stfolder") // Case 3 - marker missing set := files.NewSet("folder", db) set.Update(protocol.LocalDeviceID, []protocol.FileInfo{ {Name: "dummyfile"}, }) m = model.NewModel(cfg, "device", "syncthing", "dev", db) sanityCheckFolders(cfg, m) if cfg.Folders()["folder"].Invalid != "folder marker missing" { t.Error("Incorrect error") } // Case 4 - path missing fcfg.Path = "testdata/testfolder" cfg = config.Wrap("/tmp/test", config.Configuration{ Folders: []config.FolderConfiguration{fcfg}, }) m = model.NewModel(cfg, "device", "syncthing", "dev", db) sanityCheckFolders(cfg, m) if cfg.Folders()["folder"].Invalid != "folder path missing" { t.Error("Incorrect error") } }