refactoring

This commit is contained in:
Chris Lu
2018-09-23 00:40:36 -07:00
parent 7d6b2a4740
commit 9fe24991d5
5 changed files with 31 additions and 20 deletions

View File

@@ -5,6 +5,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/replication"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/spf13/viper"
"strings"
)
func init() {
@@ -44,6 +45,18 @@ func runFilerReplicate(cmd *Command, args []string) bool {
}
}
// avoid recursive replication
if config.GetBool("notification.source.filer.enabled") && config.GetBool("notification.sink.filer.enabled") {
sourceConfig, sinkConfig := config.Sub("source.filer"), config.Sub("sink.filer")
if sourceConfig.GetString("grpcAddress") == sinkConfig.GetString("grpcAddress") {
fromDir := sourceConfig.GetString("directory")
toDir := sinkConfig.GetString("directory")
if strings.HasPrefix(toDir, fromDir) {
glog.Fatalf("recursive replication! source directory %s includes the sink directory %s", fromDir, toDir)
}
}
}
replicator := replication.NewReplicator(config.Sub("source.filer"), config.Sub("sink.filer"))
for {