From 942c2cbd7b504813e242ad78837ac3561f9a2130 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 9 May 2018 23:11:54 -0700 Subject: [PATCH] mv pb to master_pb --- weed/command/master.go | 4 +- weed/command/server.go | 4 +- weed/pb/Makefile | 2 +- weed/pb/{ => master_pb}/seaweed.pb.go | 78 +++++++++++++-------------- weed/pb/seaweed.proto | 2 +- weed/server/master_grpc_server.go | 8 +-- weed/server/volume_grpc_client.go | 4 +- weed/storage/store.go | 12 ++--- weed/storage/volume_info.go | 4 +- 9 files changed, 59 insertions(+), 59 deletions(-) rename weed/pb/{ => master_pb}/seaweed.pb.go (73%) diff --git a/weed/command/master.go b/weed/command/master.go index 16e343f77..8abec2a3d 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -9,7 +9,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/server" "github.com/chrislusf/seaweedfs/weed/util" "github.com/gorilla/mux" @@ -104,7 +104,7 @@ func runMaster(cmd *Command, args []string) bool { // Create your protocol servers. grpcS := grpc.NewServer() - pb.RegisterSeaweedServer(grpcS, ms) + master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) httpS := &http.Server{Handler: r} diff --git a/weed/command/server.go b/weed/command/server.go index 626bc0855..2425532ac 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -11,7 +11,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/server" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/util" @@ -226,7 +226,7 @@ func runServer(cmd *Command, args []string) bool { // Create your protocol servers. grpcS := grpc.NewServer() - pb.RegisterSeaweedServer(grpcS, ms) + master_pb.RegisterSeaweedServer(grpcS, ms) reflection.Register(grpcS) httpS := &http.Server{Handler: r} diff --git a/weed/pb/Makefile b/weed/pb/Makefile index 1bb7a0b2c..edcab5e51 100644 --- a/weed/pb/Makefile +++ b/weed/pb/Makefile @@ -3,5 +3,5 @@ all: gen .PHONY : gen gen: - protoc seaweed.proto --go_out=plugins=grpc:. + protoc seaweed.proto --go_out=plugins=grpc:./master_pb protoc filer.proto --go_out=plugins=grpc:../filer diff --git a/weed/pb/seaweed.pb.go b/weed/pb/master_pb/seaweed.pb.go similarity index 73% rename from weed/pb/seaweed.pb.go rename to weed/pb/master_pb/seaweed.pb.go index 51e115b56..f02ffb8f8 100644 --- a/weed/pb/seaweed.pb.go +++ b/weed/pb/master_pb/seaweed.pb.go @@ -3,7 +3,7 @@ // DO NOT EDIT! /* -Package pb is a generated protocol buffer package. +Package master_pb is a generated protocol buffer package. It is generated from these files: seaweed.proto @@ -13,7 +13,7 @@ It has these top-level messages: HeartbeatResponse VolumeInformationMessage */ -package pb +package master_pb import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -236,9 +236,9 @@ func (m *VolumeInformationMessage) GetTtl() uint32 { } func init() { - proto.RegisterType((*Heartbeat)(nil), "pb.Heartbeat") - proto.RegisterType((*HeartbeatResponse)(nil), "pb.HeartbeatResponse") - proto.RegisterType((*VolumeInformationMessage)(nil), "pb.VolumeInformationMessage") + proto.RegisterType((*Heartbeat)(nil), "master_pb.Heartbeat") + proto.RegisterType((*HeartbeatResponse)(nil), "master_pb.HeartbeatResponse") + proto.RegisterType((*VolumeInformationMessage)(nil), "master_pb.VolumeInformationMessage") } // Reference imports to suppress errors if they are not otherwise used. @@ -264,7 +264,7 @@ func NewSeaweedClient(cc *grpc.ClientConn) SeaweedClient { } func (c *seaweedClient) SendHeartbeat(ctx context.Context, opts ...grpc.CallOption) (Seaweed_SendHeartbeatClient, error) { - stream, err := grpc.NewClientStream(ctx, &_Seaweed_serviceDesc.Streams[0], c.cc, "/pb.Seaweed/SendHeartbeat", opts...) + stream, err := grpc.NewClientStream(ctx, &_Seaweed_serviceDesc.Streams[0], c.cc, "/master_pb.Seaweed/SendHeartbeat", opts...) if err != nil { return nil, err } @@ -331,7 +331,7 @@ func (x *seaweedSendHeartbeatServer) Recv() (*Heartbeat, error) { } var _Seaweed_serviceDesc = grpc.ServiceDesc{ - ServiceName: "pb.Seaweed", + ServiceName: "master_pb.Seaweed", HandlerType: (*SeaweedServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ @@ -348,37 +348,37 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("seaweed.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 498 bytes of a gzipped FileDescriptorProto + // 504 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x93, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x49, 0x1a, 0xda, 0xe6, 0x74, 0x1d, 0x9d, 0x25, 0x90, 0x05, 0x03, 0x4a, 0xaf, 0x22, - 0x81, 0x2a, 0x34, 0x24, 0x6e, 0xb8, 0x63, 0xd2, 0x04, 0x1a, 0x88, 0xc9, 0x15, 0xdc, 0x46, 0x4e, - 0x72, 0x86, 0xac, 0x39, 0x7f, 0xe4, 0xb8, 0xa3, 0xd9, 0x03, 0xf1, 0x24, 0x3c, 0x18, 0xf2, 0x71, - 0xd2, 0x02, 0x12, 0x77, 0xe7, 0xfc, 0xce, 0x17, 0xfb, 0xf4, 0xfb, 0x5c, 0x98, 0xb7, 0x28, 0x7f, - 0x20, 0x16, 0xeb, 0xc6, 0xd4, 0xb6, 0x66, 0x61, 0x93, 0xad, 0x7e, 0x86, 0x10, 0x7f, 0x40, 0x69, - 0x6c, 0x86, 0xd2, 0xb2, 0x63, 0x08, 0x55, 0xc3, 0x83, 0x65, 0x90, 0xc4, 0x22, 0x54, 0x0d, 0x63, - 0x10, 0x35, 0xb5, 0xb1, 0x3c, 0x5c, 0x06, 0xc9, 0x5c, 0x50, 0xcd, 0x9e, 0x02, 0x34, 0xdb, 0x4c, - 0xab, 0x3c, 0xdd, 0x1a, 0xcd, 0x47, 0xa4, 0x8d, 0x3d, 0xf9, 0x6a, 0x34, 0x4b, 0x60, 0x51, 0xca, - 0x5d, 0x7a, 0x5b, 0xeb, 0x6d, 0x89, 0x69, 0x5e, 0x6f, 0x2b, 0xcb, 0x23, 0xfa, 0xfc, 0xb8, 0x94, - 0xbb, 0x6f, 0x84, 0xcf, 0x1d, 0x65, 0x4b, 0x38, 0x72, 0xca, 0x6b, 0xa5, 0x31, 0xbd, 0xc1, 0x8e, - 0xdf, 0x5f, 0x06, 0x49, 0x24, 0xa0, 0x94, 0xbb, 0x0b, 0xa5, 0xf1, 0x12, 0x3b, 0xf6, 0x1c, 0x66, - 0x85, 0xb4, 0x32, 0xcd, 0xb1, 0xb2, 0x68, 0xf8, 0x98, 0xee, 0x02, 0x87, 0xce, 0x89, 0xb8, 0xfd, - 0x8c, 0xcc, 0x6f, 0xf8, 0x84, 0x26, 0x54, 0xbb, 0xfd, 0x64, 0x51, 0xaa, 0x2a, 0xa5, 0xcd, 0xa7, - 0x74, 0x75, 0x4c, 0xe4, 0xca, 0xad, 0xff, 0x16, 0x26, 0x7e, 0xb7, 0x96, 0xc7, 0xcb, 0x51, 0x32, - 0x3b, 0x3b, 0x5d, 0x37, 0xd9, 0xda, 0xef, 0xf5, 0xb1, 0xba, 0xae, 0x4d, 0x29, 0xad, 0xaa, 0xab, - 0xcf, 0xd8, 0xb6, 0xf2, 0x3b, 0x8a, 0x41, 0xbc, 0x6a, 0xe1, 0x64, 0xef, 0x93, 0xc0, 0xb6, 0xa9, - 0xab, 0x16, 0x59, 0x02, 0x0f, 0xfc, 0x7c, 0xa3, 0xee, 0xf0, 0x93, 0x2a, 0x95, 0x25, 0xf3, 0x22, - 0xf1, 0x2f, 0x66, 0xa7, 0x10, 0xb7, 0x98, 0x1b, 0xb4, 0x97, 0xd8, 0x91, 0x9d, 0xb1, 0x38, 0x00, - 0xf6, 0x08, 0xc6, 0x1a, 0x65, 0x81, 0xa6, 0xf7, 0xb3, 0xef, 0x56, 0xbf, 0x42, 0xe0, 0xff, 0x5b, - 0x8d, 0xc2, 0x2a, 0xe8, 0xbe, 0xb9, 0x08, 0x55, 0xe1, 0xcc, 0x68, 0xd5, 0x1d, 0xd2, 0xe9, 0x91, - 0xa0, 0x9a, 0x3d, 0x03, 0xc8, 0x6b, 0xad, 0x31, 0x77, 0x1f, 0xf6, 0x87, 0xff, 0x41, 0x9c, 0x59, - 0xe4, 0xff, 0x21, 0xa7, 0x48, 0xc4, 0x8e, 0xf8, 0x88, 0x5e, 0xc0, 0x51, 0x81, 0x1a, 0xed, 0x20, - 0xf0, 0x11, 0xcd, 0x3c, 0xf3, 0x92, 0x57, 0xc0, 0x7c, 0x5b, 0xa4, 0x59, 0xb7, 0x17, 0x8e, 0x49, - 0xb8, 0xe8, 0x27, 0xef, 0xbb, 0x41, 0xfd, 0x04, 0x62, 0x83, 0xb2, 0x48, 0xeb, 0x4a, 0x77, 0x94, - 0xda, 0x54, 0x4c, 0x1d, 0xf8, 0x52, 0xe9, 0x8e, 0xbd, 0x84, 0x13, 0x83, 0x8d, 0x56, 0xb9, 0x4c, - 0x1b, 0x2d, 0x73, 0x2c, 0xb1, 0x1a, 0x02, 0x5c, 0xf4, 0x83, 0xab, 0x81, 0x33, 0x0e, 0x93, 0x5b, - 0x34, 0xad, 0xfb, 0x59, 0x31, 0x49, 0x86, 0x96, 0x2d, 0x60, 0x64, 0xad, 0xe6, 0x40, 0xd4, 0x95, - 0x67, 0x17, 0x30, 0xd9, 0xf8, 0x97, 0xcf, 0xde, 0xc1, 0x7c, 0x83, 0x55, 0x71, 0x78, 0xf2, 0x73, - 0x17, 0xff, 0xbe, 0x7d, 0xfc, 0xf0, 0xaf, 0x76, 0x08, 0x7a, 0x75, 0x2f, 0x09, 0x5e, 0x07, 0xd9, - 0x98, 0xfe, 0x37, 0x6f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xda, 0x3f, 0x9c, 0x48, 0x03, - 0x00, 0x00, + 0x14, 0xc6, 0x49, 0x16, 0xda, 0xfa, 0x74, 0x1d, 0x9d, 0x85, 0x90, 0x05, 0x03, 0x4a, 0xb9, 0x89, + 0x04, 0xaa, 0xd0, 0xb8, 0xe6, 0x86, 0x49, 0x88, 0x69, 0x20, 0x26, 0x17, 0xb8, 0x8d, 0xdc, 0xe4, + 0x0c, 0x59, 0x73, 0xfe, 0xc8, 0x76, 0x47, 0xb3, 0x77, 0xe2, 0x2d, 0x78, 0x30, 0xe4, 0x93, 0xa6, + 0x9d, 0x10, 0xdc, 0x1d, 0xff, 0xce, 0xe7, 0xf8, 0xe4, 0xfb, 0x6c, 0x98, 0x38, 0x54, 0x3f, 0x11, + 0x8b, 0x45, 0x63, 0x6b, 0x5f, 0x73, 0x56, 0x2a, 0xe7, 0xd1, 0x66, 0xcd, 0x6a, 0xfe, 0x2b, 0x06, + 0xf6, 0x11, 0x95, 0xf5, 0x2b, 0x54, 0x9e, 0x1f, 0x41, 0xac, 0x1b, 0x11, 0xcd, 0xa2, 0x94, 0xc9, + 0x58, 0x37, 0x9c, 0x43, 0xd2, 0xd4, 0xd6, 0x8b, 0x78, 0x16, 0xa5, 0x13, 0x49, 0x35, 0x7f, 0x0a, + 0xd0, 0xac, 0x57, 0x46, 0xe7, 0xd9, 0xda, 0x1a, 0x71, 0x40, 0x5a, 0xd6, 0x91, 0x6f, 0xd6, 0xf0, + 0x14, 0xa6, 0xa5, 0xda, 0x64, 0x37, 0xb5, 0x59, 0x97, 0x98, 0xe5, 0xf5, 0xba, 0xf2, 0x22, 0xa1, + 0xed, 0x47, 0xa5, 0xda, 0x7c, 0x27, 0x7c, 0x16, 0x28, 0x9f, 0xc1, 0x61, 0x50, 0x5e, 0x69, 0x83, + 0xd9, 0x35, 0xb6, 0xe2, 0xfe, 0x2c, 0x4a, 0x13, 0x09, 0xa5, 0xda, 0x7c, 0xd0, 0x06, 0x2f, 0xb0, + 0xe5, 0xcf, 0x61, 0x5c, 0x28, 0xaf, 0xb2, 0x1c, 0x2b, 0x8f, 0x56, 0x0c, 0xe8, 0x2c, 0x08, 0xe8, + 0x8c, 0x48, 0x98, 0xcf, 0xaa, 0xfc, 0x5a, 0x0c, 0xa9, 0x43, 0x75, 0x98, 0x4f, 0x15, 0xa5, 0xae, + 0x32, 0x9a, 0x7c, 0x44, 0x47, 0x33, 0x22, 0x97, 0x61, 0xfc, 0x77, 0x30, 0xec, 0x66, 0x73, 0x82, + 0xcd, 0x0e, 0xd2, 0xf1, 0xe9, 0xcb, 0xc5, 0xce, 0x8d, 0x45, 0x37, 0xde, 0x79, 0x75, 0x55, 0xdb, + 0x52, 0x79, 0x5d, 0x57, 0x9f, 0xd1, 0x39, 0xf5, 0x03, 0x65, 0xbf, 0x67, 0xee, 0xe0, 0x78, 0x67, + 0x97, 0x44, 0xd7, 0xd4, 0x95, 0x43, 0x9e, 0xc2, 0x83, 0xae, 0xbf, 0xd4, 0xb7, 0xf8, 0x49, 0x97, + 0xda, 0x93, 0x87, 0x89, 0xfc, 0x1b, 0xf3, 0x13, 0x60, 0x0e, 0x73, 0x8b, 0xfe, 0x02, 0x5b, 0x72, + 0x95, 0xc9, 0x3d, 0xe0, 0x8f, 0x60, 0x60, 0x50, 0x15, 0x68, 0xb7, 0xb6, 0x6e, 0x57, 0xf3, 0xdf, + 0x31, 0x88, 0xff, 0x8d, 0x46, 0x99, 0x15, 0x74, 0xde, 0x44, 0xc6, 0xba, 0x08, 0x9e, 0x38, 0x7d, + 0x8b, 0xf4, 0xf5, 0x44, 0x52, 0xcd, 0x9f, 0x01, 0xe4, 0xb5, 0x31, 0x98, 0x87, 0x8d, 0xdb, 0x8f, + 0xdf, 0x21, 0xc1, 0x33, 0x8a, 0x61, 0x1f, 0x57, 0x22, 0x59, 0x20, 0x5d, 0x52, 0x2f, 0xe0, 0xb0, + 0x40, 0x83, 0xbe, 0x17, 0x74, 0x49, 0x8d, 0x3b, 0xd6, 0x49, 0x5e, 0x03, 0xef, 0x96, 0x45, 0xb6, + 0x6a, 0x77, 0xc2, 0x01, 0x09, 0xa7, 0xdb, 0xce, 0xfb, 0xb6, 0x57, 0x3f, 0x01, 0x66, 0x51, 0x15, + 0x59, 0x5d, 0x99, 0x96, 0xc2, 0x1b, 0xc9, 0x51, 0x00, 0x5f, 0x2a, 0xd3, 0xf2, 0x57, 0x70, 0x6c, + 0xb1, 0x31, 0x3a, 0x57, 0x59, 0x63, 0x54, 0x8e, 0x25, 0x56, 0x7d, 0x8e, 0xd3, 0x6d, 0xe3, 0xb2, + 0xe7, 0x5c, 0xc0, 0xf0, 0x06, 0xad, 0x0b, 0xbf, 0xc5, 0x48, 0xd2, 0x2f, 0xf9, 0x14, 0x0e, 0xbc, + 0x37, 0x02, 0x88, 0x86, 0xf2, 0xf4, 0x2b, 0x0c, 0x97, 0xdd, 0x3b, 0xe0, 0xe7, 0x30, 0x59, 0x62, + 0x55, 0xec, 0x6f, 0xfe, 0xc3, 0x3b, 0xb7, 0x60, 0x47, 0x1f, 0x9f, 0xfc, 0x8b, 0xf6, 0xb1, 0xcf, + 0xef, 0xa5, 0xd1, 0x9b, 0x68, 0x35, 0xa0, 0x37, 0xf5, 0xf6, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x01, 0x14, 0xbb, 0x3a, 0x64, 0x03, 0x00, 0x00, } diff --git a/weed/pb/seaweed.proto b/weed/pb/seaweed.proto index 0eb55b295..dd0223f04 100644 --- a/weed/pb/seaweed.proto +++ b/weed/pb/seaweed.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package pb; +package master_pb; ////////////////////////////////////////////////// diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index c373a439c..12ef9e927 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -5,13 +5,13 @@ import ( "strings" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/topology" "google.golang.org/grpc/peer" ) -func (ms MasterServer) SendHeartbeat(stream pb.Seaweed_SendHeartbeatServer) error { +func (ms MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServer) error { var dn *topology.DataNode t := ms.Topo for { @@ -34,7 +34,7 @@ func (ms MasterServer) SendHeartbeat(stream pb.Seaweed_SendHeartbeatServer) erro int(heartbeat.Port), heartbeat.PublicUrl, int(heartbeat.MaxVolumeCount)) glog.V(0).Infof("added volume server %v:%d", heartbeat.GetIp(), heartbeat.GetPort()) - if err := stream.Send(&pb.HeartbeatResponse{ + if err := stream.Send(&master_pb.HeartbeatResponse{ VolumeSizeLimit: uint64(ms.volumeSizeLimitMB) * 1024 * 1024, SecretKey: string(ms.guard.SecretKey), }); err != nil { @@ -69,7 +69,7 @@ func (ms MasterServer) SendHeartbeat(stream pb.Seaweed_SendHeartbeatServer) erro // tell the volume servers about the leader newLeader, err := t.Leader() if err == nil { - if err := stream.Send(&pb.HeartbeatResponse{ + if err := stream.Send(&master_pb.HeartbeatResponse{ Leader: newLeader, }); err != nil { return err diff --git a/weed/server/volume_grpc_client.go b/weed/server/volume_grpc_client.go index 29c608666..2f3f36924 100644 --- a/weed/server/volume_grpc_client.go +++ b/weed/server/volume_grpc_client.go @@ -5,7 +5,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/storage" "golang.org/x/net/context" @@ -42,7 +42,7 @@ func (vs *VolumeServer) doHeartbeat(sleepInterval time.Duration) error { } defer grpcConection.Close() - client := pb.NewSeaweedClient(grpcConection) + client := master_pb.NewSeaweedClient(grpcConection) stream, err := client.SendHeartbeat(context.Background()) if err != nil { glog.V(0).Infof("%v.SendHeartbeat(_) = _, %v", client, err) diff --git a/weed/storage/store.go b/weed/storage/store.go index 7dfa80955..a7d8db3a1 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -8,7 +8,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" ) const ( @@ -76,7 +76,7 @@ type Store struct { rack string //optional information, overwriting master setting if exists connected bool VolumeSizeLimit uint64 //read from the master - Client pb.Seaweed_SendHeartbeatClient + Client master_pb.Seaweed_SendHeartbeatClient NeedleMapType NeedleMapType } @@ -208,8 +208,8 @@ func (s *Store) SetRack(rack string) { s.rack = rack } -func (s *Store) CollectHeartbeat() *pb.Heartbeat { - var volumeMessages []*pb.VolumeInformationMessage +func (s *Store) CollectHeartbeat() *master_pb.Heartbeat { + var volumeMessages []*master_pb.VolumeInformationMessage maxVolumeCount := 0 var maxFileKey uint64 for _, location := range s.Locations { @@ -220,7 +220,7 @@ func (s *Store) CollectHeartbeat() *pb.Heartbeat { maxFileKey = v.nm.MaxFileKey() } if !v.expired(s.VolumeSizeLimit) { - volumeMessage := &pb.VolumeInformationMessage{ + volumeMessage := &master_pb.VolumeInformationMessage{ Id: uint32(k), Size: uint64(v.Size()), Collection: v.Collection, @@ -245,7 +245,7 @@ func (s *Store) CollectHeartbeat() *pb.Heartbeat { location.Unlock() } - return &pb.Heartbeat{ + return &master_pb.Heartbeat{ Ip: s.Ip, Port: uint32(s.Port), PublicUrl: s.PublicUrl, diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go index c73c27fe4..f6614a9de 100644 --- a/weed/storage/volume_info.go +++ b/weed/storage/volume_info.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" ) type VolumeInfo struct { @@ -20,7 +20,7 @@ type VolumeInfo struct { ReadOnly bool } -func NewVolumeInfo(m *pb.VolumeInformationMessage) (vi VolumeInfo, err error) { +func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err error) { vi = VolumeInfo{ Id: VolumeId(m.Id), Size: m.Size,