Merge pull request #28 from chrislusf/master

sync

1 files changed, 16 insertions, 14 deletions

diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go
index 3d3fac184..a200050c4 100644
--- a/weed/filesys/dirty_page.go
+++ b/weed/filesys/dirty_page.go
@@ -6,16 +6,18 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"io"
 	"sync"
+	"time"
 )
 
 type ContinuousDirtyPages struct {
-	intervals        *ContinuousIntervals
-	f                *File
-	writeWaitGroup   sync.WaitGroup
-	chunkSaveErrChan chan error
-	lock             sync.Mutex
-	collection       string
-	replication      string
+	intervals              *ContinuousIntervals
+	f                      *File
+	writeWaitGroup         sync.WaitGroup
+	chunkSaveErrChan       chan error
+	chunkSaveErrChanClosed bool
+	lock                   sync.Mutex
+	collection             string
+	replication            string
 }
 
 func newDirtyPages(file *File) *ContinuousDirtyPages {
@@ -81,6 +83,12 @@ func (pages *ContinuousDirtyPages) saveExistingLargestPageToStorage() (hasSavedD
 
 func (pages *ContinuousDirtyPages) saveToStorage(reader io.Reader, offset int64, size int64) {
 
+	if pages.chunkSaveErrChanClosed {
+		pages.chunkSaveErrChan = make(chan error, 8)
+		pages.chunkSaveErrChanClosed = false
+	}
+
+	mtime := time.Now().UnixNano()
 	pages.writeWaitGroup.Add(1)
 	go func() {
 		defer pages.writeWaitGroup.Done()
@@ -94,19 +102,13 @@ func (pages *ContinuousDirtyPages) saveToStorage(reader io.Reader, offset int64,
 			pages.chunkSaveErrChan <- err
 			return
 		}
+		chunk.Mtime = mtime
 		pages.collection, pages.replication = collection, replication
 		pages.f.addChunks([]*filer_pb.FileChunk{chunk})
 		pages.chunkSaveErrChan <- nil
 	}()
 }
 
-func maxUint64(x, y uint64) uint64 {
-	if x > y {
-		return x
-	}
-	return y
-}
-
 func max(x, y int64) int64 {
 	if x > y {
 		return x