From a07c93f4dd41d4eba4551090543e22ee25f81cfa Mon Sep 17 00:00:00 2001 From: banjiaojuhao Date: Sun, 6 Mar 2022 21:06:04 +0800 Subject: [PATCH 1/2] filer: reset bytesBuffer before use --- weed/filer/filechunk_manifest.go | 1 + 1 file changed, 1 insertion(+) 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 { From cf444ebd07858c4b43f2df542d628d23a28bfd5e Mon Sep 17 00:00:00 2001 From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> Date: Sun, 6 Mar 2022 18:27:25 +0500 Subject: [PATCH 2/2] Set default leveldb2 enabled avoid Filer store is enabled for both leveldb2 and mysql --- weed/server/filer_server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)