Revert "Revert "Merge branch 'master' into sub""

This reverts commit 0bb97709d4.
This commit is contained in:
chrislu
2023-09-18 18:47:34 -07:00
parent 0bb97709d4
commit 27af11f1e8
21 changed files with 290 additions and 199 deletions

View File

@@ -2,11 +2,12 @@ package mount
import (
"fmt"
"io"
"sync"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/mount/page_writer"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"io"
"sync"
)
type ChunkedDirtyPages struct {
@@ -82,7 +83,7 @@ func (pages *ChunkedDirtyPages) saveChunkedFileIntervalToStorage(reader io.Reade
}
func (pages ChunkedDirtyPages) Destroy() {
func (pages *ChunkedDirtyPages) Destroy() {
pages.uploadPipeline.Shutdown()
}