Merge pull request #38 from aszxqw/master

fix

go/operation/system_message.pb.go

@@ -14,7 +14,7 @@ It has these top-level messages:
 */
 package operation
 
-import proto "code.google.com/p/goprotobuf/proto"
+import "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

go/operation/system_message_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"testing"
 
-	proto "code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 func TestSerialDeserial(t *testing.T) {

go/storage/needle.go

@@ -3,6 +3,7 @@ package storage
 import (
 	"encoding/hex"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"mime"
 	"net/http"
@@ -24,6 +25,7 @@ const (
 )
 
 /*
+* A Needle means a uploaded and stored file.
 * Needle file size is limited to 4GB for now.
  */
 type Needle struct {
@@ -45,6 +47,11 @@ type Needle struct {
 	Padding  []byte `comment:"Aligned to 8 bytes"`
 }
 
+func (n *Needle) String() (str string) {
+	str = fmt.Sprintf("Cookie:%d, Id:%d, Size:%d, DataSize:%d, Name: %s, Mime: %s", n.Cookie, n.Id, n.Size, n.DataSize, n.Name, n.Mime)
+	return
+}
+
 func ParseUpload(r *http.Request) (fileName string, data []byte, mimeType string, isGzipped bool, modifiedTime uint64, ttl *TTL, e error) {
 	form, fe := r.MultipartReader()
 	if fe != nil {

go/storage/store.go

@@ -9,10 +9,10 @@ import (
 	"strconv"
 	"strings"
 
-	proto "code.google.com/p/goprotobuf/proto"
 	"github.com/chrislusf/weed-fs/go/glog"
 	"github.com/chrislusf/weed-fs/go/operation"
 	"github.com/chrislusf/weed-fs/go/util"
+	"github.com/golang/protobuf/proto"
 )
 
 const (
@@ -33,6 +33,10 @@ type MasterNodes struct {
 	lastNode int
 }
 
+func (mn *MasterNodes) String() string {
+	return fmt.Sprintf("nodes:%v, lastNode:%d", mn.nodes, mn.lastNode)
+}
+
 func NewMasterNodes(bootstrapNode string) (mn *MasterNodes) {
 	mn = &MasterNodes{nodes: []string{bootstrapNode}, lastNode: -1}
 	return
@@ -65,6 +69,9 @@ func (mn *MasterNodes) findMaster() (string, error) {
 	return mn.nodes[mn.lastNode], nil
 }
 
+/*
+ * A VolumeServer contains one Store
+ */
 type Store struct {
 	Port            int
 	Ip              string
@@ -77,6 +84,11 @@ type Store struct {
 	masterNodes     *MasterNodes
 }
 
+func (s *Store) String() (str string) {
+	str = fmt.Sprintf("Ip:%s, Port:%d, PublicUrl:%s, dataCenter:%s, rack:%s, connected:%v, volumeSizeLimit:%d, masterNodes:%s", s.Ip, s.Port, s.PublicUrl, s.dataCenter, s.rack, s.connected, s.volumeSizeLimit, s.masterNodes)
+	return
+}
+
 func NewStore(port int, ip, publicUrl string, dirnames []string, maxVolumeCounts []int) (s *Store) {
 	s = &Store{Port: port, Ip: ip, PublicUrl: publicUrl}
 	s.Locations = make([]*DiskLocation, 0)

go/storage/volume.go

@@ -33,6 +33,10 @@ func NewVolume(dirname string, collection string, id VolumeId, replicaPlacement
 	e = v.load(true, true)
 	return
 }
+func (v *Volume) String() string {
+	return fmt.Sprintf("Id:%v, dir:%s, Collection:%s, dataFile:%v, nm:%v, readOnly:%v", v.Id, v.dir, v.Collection, v.dataFile, v.nm, v.readOnly)
+}
+
 func loadVolumeWithoutIndex(dirname string, collection string, id VolumeId) (v *Volume, e error) {
 	v = &Volume{dir: dirname, Collection: collection, Id: id}
 	v.SuperBlock = SuperBlock{}
@@ -135,7 +139,7 @@ func (v *Volume) isFileUnchanged(n *Needle) bool {
 		oldNeedle := new(Needle)
 		oldNeedle.Read(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version())
 		if oldNeedle.Checksum == n.Checksum && bytes.Equal(oldNeedle.Data, n.Data) {
-			n.Size = oldNeedle.Size
+			n.DataSize = oldNeedle.DataSize
 			return true
 		}
 	}
@@ -165,7 +169,7 @@ func (v *Volume) write(n *Needle) (size uint32, err error) {
 	v.accessLock.Lock()
 	defer v.accessLock.Unlock()
 	if v.isFileUnchanged(n) {
-		size = n.Size
+		size = n.DataSize
 		glog.V(4).Infof("needle is unchanged!")
 		return
 	}

go/weed/weed_server/master_server_handlers_admin.go

@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	proto "code.google.com/p/goprotobuf/proto"
 	"github.com/chrislusf/weed-fs/go/glog"
 	"github.com/chrislusf/weed-fs/go/operation"
 	"github.com/chrislusf/weed-fs/go/storage"
 	"github.com/chrislusf/weed-fs/go/topology"
 	"github.com/chrislusf/weed-fs/go/util"
+	"github.com/golang/protobuf/proto"
 )
 
 func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) {