aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Lebedev <lebedev_k@tochka.com>2021-01-28 14:56:13 +0500
committerKonstantin Lebedev <lebedev_k@tochka.com>2021-01-28 14:56:13 +0500
commit02fdc0a333bedac882c5f9c103d073c3180ec6bb (patch)
treeb21a49e6febcae643ed2097a46d34cef86765c21
parent6b54ff991249d2ce5dfbe28ffb503fc770d5db6c (diff)
downloadseaweedfs-02fdc0a333bedac882c5f9c103d073c3180ec6bb.tar.xz
seaweedfs-02fdc0a333bedac882c5f9c103d073c3180ec6bb.zip
rename backup to local_incremental and use mtime
-rw-r--r--docker/replication.toml2
-rw-r--r--weed/command/filer_replication.go2
-rw-r--r--weed/replication/replicator.go10
-rw-r--r--weed/replication/sink/backupsink/backup_sink.go18
-rw-r--r--weed/replication/sink/localincrementalsink/local_incremental_sink.go18
5 files changed, 25 insertions, 25 deletions
diff --git a/docker/replication.toml b/docker/replication.toml
index 75e34a899..833bb1692 100644
--- a/docker/replication.toml
+++ b/docker/replication.toml
@@ -6,6 +6,6 @@ grpcAddress = "filer:18888"
# i.e., all files with this "prefix" are sent to notification message queue.
directory = "/buckets"
-[sink.backup]
+[sink.local_incremental]
enabled = true
directory = "/data" \ No newline at end of file
diff --git a/weed/command/filer_replication.go b/weed/command/filer_replication.go
index f2754139b..47ef5d1b6 100644
--- a/weed/command/filer_replication.go
+++ b/weed/command/filer_replication.go
@@ -9,9 +9,9 @@ import (
"github.com/chrislusf/seaweedfs/weed/replication/sink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/azuresink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/b2sink"
- _ "github.com/chrislusf/seaweedfs/weed/replication/sink/backupsink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/filersink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/gcssink"
+ _ "github.com/chrislusf/seaweedfs/weed/replication/sink/localincrementalsink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/localsink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/s3sink"
"github.com/chrislusf/seaweedfs/weed/replication/sub"
diff --git a/weed/replication/replicator.go b/weed/replication/replicator.go
index 81d546c3c..7688029e6 100644
--- a/weed/replication/replicator.go
+++ b/weed/replication/replicator.go
@@ -42,14 +42,14 @@ func (r *Replicator) Replicate(ctx context.Context, key string, message *filer_p
return nil
}
var dateKey string
- if r.sink.GetName() == "backup" {
- var crTime int64
+ if r.sink.GetName() == "local_incremental" {
+ var mTime int64
if message.NewEntry != nil {
- crTime = message.NewEntry.Attributes.Crtime
+ mTime = message.NewEntry.Attributes.Mtime
} else if message.OldEntry != nil {
- crTime = message.OldEntry.Attributes.Crtime
+ mTime = message.OldEntry.Attributes.Mtime
}
- dateKey = time.Unix(crTime, 0).Format("2006-01-02")
+ dateKey = time.Unix(mTime, 0).Format("2006-01-02")
}
newKey := util.Join(r.sink.GetSinkToDirectory(), dateKey, key[len(r.source.Dir):])
glog.V(3).Infof("replicate %s => %s", key, newKey)
diff --git a/weed/replication/sink/backupsink/backup_sink.go b/weed/replication/sink/backupsink/backup_sink.go
deleted file mode 100644
index df0a778d1..000000000
--- a/weed/replication/sink/backupsink/backup_sink.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package backupsink
-
-import (
- "github.com/chrislusf/seaweedfs/weed/replication/sink"
- "github.com/chrislusf/seaweedfs/weed/replication/sink/localsink"
-)
-
-type BackupSink struct {
- localsink.LocalSink
-}
-
-func (backupsink *BackupSink) GetName() string {
- return "backup"
-}
-
-func init() {
- sink.Sinks = append(sink.Sinks, &BackupSink{})
-}
diff --git a/weed/replication/sink/localincrementalsink/local_incremental_sink.go b/weed/replication/sink/localincrementalsink/local_incremental_sink.go
new file mode 100644
index 000000000..97da3a5f7
--- /dev/null
+++ b/weed/replication/sink/localincrementalsink/local_incremental_sink.go
@@ -0,0 +1,18 @@
+package localincrementalsink
+
+import (
+ "github.com/chrislusf/seaweedfs/weed/replication/sink"
+ "github.com/chrislusf/seaweedfs/weed/replication/sink/localsink"
+)
+
+type LocalIncSink struct {
+ localsink.LocalSink
+}
+
+func (localincsink *LocalIncSink) GetName() string {
+ return "local_incremental"
+}
+
+func init() {
+ sink.Sinks = append(sink.Sinks, &LocalIncSink{})
+}