Merge branch 'master' of https://github.com/chrislusf/seaweedfs
This commit is contained in:
@@ -440,7 +440,7 @@ func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName str
|
|||||||
n := new(needle.Needle)
|
n := new(needle.Needle)
|
||||||
err := n.ReadData(srcDatBackend, offset.ToActualOffset(), size, version)
|
err := n.ReadData(srcDatBackend, offset.ToActualOffset(), size, version)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil
|
return fmt.Errorf("cannot hydrate needle from file: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if n.HasTtl() && now >= n.LastModified+uint64(sb.Ttl.Minutes()*60) {
|
if n.HasTtl() && now >= n.LastModified+uint64(sb.Ttl.Minutes()*60) {
|
||||||
|
|||||||
Reference in New Issue
Block a user