Merge branch 'master' into messaging

weed/filer/meta_aggregator.go

@@ -185,7 +185,7 @@ func (ma *MetaAggregator) doSubscribeToOneFiler(f *Filer, self pb.ServerAddress,
 		return nil
 	}
 
-	glog.V(4).Infof("subscribing remote %s meta change: %v, clientId:%d", peer, time.Unix(0, lastTsNs), ma.filer.UniqueFileId)
+	glog.V(0).Infof("subscribing remote %s meta change: %v, clientId:%d", peer, time.Unix(0, lastTsNs), ma.filer.UniqueFileId)
 	err = pb.WithFilerClient(true, peer, ma.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

weed/filer/reader_cache.go

@@ -76,7 +76,9 @@ func (rc *ReaderCache) ReadChunkAt(buffer []byte, fileId string, cipherKey []byt
 	rc.Lock()
 	defer rc.Unlock()
 	if cacher, found := rc.downloaders[fileId]; found {
-		return cacher.readChunkAt(buffer, offset)
+		if n, err := cacher.readChunkAt(buffer, offset); n != 0 && err == nil {
+			return n, err
+		}
 	}
 	if shouldCache || rc.lookupFileIdFn == nil {
 		n, err := rc.chunkCache.ReadChunkAt(buffer, fileId, uint64(offset))
@@ -176,6 +178,9 @@ func (s *SingleChunkCacher) startCaching() {
 }
 
 func (s *SingleChunkCacher) destroy() {
+	s.Lock()
+	defer s.Unlock()
+
 	if s.data != nil {
 		mem.Free(s.data)
 		s.data = nil
@@ -194,6 +199,10 @@ func (s *SingleChunkCacher) readChunkAt(buf []byte, offset int64) (int, error) {
 		return 0, s.err
 	}
 
+	if len(s.data) == 0 {
+		return 0, nil
+	}
+
 	return copy(buf, s.data[offset:]), nil
 
 }