From 32f93fb09e76cc89c14b33bb049f8427f99baa9e Mon Sep 17 00:00:00 2001 From: Wine93 Date: Tue, 30 Apr 2019 03:22:19 +0000 Subject: [PATCH] style: go fmt for all --- weed/command/server.go | 2 +- weed/server/master_grpc_server.go | 6 +++--- weed/server/volume_grpc_client_to_master.go | 4 ++-- weed/shell/command_volume_unmount.go | 1 - weed/storage/needle/needle.go | 1 - weed/storage/needle/needle_read_write.go | 3 +-- weed/storage/needle/volume_id_test.go | 6 +++--- weed/storage/volume_checking.go | 4 ++-- weed/storage/volume_info.go | 6 +++--- weed/topology/node.go | 4 ++-- weed/topology/topology_test.go | 4 ++-- weed/util/compression.go | 1 - 12 files changed, 19 insertions(+), 23 deletions(-) diff --git a/weed/command/server.go b/weed/command/server.go index 49d872bcb..228594ad0 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -1,10 +1,10 @@ package command import ( + "fmt" "github.com/chrislusf/raft/protobuf" "github.com/chrislusf/seaweedfs/weed/security" "github.com/spf13/viper" - "fmt" "net/http" "os" "runtime" diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 730412b47..1cc3fef7a 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -79,10 +79,10 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ } if len(heartbeat.NewVolumes) > 0 || len(heartbeat.DeletedVolumes) > 0 { // process delta volume ids if exists for fast volume id updates - for _, volInfo := range heartbeat.NewVolumes{ + for _, volInfo := range heartbeat.NewVolumes { message.NewVids = append(message.NewVids, volInfo.Id) } - for _, volInfo := range heartbeat.DeletedVolumes{ + for _, volInfo := range heartbeat.DeletedVolumes { message.DeletedVids = append(message.DeletedVids, volInfo.Id) } // update master internal volume layouts @@ -92,7 +92,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ newVolumes, deletedVolumes := t.SyncDataNodeRegistration(heartbeat.Volumes, dn) for _, v := range newVolumes { - glog.V(0).Infof("master see new volume %d from %s", uint32(v.Id), dn.Url()) + glog.V(0).Infof("master see new volume %d from %s", uint32(v.Id), dn.Url()) message.NewVids = append(message.NewVids, uint32(v.Id)) } for _, v := range deletedVolumes { diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index 1c292db6a..b30b2d124 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -99,7 +99,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA select { case volumeMessage := <-vs.store.NewVolumesChan: deltaBeat := &master_pb.Heartbeat{ - NewVolumes:[]*master_pb.VolumeShortInformationMessage{ + NewVolumes: []*master_pb.VolumeShortInformationMessage{ &volumeMessage, }, } @@ -110,7 +110,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA } case volumeMessage := <-vs.store.DeletedVolumesChan: deltaBeat := &master_pb.Heartbeat{ - DeletedVolumes:[]*master_pb.VolumeShortInformationMessage{ + DeletedVolumes: []*master_pb.VolumeShortInformationMessage{ &volumeMessage, }, } diff --git a/weed/shell/command_volume_unmount.go b/weed/shell/command_volume_unmount.go index 5fa4084dc..ce9f666af 100644 --- a/weed/shell/command_volume_unmount.go +++ b/weed/shell/command_volume_unmount.go @@ -50,7 +50,6 @@ func (c *commandVolumeUnmount) Do(args []string, commandEnv *commandEnv, writer } - func unmountVolume(ctx context.Context, grpcDialOption grpc.DialOption, volumeId needle.VolumeId, sourceVolumeServer string) (err error) { return operation.WithVolumeServerClient(sourceVolumeServer, grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { _, unmountErr := volumeServerClient.VolumeUnmount(ctx, &volume_server_pb.VolumeUnmountRequest{ diff --git a/weed/storage/needle/needle.go b/weed/storage/needle/needle.go index c224d2767..14265ec78 100644 --- a/weed/storage/needle/needle.go +++ b/weed/storage/needle/needle.go @@ -188,4 +188,3 @@ func ParseNeedleIdCookie(key_hash_string string) (NeedleId, Cookie, error) { func (n *Needle) LastModifiedString() string { return time.Unix(int64(n.LastModified), 0).Format("2006-01-02T15:04:05") } - diff --git a/weed/storage/needle/needle_read_write.go b/weed/storage/needle/needle_read_write.go index e1ad075b4..85f335892 100644 --- a/weed/storage/needle/needle_read_write.go +++ b/weed/storage/needle/needle_read_write.go @@ -185,7 +185,7 @@ func (n *Needle) ReadData(r *os.File, offset int64, size uint32, version Version case Version2, Version3: err = n.readNeedleDataVersion2(bytes[NeedleHeaderSize : NeedleHeaderSize+int(n.Size)]) } - if err != nil && err != io.EOF{ + if err != nil && err != io.EOF { return err } if size > 0 { @@ -390,4 +390,3 @@ func (n *Needle) SetHasPairs() { func getActualSize(size uint32, version Version) int64 { return NeedleHeaderSize + NeedleBodyLength(size, version) } - diff --git a/weed/storage/needle/volume_id_test.go b/weed/storage/needle/volume_id_test.go index c1c426989..5ffcd90f6 100644 --- a/weed/storage/needle/volume_id_test.go +++ b/weed/storage/needle/volume_id_test.go @@ -3,11 +3,11 @@ package needle import "testing" func TestNewVolumeId(t *testing.T) { - if _,err := NewVolumeId("1"); err != nil { + if _, err := NewVolumeId("1"); err != nil { t.Error(err) } - if _, err := NewVolumeId("a");err != nil { + if _, err := NewVolumeId("a"); err != nil { t.Logf("a is not legal volume id, %v", err) } } @@ -42,4 +42,4 @@ func TestVolumeId_Next(t *testing.T) { if new := pvid.Next(); new != 12 { t.Errorf("get next volume id failed") } -} \ No newline at end of file +} diff --git a/weed/storage/volume_checking.go b/weed/storage/volume_checking.go index 980656823..7bb998fa6 100644 --- a/weed/storage/volume_checking.go +++ b/weed/storage/volume_checking.go @@ -15,7 +15,7 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin return 0, fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), e) } if indexSize == 0 { - return 0,nil + return 0, nil } var lastIdxEntry []byte if lastIdxEntry, e = readIndexEntryAtOffset(indexFile, indexSize-NeedleMapEntrySize); e != nil { @@ -23,7 +23,7 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin } key, offset, size := IdxFileEntry(lastIdxEntry) if offset.IsZero() { - return 0,nil + return 0, nil } if size == TombstoneFileSize { size = 0 diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go index 0e05019d2..2f6d1e8f9 100644 --- a/weed/storage/volume_info.go +++ b/weed/storage/volume_info.go @@ -45,9 +45,9 @@ func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err er func NewVolumeInfoFromShort(m *master_pb.VolumeShortInformationMessage) (vi VolumeInfo, err error) { vi = VolumeInfo{ - Id: needle.VolumeId(m.Id), - Collection: m.Collection, - Version: needle.Version(m.Version), + Id: needle.VolumeId(m.Id), + Collection: m.Collection, + Version: needle.Version(m.Version), } rp, e := NewReplicaPlacementFromByte(byte(m.ReplicaPlacement)) if e != nil { diff --git a/weed/topology/node.go b/weed/topology/node.go index a115c8480..d1f539506 100644 --- a/weed/topology/node.go +++ b/weed/topology/node.go @@ -46,8 +46,8 @@ type NodeImpl struct { maxVolumeCount int64 parent Node sync.RWMutex // lock children - children map[NodeId]Node - maxVolumeId needle.VolumeId + children map[NodeId]Node + maxVolumeId needle.VolumeId //for rack, data center, topology nodeType string diff --git a/weed/topology/topology_test.go b/weed/topology/topology_test.go index 7d7d4d7ad..8f79ad684 100644 --- a/weed/topology/topology_test.go +++ b/weed/topology/topology_test.go @@ -114,10 +114,10 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { nil, dn) - for vid, _ := range layout.vid2location{ + for vid, _ := range layout.vid2location { println("after add volume id", vid) } - for _, vid := range layout.writables{ + for _, vid := range layout.writables { println("after add writable volume id", vid) } diff --git a/weed/util/compression.go b/weed/util/compression.go index bb78f916c..c6c9423e2 100644 --- a/weed/util/compression.go +++ b/weed/util/compression.go @@ -91,4 +91,3 @@ func UnGzipData(input []byte) ([]byte, error) { return false, false } -