diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-21 13:31:45 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-21 13:31:45 -0700 |
| commit | 0302b9496cedd0b830733a738ff973a9355774a2 (patch) | |
| tree | 7c43b3c4c9fea6f3117c3762c62c72712d02a693 | |
| parent | 132921ad4183bb42cee992661be57e12c5f63981 (diff) | |
| download | seaweedfs-0302b9496cedd0b830733a738ff973a9355774a2.tar.xz seaweedfs-0302b9496cedd0b830733a738ff973a9355774a2.zip | |
volume: also check cookie for possible duplicates
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 2 | ||||
| -rw-r--r-- | weed/storage/volume_read_write.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index 65ef490cf..17278f83e 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -120,7 +120,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA return "", err } case <-tickChan: - glog.V(1).Infof("volume server %s:%d heartbeat", vs.store.Ip, vs.store.Port) + glog.V(2).Infof("volume server %s:%d heartbeat", vs.store.Ip, vs.store.Port) if err = stream.Send(vs.store.CollectHeartbeat()); err != nil { glog.V(0).Infof("Volume Server Failed to talk with master %s: %v", masterNode, err) return "", err diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go index 222f11d66..6899ebbc1 100644 --- a/weed/storage/volume_read_write.go +++ b/weed/storage/volume_read_write.go @@ -29,7 +29,7 @@ func (v *Volume) isFileUnchanged(n *needle.Needle) bool { glog.V(0).Infof("Failed to check updated file at offset %d size %d: %v", nv.Offset.ToAcutalOffset(), nv.Size, err) return false } - if oldNeedle.Checksum == n.Checksum && bytes.Equal(oldNeedle.Data, n.Data) { + if oldNeedle.Cookie == n.Cookie && oldNeedle.Checksum == n.Checksum && bytes.Equal(oldNeedle.Data, n.Data) { n.DataSize = oldNeedle.DataSize return true } |