Merge branch 'master' of https://github.com/chrislusf/seaweedfs

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 {

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)