diff options
| author | chrislu <chris.lu@gmail.com> | 2022-03-06 17:04:24 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-03-06 17:04:24 -0800 |
| commit | 21ef152423b710282ed2c2205f5b1009d14cfef8 (patch) | |
| tree | 0022dc6a074ab52cc6239b818a5b924b7c4433ed | |
| parent | f3442e36e6aa1385111dfe212bd252d0eeb39d2d (diff) | |
| parent | 89cd0c27a87a8ef80260004d7f4e306726eb24a7 (diff) | |
| download | seaweedfs-21ef152423b710282ed2c2205f5b1009d14cfef8.tar.xz seaweedfs-21ef152423b710282ed2c2205f5b1009d14cfef8.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
| -rw-r--r-- | weed/filer/filechunk_manifest.go | 1 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/weed/filer/filechunk_manifest.go b/weed/filer/filechunk_manifest.go index c74af226c..afd9add99 100644 --- a/weed/filer/filechunk_manifest.go +++ b/weed/filer/filechunk_manifest.go @@ -85,6 +85,7 @@ func ResolveOneChunkManifest(lookupFileIdFn wdclient.LookupFileIdFunctionType, c // IsChunkManifest bytesBuffer := bytesBufferPool.Get().(*bytes.Buffer) + bytesBuffer.Reset() defer bytesBufferPool.Put(bytesBuffer) err := fetchWholeChunk(bytesBuffer, lookupFileIdFn, chunk.GetFileIdString(), chunk.CipherKey, chunk.IsCompressed) if err != nil { diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index e51299c6d..497f59568 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -130,8 +130,8 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) go fs.filer.KeepMasterClientConnected() if !util.LoadConfiguration("filer", false) { - v.Set("leveldb2.enabled", true) - v.Set("leveldb2.dir", option.DefaultLevelDbDir) + v.SetDefault("leveldb2.enabled", true) + v.SetDefault("leveldb2.dir", option.DefaultLevelDbDir) _, err := os.Stat(option.DefaultLevelDbDir) if os.IsNotExist(err) { os.MkdirAll(option.DefaultLevelDbDir, 0755) |