diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-16 00:44:31 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-16 00:44:31 -0700 |
| commit | b3b42bc947ec44acdc69efdeebb623a0c092078a (patch) | |
| tree | 9fecee1d6f5bced1e7e1436a331e8c8973db8a78 /weed/filer2 | |
| parent | 967e108b9a33d4e3cdd59dacd3356c070ed312a9 (diff) | |
| download | seaweedfs-b3b42bc947ec44acdc69efdeebb623a0c092078a.tar.xz seaweedfs-b3b42bc947ec44acdc69efdeebb623a0c092078a.zip | |
replicate need to include new entry path
Diffstat (limited to 'weed/filer2')
| -rw-r--r-- | weed/filer2/entry.go | 13 | ||||
| -rw-r--r-- | weed/filer2/filer_notify.go | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/weed/filer2/entry.go b/weed/filer2/entry.go index f17a11727..3f8a19114 100644 --- a/weed/filer2/entry.go +++ b/weed/filer2/entry.go @@ -52,9 +52,20 @@ func (entry *Entry) ToProtoEntry() *filer_pb.Entry { return nil } return &filer_pb.Entry{ - Name: string(entry.FullPath), + Name: entry.FullPath.Name(), IsDirectory: entry.IsDirectory(), Attributes: EntryAttributeToPb(entry), Chunks: entry.Chunks, } } + +func (entry *Entry) ToProtoFullEntry() *filer_pb.FullEntry { + if entry == nil { + return nil + } + dir, _ := entry.FullPath.DirAndName() + return &filer_pb.FullEntry{ + Dir: dir, + Entry: entry.ToProtoEntry(), + } +} diff --git a/weed/filer2/filer_notify.go b/weed/filer2/filer_notify.go index b3c215249..c37381116 100644 --- a/weed/filer2/filer_notify.go +++ b/weed/filer2/filer_notify.go @@ -20,12 +20,18 @@ func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool) glog.V(3).Infof("notifying entry update %v", key) + newParentPath := "" + if newEntry != nil { + newParentPath, _ = newEntry.FullPath.DirAndName() + } + notification.Queue.SendMessage( key, &filer_pb.EventNotification{ - OldEntry: oldEntry.ToProtoEntry(), - NewEntry: newEntry.ToProtoEntry(), - DeleteChunks: deleteChunks, + OldEntry: oldEntry.ToProtoEntry(), + NewEntry: newEntry.ToProtoEntry(), + DeleteChunks: deleteChunks, + NewParentPath: newParentPath, }, ) |
