style: go fmt for all

This commit is contained in:
Wine93 2019-04-30 03:22:19 +00:00
parent 82e06a780b
commit 32f93fb09e
12 changed files with 19 additions and 23 deletions

View file

@ -1,10 +1,10 @@
package command package command
import ( import (
"fmt"
"github.com/chrislusf/raft/protobuf" "github.com/chrislusf/raft/protobuf"
"github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"fmt"
"net/http" "net/http"
"os" "os"
"runtime" "runtime"

View file

@ -79,10 +79,10 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
} }
if len(heartbeat.NewVolumes) > 0 || len(heartbeat.DeletedVolumes) > 0 { if len(heartbeat.NewVolumes) > 0 || len(heartbeat.DeletedVolumes) > 0 {
// process delta volume ids if exists for fast volume id updates // 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) message.NewVids = append(message.NewVids, volInfo.Id)
} }
for _, volInfo := range heartbeat.DeletedVolumes{ for _, volInfo := range heartbeat.DeletedVolumes {
message.DeletedVids = append(message.DeletedVids, volInfo.Id) message.DeletedVids = append(message.DeletedVids, volInfo.Id)
} }
// update master internal volume layouts // 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) newVolumes, deletedVolumes := t.SyncDataNodeRegistration(heartbeat.Volumes, dn)
for _, v := range newVolumes { 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)) message.NewVids = append(message.NewVids, uint32(v.Id))
} }
for _, v := range deletedVolumes { for _, v := range deletedVolumes {

View file

@ -99,7 +99,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA
select { select {
case volumeMessage := <-vs.store.NewVolumesChan: case volumeMessage := <-vs.store.NewVolumesChan:
deltaBeat := &master_pb.Heartbeat{ deltaBeat := &master_pb.Heartbeat{
NewVolumes:[]*master_pb.VolumeShortInformationMessage{ NewVolumes: []*master_pb.VolumeShortInformationMessage{
&volumeMessage, &volumeMessage,
}, },
} }
@ -110,7 +110,7 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA
} }
case volumeMessage := <-vs.store.DeletedVolumesChan: case volumeMessage := <-vs.store.DeletedVolumesChan:
deltaBeat := &master_pb.Heartbeat{ deltaBeat := &master_pb.Heartbeat{
DeletedVolumes:[]*master_pb.VolumeShortInformationMessage{ DeletedVolumes: []*master_pb.VolumeShortInformationMessage{
&volumeMessage, &volumeMessage,
}, },
} }

View file

@ -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) { 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 { return operation.WithVolumeServerClient(sourceVolumeServer, grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error {
_, unmountErr := volumeServerClient.VolumeUnmount(ctx, &volume_server_pb.VolumeUnmountRequest{ _, unmountErr := volumeServerClient.VolumeUnmount(ctx, &volume_server_pb.VolumeUnmountRequest{

View file

@ -188,4 +188,3 @@ func ParseNeedleIdCookie(key_hash_string string) (NeedleId, Cookie, error) {
func (n *Needle) LastModifiedString() string { func (n *Needle) LastModifiedString() string {
return time.Unix(int64(n.LastModified), 0).Format("2006-01-02T15:04:05") return time.Unix(int64(n.LastModified), 0).Format("2006-01-02T15:04:05")
} }

View file

@ -185,7 +185,7 @@ func (n *Needle) ReadData(r *os.File, offset int64, size uint32, version Version
case Version2, Version3: case Version2, Version3:
err = n.readNeedleDataVersion2(bytes[NeedleHeaderSize : NeedleHeaderSize+int(n.Size)]) err = n.readNeedleDataVersion2(bytes[NeedleHeaderSize : NeedleHeaderSize+int(n.Size)])
} }
if err != nil && err != io.EOF{ if err != nil && err != io.EOF {
return err return err
} }
if size > 0 { if size > 0 {
@ -390,4 +390,3 @@ func (n *Needle) SetHasPairs() {
func getActualSize(size uint32, version Version) int64 { func getActualSize(size uint32, version Version) int64 {
return NeedleHeaderSize + NeedleBodyLength(size, version) return NeedleHeaderSize + NeedleBodyLength(size, version)
} }

View file

@ -3,11 +3,11 @@ package needle
import "testing" import "testing"
func TestNewVolumeId(t *testing.T) { func TestNewVolumeId(t *testing.T) {
if _,err := NewVolumeId("1"); err != nil { if _, err := NewVolumeId("1"); err != nil {
t.Error(err) 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) t.Logf("a is not legal volume id, %v", err)
} }
} }

View file

@ -15,7 +15,7 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin
return 0, fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), e) return 0, fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), e)
} }
if indexSize == 0 { if indexSize == 0 {
return 0,nil return 0, nil
} }
var lastIdxEntry []byte var lastIdxEntry []byte
if lastIdxEntry, e = readIndexEntryAtOffset(indexFile, indexSize-NeedleMapEntrySize); e != nil { 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) key, offset, size := IdxFileEntry(lastIdxEntry)
if offset.IsZero() { if offset.IsZero() {
return 0,nil return 0, nil
} }
if size == TombstoneFileSize { if size == TombstoneFileSize {
size = 0 size = 0

View file

@ -45,9 +45,9 @@ func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err er
func NewVolumeInfoFromShort(m *master_pb.VolumeShortInformationMessage) (vi VolumeInfo, err error) { func NewVolumeInfoFromShort(m *master_pb.VolumeShortInformationMessage) (vi VolumeInfo, err error) {
vi = VolumeInfo{ vi = VolumeInfo{
Id: needle.VolumeId(m.Id), Id: needle.VolumeId(m.Id),
Collection: m.Collection, Collection: m.Collection,
Version: needle.Version(m.Version), Version: needle.Version(m.Version),
} }
rp, e := NewReplicaPlacementFromByte(byte(m.ReplicaPlacement)) rp, e := NewReplicaPlacementFromByte(byte(m.ReplicaPlacement))
if e != nil { if e != nil {

View file

@ -46,8 +46,8 @@ type NodeImpl struct {
maxVolumeCount int64 maxVolumeCount int64
parent Node parent Node
sync.RWMutex // lock children sync.RWMutex // lock children
children map[NodeId]Node children map[NodeId]Node
maxVolumeId needle.VolumeId maxVolumeId needle.VolumeId
//for rack, data center, topology //for rack, data center, topology
nodeType string nodeType string

View file

@ -114,10 +114,10 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) {
nil, nil,
dn) dn)
for vid, _ := range layout.vid2location{ for vid, _ := range layout.vid2location {
println("after add volume id", vid) println("after add volume id", vid)
} }
for _, vid := range layout.writables{ for _, vid := range layout.writables {
println("after add writable volume id", vid) println("after add writable volume id", vid)
} }

View file

@ -91,4 +91,3 @@ func UnGzipData(input []byte) ([]byte, error) {
return false, false return false, false
} }