diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2019-07-18 16:57:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 16:57:16 +0800 |
| commit | 6a573d62e06b0e70db8075e30849e7b2c7e2624d (patch) | |
| tree | b654e5a30cc657d6060513111288c0cc3b118a49 /weed/server | |
| parent | d19bbee98d89ec6cd603572bd9c5d55749610e61 (diff) | |
| parent | c54d9221b90676b499830f27064cc7ef8f6cfdfd (diff) | |
| download | seaweedfs-6a573d62e06b0e70db8075e30849e7b2c7e2624d.tar.xz seaweedfs-6a573d62e06b0e70db8075e30849e7b2c7e2624d.zip | |
merge laster (#2)
merge laster
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server.go | 3 | ||||
| -rw-r--r-- | weed/server/volume_grpc_batch_delete.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_grpc_tail.go | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 1a17327a0..e0d1fd174 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -52,8 +52,9 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ return err } + t.Sequence.SetMax(heartbeat.MaxFileKey) + if dn == nil { - t.Sequence.SetMax(heartbeat.MaxFileKey) if heartbeat.Ip == "" { if pr, ok := peer.FromContext(stream.Context()); ok { if pr.Addr != net.Addr(nil) { diff --git a/weed/server/volume_grpc_batch_delete.go b/weed/server/volume_grpc_batch_delete.go index d7fbb6edf..fdb7937d2 100644 --- a/weed/server/volume_grpc_batch_delete.go +++ b/weed/server/volume_grpc_batch_delete.go @@ -58,7 +58,7 @@ func (vs *VolumeServer) BatchDelete(ctx context.Context, req *volume_server_pb.B break } n.LastModified = now - if size, err := vs.store.Delete(volumeId, n); err != nil { + if size, err := vs.store.DeleteVolumeNeedle(volumeId, n); err != nil { resp.Results = append(resp.Results, &volume_server_pb.DeleteResult{ FileId: fid, Status: http.StatusInternalServerError, diff --git a/weed/server/volume_grpc_tail.go b/weed/server/volume_grpc_tail.go index 698bad5b8..34c55a599 100644 --- a/weed/server/volume_grpc_tail.go +++ b/weed/server/volume_grpc_tail.go @@ -110,7 +110,7 @@ func (vs *VolumeServer) VolumeTailReceiver(ctx context.Context, req *volume_serv defer glog.V(1).Infof("receive tailing volume %d finished", v.Id) return resp, operation.TailVolumeFromSource(req.SourceVolumeServer, vs.grpcDialOption, v.Id, req.SinceNs, int(req.IdleTimeoutSeconds), func(n *needle.Needle) error { - _, _, err := vs.store.Write(v.Id, n) + _, _, err := vs.store.WriteVolumeNeedle(v.Id, n) return err }) |