From 1fed603df9c90dcfe64f8639949b07654ca3f718 Mon Sep 17 00:00:00 2001 From: "chris.lu@gmail.com" Date: Sat, 17 Dec 2011 06:50:51 +0000 Subject: [PATCH] now working for registering volume id ~ machine mapping git-svn-id: https://weed-fs.googlecode.com/svn/trunk@13 282b0af5-e82d-9cf1-ede4-77906d7719d0 --- weed-fs/src/pkg/directory/volume_mapping.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weed-fs/src/pkg/directory/volume_mapping.go b/weed-fs/src/pkg/directory/volume_mapping.go index ffc90ec7d..e9a0647e5 100644 --- a/weed-fs/src/pkg/directory/volume_mapping.go +++ b/weed-fs/src/pkg/directory/volume_mapping.go @@ -39,7 +39,8 @@ func NewMapper(dirname string, filename string, capacity int) (m *Mapper) { log.Println("Mapping File Read", e) } else { decoder := gob.NewDecoder(dataFile) - decoder.Decode(m.Machines) + defer dataFile.Close() + decoder.Decode(&m.Machines) for _, list := range m.Machines { //TODO: what if a list has mixed readers and writers? Now it's treated as readonly allCanWrite := false @@ -50,7 +51,6 @@ func NewMapper(dirname string, filename string, capacity int) (m *Mapper) { m.writers = append(m.writers, list) } } - dataFile.Close() log.Println("Loaded mapping size", len(m.Machines)) } return