378f688a6a
* add config watcher to the config package * add logging to watcher * add test and refactor to add WatcherEvent. * add all API calls and fix a bug with recreated files * add tests for watcher * remove the unnecessary use of context * Add debug log and a test for file rename * use inode to detect if the file is recreated/replaced and only listen to create events. * tidy ups (#1535) * tidy ups * Add tests for inode reconcile * fix linux vs windows syscall * fix linux vs windows syscall * fix windows compile error * increase timeout * use ctime ID * remove remove/creation test as it's a use case that fail in linux * fix linux/windows to use Ino/CreationTime * fix the watcher to only overwrite current file id * fix linter error * fix remove/create test * set reconcile loop to 200 Milliseconds * fix watcher to not trigger event on remove, add more tests * on a remove event try to add the file back to the watcher and trigger the handler if success * fix race condition * fix flaky test * fix race conditions * set level to info * fix when file is removed and get an event for it after * fix to trigger handler when we get a remove but re-add fail * fix error message * add tests for directory watch and fixes * detect if a file is a symlink and return an error on Add * rename Watcher to FileWatcher and remove symlink deref * add fsnotify@v1.5.1 * fix go mod * fix flaky test * Apply suggestions from code review Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> * fix a possible stack overflow * do not reset timer on errors, rename OS specific files * start the watcher when creating it * fix data race in tests * rename New func * do not call handler when a remove event happen * events trigger on write and rename * fix watcher tests * make handler async * remove recursive call * do not produce events for sub directories * trim "/" at the end of a directory when adding * add missing test * fix logging * add todo * fix failing test * fix flaking tests * fix flaky test * add logs * fix log text * increase timeout * reconcile when remove * check reconcile when removed * fix reconcile move test * fix logging * delete invalid file * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix review comments * fix is watched to properly catch a remove * change test timeout * fix test and rename id * fix test to create files with different mod time. * fix deadlock when stopping watcher * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix a deadlock when calling stop while emitting event is blocked * make sure to close the event channel after the event loop is done * add go doc * back date file instead of sleeping * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * check error Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>
338 lines
9.2 KiB
Go
338 lines
9.2 KiB
Go
package config
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"math/rand"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/go-hclog"
|
|
|
|
"github.com/hashicorp/consul/sdk/testutil"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
const defaultTimeout = 500 * time.Millisecond
|
|
|
|
func TestNewWatcher(t *testing.T) {
|
|
w, err := NewFileWatcher([]string{}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
require.NotNil(t, w)
|
|
}
|
|
|
|
func TestWatcherRenameEvent(t *testing.T) {
|
|
|
|
fileTmp := createTempConfigFile(t, "temp_config3")
|
|
filepaths := []string{createTempConfigFile(t, "temp_config1"), createTempConfigFile(t, "temp_config2")}
|
|
w, err := NewFileWatcher(filepaths, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
require.NoError(t, err)
|
|
err = os.Rename(fileTmp, filepaths[0])
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepaths[0], w.EventsCh, defaultTimeout))
|
|
// make sure we consume all events
|
|
assertEvent(filepaths[0], w.EventsCh, defaultTimeout)
|
|
}
|
|
|
|
func TestWatcherAddNotExist(t *testing.T) {
|
|
|
|
file := testutil.TempFile(t, "temp_config")
|
|
filename := file.Name() + randomStr(16)
|
|
w, err := NewFileWatcher([]string{filename}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.Error(t, err, "no such file or directory")
|
|
require.Nil(t, w)
|
|
}
|
|
|
|
func TestEventWatcherWrite(t *testing.T) {
|
|
|
|
file := testutil.TempFile(t, "temp_config")
|
|
_, err := file.WriteString("test config")
|
|
require.NoError(t, err)
|
|
err = file.Sync()
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{file.Name()}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
_, err = file.WriteString("test config 2")
|
|
require.NoError(t, err)
|
|
err = file.Sync()
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(file.Name(), w.EventsCh, defaultTimeout))
|
|
}
|
|
|
|
func TestEventWatcherRead(t *testing.T) {
|
|
|
|
filepath := createTempConfigFile(t, "temp_config1")
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
_, err = os.ReadFile(filepath)
|
|
require.NoError(t, err)
|
|
require.Error(t, assertEvent(filepath, w.EventsCh, defaultTimeout), "timedout waiting for event")
|
|
}
|
|
|
|
func TestEventWatcherChmod(t *testing.T) {
|
|
file := testutil.TempFile(t, "temp_config")
|
|
defer func() {
|
|
err := file.Close()
|
|
require.NoError(t, err)
|
|
}()
|
|
_, err := file.WriteString("test config")
|
|
require.NoError(t, err)
|
|
err = file.Sync()
|
|
require.NoError(t, err)
|
|
|
|
w, err := NewFileWatcher([]string{file.Name()}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
err = file.Chmod(0777)
|
|
require.NoError(t, err)
|
|
require.Error(t, assertEvent(file.Name(), w.EventsCh, defaultTimeout), "timedout waiting for event")
|
|
}
|
|
|
|
func TestEventWatcherRemoveCreate(t *testing.T) {
|
|
|
|
filepath := createTempConfigFile(t, "temp_config1")
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
require.NoError(t, err)
|
|
err = os.Remove(filepath)
|
|
require.NoError(t, err)
|
|
recreated, err := os.Create(filepath)
|
|
require.NoError(t, err)
|
|
_, err = recreated.WriteString("config 2")
|
|
require.NoError(t, err)
|
|
err = recreated.Sync()
|
|
require.NoError(t, err)
|
|
// this an event coming from the reconcile loop
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
}
|
|
|
|
func TestEventWatcherMove(t *testing.T) {
|
|
|
|
filepath := createTempConfigFile(t, "temp_config1")
|
|
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
for i := 0; i < 10; i++ {
|
|
filepath2 := createTempConfigFile(t, "temp_config2")
|
|
err = os.Rename(filepath2, filepath)
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
}
|
|
}
|
|
|
|
func TestEventReconcileMove(t *testing.T) {
|
|
filepath := createTempConfigFile(t, "temp_config1")
|
|
filepath2 := createTempConfigFile(t, "temp_config2")
|
|
err := os.Chtimes(filepath, time.Now(), time.Now().Add(-1*time.Second))
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
// remove the file from the internal watcher to only trigger the reconcile
|
|
err = w.watcher.Remove(filepath)
|
|
require.NoError(t, err)
|
|
|
|
err = os.Rename(filepath2, filepath)
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, 2000*time.Millisecond))
|
|
}
|
|
|
|
func TestEventWatcherDirCreateRemove(t *testing.T) {
|
|
filepath := testutil.TempDir(t, "temp_config1")
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
for i := 0; i < 1; i++ {
|
|
name := filepath + "/" + randomStr(20)
|
|
file, err := os.Create(name)
|
|
require.NoError(t, err)
|
|
err = file.Close()
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
|
|
err = os.Remove(name)
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
}
|
|
}
|
|
|
|
func TestEventWatcherDirMove(t *testing.T) {
|
|
filepath := testutil.TempDir(t, "temp_config1")
|
|
|
|
name := filepath + "/" + randomStr(20)
|
|
file, err := os.Create(name)
|
|
require.NoError(t, err)
|
|
err = file.Close()
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
for i := 0; i < 100; i++ {
|
|
filepathTmp := createTempConfigFile(t, "temp_config2")
|
|
os.Rename(filepathTmp, name)
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
}
|
|
}
|
|
|
|
func TestEventWatcherDirMoveTrim(t *testing.T) {
|
|
filepath := testutil.TempDir(t, "temp_config1")
|
|
|
|
name := filepath + "/" + randomStr(20)
|
|
file, err := os.Create(name)
|
|
require.NoError(t, err)
|
|
err = file.Close()
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{filepath + "/"}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
for i := 0; i < 100; i++ {
|
|
filepathTmp := createTempConfigFile(t, "temp_config2")
|
|
os.Rename(filepathTmp, name)
|
|
require.NoError(t, err)
|
|
require.NoError(t, assertEvent(filepath, w.EventsCh, defaultTimeout))
|
|
}
|
|
}
|
|
|
|
// Consul do not support configuration in sub-directories
|
|
func TestEventWatcherSubDirMove(t *testing.T) {
|
|
filepath := testutil.TempDir(t, "temp_config1")
|
|
err := os.Mkdir(filepath+"/temp", 0777)
|
|
require.NoError(t, err)
|
|
name := filepath + "/temp/" + randomStr(20)
|
|
file, err := os.Create(name)
|
|
require.NoError(t, err)
|
|
err = file.Close()
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
defer func() {
|
|
_ = w.Stop()
|
|
}()
|
|
|
|
for i := 0; i < 2; i++ {
|
|
filepathTmp := createTempConfigFile(t, "temp_config2")
|
|
os.Rename(filepathTmp, name)
|
|
require.NoError(t, err)
|
|
require.Error(t, assertEvent(filepath, w.EventsCh, defaultTimeout), "timedout waiting for event")
|
|
}
|
|
}
|
|
|
|
func TestEventWatcherDirRead(t *testing.T) {
|
|
filepath := testutil.TempDir(t, "temp_config1")
|
|
|
|
name := filepath + "/" + randomStr(20)
|
|
file, err := os.Create(name)
|
|
require.NoError(t, err)
|
|
err = file.Close()
|
|
require.NoError(t, err)
|
|
w, err := NewFileWatcher([]string{filepath}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.NoError(t, err)
|
|
w.Start(context.Background())
|
|
t.Cleanup(func() {
|
|
_ = w.Stop()
|
|
})
|
|
|
|
_, err = os.ReadFile(name)
|
|
require.NoError(t, err)
|
|
require.Error(t, assertEvent(filepath, w.EventsCh, defaultTimeout), "timedout waiting for event")
|
|
}
|
|
|
|
func TestEventWatcherMoveSoftLink(t *testing.T) {
|
|
|
|
filepath := createTempConfigFile(t, "temp_config1")
|
|
tempDir := testutil.TempDir(t, "temp_dir")
|
|
name := tempDir + "/" + randomStr(20)
|
|
err := os.Symlink(filepath, name)
|
|
require.NoError(t, err)
|
|
|
|
w, err := NewFileWatcher([]string{name}, hclog.New(&hclog.LoggerOptions{}))
|
|
require.Error(t, err, "symbolic link are not supported")
|
|
require.Nil(t, w)
|
|
|
|
}
|
|
|
|
func assertEvent(name string, watcherCh chan *FileWatcherEvent, timeout time.Duration) error {
|
|
select {
|
|
case ev := <-watcherCh:
|
|
if ev.Filename != name && !strings.Contains(ev.Filename, name) {
|
|
return fmt.Errorf("filename do not match %s %s", ev.Filename, name)
|
|
}
|
|
return nil
|
|
case <-time.After(timeout):
|
|
return fmt.Errorf("timedout waiting for event")
|
|
}
|
|
}
|
|
|
|
func createTempConfigFile(t *testing.T, filename string) string {
|
|
file := testutil.TempFile(t, filename)
|
|
|
|
_, err1 := file.WriteString("test config")
|
|
err2 := file.Close()
|
|
|
|
require.NoError(t, err1)
|
|
require.NoError(t, err2)
|
|
|
|
return file.Name()
|
|
}
|
|
|
|
func randomStr(length int) string {
|
|
const charset = "abcdefghijklmnopqrstuvwxyz" +
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
|
var seededRand *rand.Rand = rand.New(
|
|
rand.NewSource(time.Now().UnixNano()))
|
|
b := make([]byte, length)
|
|
for i := range b {
|
|
b[i] = charset[seededRand.Intn(len(charset))]
|
|
}
|
|
return string(b)
|
|
}
|