diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-20 12:05:28 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-20 12:05:28 -0700 |
| commit | 2ffe98443bcf2170ba6532031d01860446c0213c (patch) | |
| tree | 98ec5486316395cce0dd99997b178cc3b9d772dd /weed/server/volume_grpc_tail.go | |
| parent | 6fc1f53018685e6842c68883af67128fbc0bd522 (diff) | |
| download | seaweedfs-2ffe98443bcf2170ba6532031d01860446c0213c.tar.xz seaweedfs-2ffe98443bcf2170ba6532031d01860446c0213c.zip | |
refactoring
Diffstat (limited to 'weed/server/volume_grpc_tail.go')
| -rw-r--r-- | weed/server/volume_grpc_tail.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_tail.go b/weed/server/volume_grpc_tail.go index 16154c9cc..820c28a1d 100644 --- a/weed/server/volume_grpc_tail.go +++ b/weed/server/volume_grpc_tail.go @@ -22,7 +22,7 @@ func (vs *VolumeServer) VolumeTailSender(req *volume_server_pb.VolumeTailSenderR defer glog.V(1).Infof("tailing volume %d finished", v.Id) lastTimestampNs := req.SinceNs - drainingSeconds := req.DrainingSeconds + drainingSeconds := req.IdleTimeoutSeconds for { lastProcessedTimestampNs, err := sendNeedlesSince(stream, v, lastTimestampNs) @@ -32,7 +32,7 @@ func (vs *VolumeServer) VolumeTailSender(req *volume_server_pb.VolumeTailSenderR } time.Sleep(2 * time.Second) - if req.DrainingSeconds == 0 { + if req.IdleTimeoutSeconds == 0 { lastTimestampNs = lastProcessedTimestampNs continue } @@ -44,7 +44,7 @@ func (vs *VolumeServer) VolumeTailSender(req *volume_server_pb.VolumeTailSenderR glog.V(1).Infof("tailing volume %d drains requests with %d seconds remaining", v.Id, drainingSeconds) } else { lastTimestampNs = lastProcessedTimestampNs - drainingSeconds = req.DrainingSeconds + drainingSeconds = req.IdleTimeoutSeconds glog.V(1).Infof("tailing volume %d resets draining wait time to %d seconds", v.Id, drainingSeconds) } @@ -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.TailVolumeFromServer(req.SourceVolumeServer, vs.grpcDialOption, v.Id, req.SinceNs, int(req.DrainingSeconds), func(n *needle.Needle) error { + 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) return err }) |
