Browse Source

shell: add volume.balance command

pull/991/head
Chris Lu 6 years ago
parent
commit
3ff92037cc
  1. 1
      weed/pb/master.proto
  2. 197
      weed/pb/master_pb/master.pb.go
  3. 3
      weed/server/master_grpc_server_volume.go
  4. 211
      weed/shell/command_volume_balance.go

1
weed/pb/master.proto

@ -202,4 +202,5 @@ message VolumeListRequest {
}
message VolumeListResponse {
TopologyInfo topology_info = 1;
uint64 volume_size_limit_mb = 2;
}

197
weed/pb/master_pb/master.pb.go

@ -1068,7 +1068,8 @@ func (*VolumeListRequest) ProtoMessage() {}
func (*VolumeListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
type VolumeListResponse struct {
TopologyInfo *TopologyInfo `protobuf:"bytes,1,opt,name=topology_info,json=topologyInfo" json:"topology_info,omitempty"`
TopologyInfo *TopologyInfo `protobuf:"bytes,1,opt,name=topology_info,json=topologyInfo" json:"topology_info,omitempty"`
VolumeSizeLimitMb uint64 `protobuf:"varint,2,opt,name=volume_size_limit_mb,json=volumeSizeLimitMb" json:"volume_size_limit_mb,omitempty"`
}
func (m *VolumeListResponse) Reset() { *m = VolumeListResponse{} }
@ -1083,6 +1084,13 @@ func (m *VolumeListResponse) GetTopologyInfo() *TopologyInfo {
return nil
}
func (m *VolumeListResponse) GetVolumeSizeLimitMb() uint64 {
if m != nil {
return m.VolumeSizeLimitMb
}
return 0
}
func init() {
proto.RegisterType((*Heartbeat)(nil), "master_pb.Heartbeat")
proto.RegisterType((*HeartbeatResponse)(nil), "master_pb.HeartbeatResponse")
@ -1486,97 +1494,98 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("master.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 1457 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6e, 0xdb, 0x46,
0x10, 0x36, 0x29, 0x59, 0x96, 0x46, 0x96, 0x2c, 0xad, 0x9d, 0x84, 0x51, 0x9a, 0x44, 0xd9, 0x5c,
0x94, 0xfe, 0x18, 0xa9, 0x7b, 0xe8, 0xa1, 0x2d, 0x82, 0xc4, 0x71, 0x50, 0x23, 0x6e, 0x93, 0x50,
0x49, 0x0a, 0x14, 0x28, 0xd8, 0x35, 0xb9, 0x76, 0x08, 0x53, 0x24, 0x4b, 0xae, 0x1c, 0x2b, 0x97,
0x5e, 0x7a, 0x2c, 0xda, 0x43, 0x5f, 0xa2, 0x4f, 0xd1, 0x4b, 0x8f, 0x79, 0x98, 0x02, 0xbd, 0x17,
0x28, 0xf6, 0x87, 0xe4, 0x92, 0x92, 0xed, 0xb4, 0x40, 0x0e, 0xb9, 0xed, 0xce, 0xcc, 0xce, 0xce,
0x7e, 0x33, 0xfc, 0x66, 0x24, 0x58, 0x9d, 0x90, 0x94, 0xd1, 0x64, 0x33, 0x4e, 0x22, 0x16, 0xa1,
0x96, 0xdc, 0x39, 0xf1, 0x3e, 0x7e, 0x5d, 0x83, 0xd6, 0x97, 0x94, 0x24, 0x6c, 0x9f, 0x12, 0x86,
0xba, 0x60, 0xfa, 0xb1, 0x65, 0x0c, 0x8d, 0x51, 0xcb, 0x36, 0xfd, 0x18, 0x21, 0xa8, 0xc7, 0x51,
0xc2, 0x2c, 0x73, 0x68, 0x8c, 0x3a, 0xb6, 0x58, 0xa3, 0xab, 0x00, 0xf1, 0x74, 0x3f, 0xf0, 0x5d,
0x67, 0x9a, 0x04, 0x56, 0x4d, 0xd8, 0xb6, 0xa4, 0xe4, 0x59, 0x12, 0xa0, 0x11, 0xf4, 0x26, 0xe4,
0xc4, 0x39, 0x8e, 0x82, 0xe9, 0x84, 0x3a, 0x6e, 0x34, 0x0d, 0x99, 0x55, 0x17, 0xc7, 0xbb, 0x13,
0x72, 0xf2, 0x5c, 0x88, 0xb7, 0xb9, 0x14, 0x0d, 0x79, 0x54, 0x27, 0xce, 0x81, 0x1f, 0x50, 0xe7,
0x88, 0xce, 0xac, 0xe5, 0xa1, 0x31, 0xaa, 0xdb, 0x30, 0x21, 0x27, 0x0f, 0xfc, 0x80, 0x3e, 0xa4,
0x33, 0x74, 0x1d, 0xda, 0x1e, 0x61, 0xc4, 0x71, 0x69, 0xc8, 0x68, 0x62, 0x35, 0xc4, 0x5d, 0xc0,
0x45, 0xdb, 0x42, 0xc2, 0xe3, 0x4b, 0x88, 0x7b, 0x64, 0xad, 0x08, 0x8d, 0x58, 0xf3, 0xf8, 0x88,
0x37, 0xf1, 0x43, 0x47, 0x44, 0xde, 0x14, 0x57, 0xb7, 0x84, 0xe4, 0x31, 0x0f, 0xff, 0x0b, 0x58,
0x91, 0xb1, 0xa5, 0x56, 0x6b, 0x58, 0x1b, 0xb5, 0xb7, 0x6e, 0x6e, 0xe6, 0x68, 0x6c, 0xca, 0xf0,
0x76, 0xc3, 0x83, 0x28, 0x99, 0x10, 0xe6, 0x47, 0xe1, 0x57, 0x34, 0x4d, 0xc9, 0x21, 0xb5, 0xb3,
0x33, 0x68, 0x17, 0xda, 0x21, 0x7d, 0xe9, 0x64, 0x2e, 0x40, 0xb8, 0x18, 0xcd, 0xb9, 0x18, 0xbf,
0x88, 0x12, 0xb6, 0xc0, 0x0f, 0x84, 0xf4, 0xe5, 0x73, 0xe5, 0xea, 0x09, 0xac, 0x79, 0x34, 0xa0,
0x8c, 0x7a, 0xb9, 0xbb, 0xf6, 0x7f, 0x74, 0xd7, 0x55, 0x0e, 0x94, 0x4b, 0xfc, 0x0c, 0xfa, 0x79,
0x32, 0x6d, 0x9a, 0xc6, 0x51, 0x98, 0x52, 0x34, 0x82, 0x35, 0xe9, 0x7f, 0xec, 0xbf, 0xa2, 0x7b,
0xfe, 0xc4, 0x67, 0x22, 0xc3, 0x75, 0xbb, 0x2a, 0x46, 0x17, 0xa1, 0x11, 0x50, 0xe2, 0xd1, 0x44,
0xa5, 0x55, 0xed, 0xf0, 0x5f, 0x26, 0x58, 0xa7, 0x41, 0x23, 0x6a, 0xc6, 0x13, 0x1e, 0x3b, 0xb6,
0xe9, 0x7b, 0x3c, 0x27, 0xa9, 0xff, 0x8a, 0x8a, 0x9a, 0xa9, 0xdb, 0x62, 0x8d, 0xae, 0x01, 0xb8,
0x51, 0x10, 0x50, 0x97, 0x1f, 0x54, 0xce, 0x35, 0x09, 0xcf, 0x99, 0x28, 0x83, 0xa2, 0x5c, 0xea,
0x76, 0x8b, 0x4b, 0x64, 0xa5, 0xdc, 0x80, 0x55, 0xf9, 0x50, 0x65, 0x20, 0x2b, 0xa5, 0x2d, 0x65,
0xd2, 0xe4, 0x43, 0x40, 0x19, 0x98, 0xfb, 0xb3, 0xdc, 0xb0, 0x21, 0x0c, 0x7b, 0x4a, 0x73, 0x6f,
0x96, 0x59, 0x5f, 0x81, 0x56, 0x42, 0x89, 0xe7, 0x44, 0x61, 0x30, 0x13, 0xc5, 0xd3, 0xb4, 0x9b,
0x5c, 0xf0, 0x28, 0x0c, 0x66, 0xe8, 0x03, 0xe8, 0x27, 0x34, 0x0e, 0x7c, 0x97, 0x38, 0x71, 0x40,
0x5c, 0x3a, 0xa1, 0x61, 0x56, 0x47, 0x3d, 0xa5, 0x78, 0x9c, 0xc9, 0x91, 0x05, 0x2b, 0xc7, 0x34,
0x49, 0xf9, 0xb3, 0x5a, 0xc2, 0x24, 0xdb, 0xa2, 0x1e, 0xd4, 0x18, 0x0b, 0x2c, 0x10, 0x52, 0xbe,
0x44, 0xb7, 0xa0, 0xe7, 0x46, 0x93, 0x98, 0xb8, 0xcc, 0x49, 0xe8, 0xb1, 0x2f, 0x0e, 0xb5, 0x85,
0x7a, 0x4d, 0xc9, 0x6d, 0x25, 0xc6, 0xbf, 0x1b, 0x70, 0xf5, 0xcc, 0xd4, 0xcf, 0xc1, 0x7e, 0x1e,
0xc4, 0x6f, 0xeb, 0x55, 0x78, 0x05, 0x96, 0x77, 0x26, 0x31, 0x9b, 0xe1, 0x3f, 0x0c, 0x58, 0x1b,
0x4f, 0x63, 0x9a, 0xdc, 0x0b, 0x22, 0xf7, 0x68, 0xe7, 0x84, 0x25, 0x04, 0x3d, 0x82, 0x2e, 0x4d,
0x48, 0x3a, 0x4d, 0x78, 0x46, 0x3c, 0x3f, 0x3c, 0x14, 0x11, 0x97, 0x4b, 0xbc, 0x72, 0x66, 0x73,
0x47, 0x1e, 0xd8, 0x16, 0xf6, 0x76, 0x87, 0xea, 0xdb, 0xc1, 0xb7, 0xd0, 0x29, 0xe9, 0x79, 0xb9,
0x71, 0x42, 0x50, 0x48, 0x88, 0x35, 0xaf, 0xe3, 0x98, 0x24, 0x3e, 0x9b, 0x29, 0xe2, 0x52, 0x3b,
0x5e, 0x66, 0x8a, 0x97, 0x7c, 0x2f, 0xb5, 0x6a, 0xc3, 0x1a, 0xa7, 0x06, 0x29, 0xd9, 0xf5, 0x52,
0x7c, 0x0b, 0xd6, 0xb7, 0x03, 0x9f, 0x86, 0x6c, 0xcf, 0x4f, 0x19, 0x0d, 0x6d, 0xfa, 0xc3, 0x94,
0xa6, 0x8c, 0xdf, 0x10, 0x92, 0x09, 0x55, 0xb4, 0x28, 0xd6, 0xf8, 0x47, 0xe8, 0xca, 0xf4, 0xec,
0x45, 0xae, 0x48, 0x0b, 0x07, 0x86, 0xf3, 0xa1, 0x34, 0xe2, 0xcb, 0x0a, 0x51, 0x9a, 0x55, 0xa2,
0xbc, 0x0c, 0x4d, 0xc1, 0x24, 0x45, 0x28, 0x2b, 0x9c, 0x1c, 0x7c, 0x2f, 0x2d, 0xea, 0xdd, 0x93,
0xea, 0xba, 0x50, 0xb7, 0xb3, 0x8f, 0xdd, 0xf7, 0x52, 0xfc, 0x14, 0xd6, 0xf7, 0xa2, 0xe8, 0x68,
0x1a, 0xcb, 0x30, 0xb2, 0x58, 0xcb, 0x2f, 0x34, 0x86, 0x35, 0x7e, 0x67, 0xfe, 0xc2, 0x4a, 0x91,
0x98, 0xd5, 0x22, 0xc1, 0x7f, 0x1b, 0xb0, 0x51, 0x76, 0xab, 0x38, 0xe4, 0x7b, 0x58, 0xcf, 0xfd,
0x3a, 0x81, 0x7a, 0xb3, 0xbc, 0xa0, 0xbd, 0x75, 0x5b, 0x4b, 0xe6, 0xa2, 0xd3, 0x19, 0xad, 0x7a,
0x19, 0x58, 0x76, 0xff, 0xb8, 0x22, 0x49, 0x07, 0x27, 0xd0, 0xab, 0x9a, 0xf1, 0xcf, 0x34, 0xbf,
0x55, 0x21, 0xdb, 0xcc, 0x4e, 0xa2, 0x8f, 0xa1, 0x55, 0x04, 0x62, 0x8a, 0x40, 0xd6, 0x4b, 0x81,
0xa8, 0xbb, 0x0a, 0x2b, 0xb4, 0x01, 0xcb, 0x34, 0x49, 0xa2, 0x8c, 0xde, 0xe4, 0x06, 0x7f, 0x06,
0xcd, 0xff, 0x9d, 0x45, 0xfc, 0xda, 0x80, 0xce, 0xdd, 0x34, 0xf5, 0x0f, 0xf3, 0x72, 0xd9, 0x80,
0x65, 0x49, 0x3e, 0x92, 0x64, 0xe5, 0x06, 0x0d, 0xa1, 0xad, 0xbe, 0x32, 0x0d, 0x7a, 0x5d, 0x74,
0xee, 0x07, 0xac, 0xbe, 0xbc, 0xba, 0x0c, 0x8d, 0xf3, 0x49, 0xa5, 0x3d, 0x2e, 0x9f, 0xda, 0x1e,
0x1b, 0x5a, 0x7b, 0xbc, 0x02, 0x2d, 0x71, 0x28, 0x8c, 0x3c, 0xaa, 0xfa, 0x66, 0x93, 0x0b, 0xbe,
0x8e, 0x3c, 0x8a, 0x7f, 0x33, 0xa0, 0x9b, 0xbd, 0x46, 0x65, 0xbe, 0x07, 0xb5, 0x83, 0x1c, 0x7d,
0xbe, 0xcc, 0x30, 0x32, 0x4f, 0xc3, 0x68, 0x6e, 0x24, 0xc8, 0x11, 0xa9, 0xeb, 0x88, 0xe4, 0xc9,
0x58, 0xd6, 0x92, 0xc1, 0x43, 0x26, 0x53, 0xf6, 0x22, 0x0b, 0x99, 0xaf, 0xf1, 0x21, 0xf4, 0xc7,
0x8c, 0x30, 0x3f, 0x65, 0xbe, 0x9b, 0x66, 0x30, 0x57, 0x00, 0x35, 0xce, 0x03, 0xd4, 0x3c, 0x0d,
0xd0, 0x5a, 0x0e, 0x28, 0xfe, 0xd3, 0x00, 0xa4, 0xdf, 0xa4, 0x20, 0x78, 0x0b, 0x57, 0x71, 0xc8,
0x58, 0xc4, 0x48, 0xe0, 0x88, 0x5e, 0xa9, 0x3a, 0x9e, 0x90, 0xf0, 0x76, 0xcc, 0xb3, 0x34, 0x4d,
0xa9, 0x27, 0xb5, 0xb2, 0xdd, 0x35, 0xb9, 0x40, 0x28, 0xcb, 0xdd, 0xb2, 0x51, 0xe9, 0x96, 0xf8,
0x2e, 0xb4, 0xc7, 0x2c, 0x4a, 0xc8, 0x21, 0x7d, 0x3a, 0x8b, 0xdf, 0x24, 0x7a, 0x15, 0x9d, 0x59,
0x00, 0x31, 0x04, 0xd8, 0x2e, 0xa2, 0x5f, 0x44, 0x80, 0x97, 0xe0, 0x42, 0x61, 0xc1, 0xf9, 0x52,
0xe5, 0x05, 0x3f, 0x81, 0x8b, 0x55, 0x85, 0x82, 0xf1, 0x53, 0x68, 0x17, 0x90, 0x64, 0xdc, 0x71,
0x41, 0xfb, 0x64, 0x8b, 0x73, 0xb6, 0x6e, 0x89, 0x3f, 0x82, 0x4b, 0x85, 0xea, 0xbe, 0x20, 0xc1,
0xb3, 0xb8, 0x79, 0x00, 0xd6, 0xbc, 0xb9, 0x8c, 0x01, 0xff, 0x6a, 0xc2, 0xea, 0x7d, 0x55, 0xed,
0xbc, 0xa9, 0x6a, 0x6d, 0xb4, 0x25, 0xda, 0xe8, 0x0d, 0x58, 0x2d, 0x8d, 0xae, 0x72, 0x8a, 0x69,
0x1f, 0x6b, 0x73, 0xeb, 0xa2, 0x09, 0xb7, 0x26, 0xcc, 0xaa, 0x13, 0xee, 0xfb, 0xd0, 0x3f, 0x48,
0x28, 0x9d, 0x1f, 0x86, 0xeb, 0xf6, 0x1a, 0x57, 0xe8, 0xb6, 0x9b, 0xb0, 0x4e, 0x5c, 0xe6, 0x1f,
0x57, 0xac, 0x65, 0xee, 0xfb, 0x52, 0xa5, 0xdb, 0x3f, 0xc8, 0x03, 0xf5, 0xc3, 0x83, 0x28, 0xb5,
0x1a, 0x6f, 0x3e, 0xcc, 0xaa, 0xd7, 0x70, 0x4d, 0x8a, 0x7f, 0x32, 0xa1, 0x69, 0x13, 0xf7, 0xe8,
0xdd, 0x46, 0xe3, 0x0e, 0xac, 0xe5, 0xac, 0x56, 0x02, 0xe4, 0x92, 0x06, 0x88, 0x9e, 0x78, 0xbb,
0xe3, 0x69, 0xbb, 0x14, 0xff, 0x63, 0x40, 0xf7, 0x7e, 0xce, 0x9c, 0xef, 0x36, 0x18, 0x5b, 0x00,
0x9c, 0xea, 0x4b, 0x38, 0xe8, 0xad, 0x31, 0x4b, 0xb7, 0xdd, 0x4a, 0xd4, 0x2a, 0xc5, 0xbf, 0x98,
0xb0, 0xfa, 0x34, 0x8a, 0xa3, 0x20, 0x3a, 0x9c, 0xbd, 0xdb, 0xaf, 0xdf, 0x81, 0xbe, 0xd6, 0x15,
0x4b, 0x20, 0x5c, 0xae, 0x14, 0x43, 0x91, 0x6c, 0x7b, 0xcd, 0x2b, 0xed, 0x53, 0xbc, 0x0e, 0x7d,
0x35, 0xe1, 0x69, 0xe4, 0x66, 0x03, 0xd2, 0x85, 0x8a, 0xd8, 0x3e, 0x87, 0x0e, 0x53, 0xd0, 0x89,
0xeb, 0xd4, 0x8c, 0xab, 0x97, 0x9e, 0x0e, 0xad, 0xbd, 0xca, 0xb4, 0xdd, 0xd6, 0xcf, 0xcb, 0xb0,
0x32, 0xa6, 0xe4, 0x25, 0xa5, 0x1e, 0xda, 0x85, 0xce, 0x98, 0x86, 0x5e, 0xf1, 0x83, 0x7c, 0x43,
0xf3, 0x91, 0x4b, 0x07, 0xef, 0x2d, 0x92, 0xe6, 0x1c, 0xb7, 0x34, 0x32, 0x6e, 0x1b, 0xe8, 0x31,
0x74, 0x1e, 0x52, 0x1a, 0x6f, 0x47, 0x61, 0x48, 0x5d, 0x46, 0x3d, 0x74, 0x4d, 0x67, 0xda, 0xf9,
0x31, 0x77, 0x70, 0x79, 0x8e, 0x3a, 0xb2, 0xa9, 0x48, 0x79, 0x7c, 0x02, 0xab, 0xfa, 0x74, 0x57,
0x72, 0xb8, 0x60, 0x16, 0x1d, 0x5c, 0x3f, 0x67, 0x2c, 0xc4, 0x4b, 0xe8, 0x0e, 0x34, 0xe4, 0xb8,
0x81, 0x2c, 0xcd, 0xb8, 0x34, 0x4f, 0x95, 0xe2, 0x2a, 0xcf, 0x26, 0x78, 0x09, 0x3d, 0x04, 0x28,
0x1a, 0x36, 0xd2, 0x71, 0x99, 0x9b, 0x18, 0x06, 0x57, 0x4f, 0xd1, 0xe6, 0xce, 0xbe, 0x81, 0x6e,
0xb9, 0x75, 0xa1, 0xe1, 0xc2, 0xee, 0xa4, 0x55, 0xc4, 0xe0, 0xc6, 0x19, 0x16, 0xb9, 0xe3, 0xef,
0xa0, 0x57, 0xed, 0x48, 0x08, 0x2f, 0x3c, 0x58, 0xea, 0x6e, 0x83, 0x9b, 0x67, 0xda, 0xe8, 0x20,
0x14, 0x55, 0x59, 0x02, 0x61, 0xae, 0x82, 0x4b, 0x20, 0xcc, 0x97, 0x32, 0x5e, 0xda, 0x6f, 0x88,
0xbf, 0x88, 0x3e, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x7b, 0x75, 0x79, 0x32, 0x12, 0x00,
0x00,
// 1482 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0x4d, 0x6f, 0xdb, 0x46,
0x13, 0x36, 0xa9, 0x0f, 0x4b, 0xa3, 0xef, 0xb5, 0x93, 0x30, 0xca, 0x9b, 0x44, 0x61, 0x2e, 0xca,
0xfb, 0xe1, 0x37, 0x75, 0x0f, 0x3d, 0xb4, 0x45, 0x90, 0x38, 0x0e, 0x6a, 0xc4, 0x69, 0x12, 0x2a,
0x49, 0x81, 0x02, 0x05, 0xbb, 0x22, 0xd7, 0x0e, 0x61, 0x8a, 0x64, 0xc9, 0x95, 0x63, 0xe5, 0xd2,
0x43, 0x7b, 0x2c, 0xda, 0x43, 0xff, 0x44, 0x7f, 0x45, 0x2f, 0x3d, 0xe6, 0xc7, 0x14, 0xe8, 0xbd,
0x40, 0xb1, 0x1f, 0x24, 0x97, 0x94, 0x6c, 0xa7, 0x05, 0x72, 0xc8, 0x6d, 0x77, 0x66, 0x76, 0x76,
0xf6, 0x99, 0xe1, 0x33, 0x23, 0x41, 0x7b, 0x86, 0x13, 0x4a, 0xe2, 0xad, 0x28, 0x0e, 0x69, 0x88,
0x9a, 0x62, 0x67, 0x47, 0x53, 0xf3, 0x4d, 0x05, 0x9a, 0x9f, 0x11, 0x1c, 0xd3, 0x29, 0xc1, 0x14,
0x75, 0x41, 0xf7, 0x22, 0x43, 0x1b, 0x69, 0xe3, 0xa6, 0xa5, 0x7b, 0x11, 0x42, 0x50, 0x8d, 0xc2,
0x98, 0x1a, 0xfa, 0x48, 0x1b, 0x77, 0x2c, 0xbe, 0x46, 0x57, 0x01, 0xa2, 0xf9, 0xd4, 0xf7, 0x1c,
0x7b, 0x1e, 0xfb, 0x46, 0x85, 0xdb, 0x36, 0x85, 0xe4, 0x79, 0xec, 0xa3, 0x31, 0xf4, 0x67, 0xf8,
0xc4, 0x3e, 0x0e, 0xfd, 0xf9, 0x8c, 0xd8, 0x4e, 0x38, 0x0f, 0xa8, 0x51, 0xe5, 0xc7, 0xbb, 0x33,
0x7c, 0xf2, 0x82, 0x8b, 0x77, 0x98, 0x14, 0x8d, 0x58, 0x54, 0x27, 0xf6, 0x81, 0xe7, 0x13, 0xfb,
0x88, 0x2c, 0x8c, 0xda, 0x48, 0x1b, 0x57, 0x2d, 0x98, 0xe1, 0x93, 0x07, 0x9e, 0x4f, 0x1e, 0x92,
0x05, 0xba, 0x0e, 0x2d, 0x17, 0x53, 0x6c, 0x3b, 0x24, 0xa0, 0x24, 0x36, 0xea, 0xfc, 0x2e, 0x60,
0xa2, 0x1d, 0x2e, 0x61, 0xf1, 0xc5, 0xd8, 0x39, 0x32, 0xd6, 0xb9, 0x86, 0xaf, 0x59, 0x7c, 0xd8,
0x9d, 0x79, 0x81, 0xcd, 0x23, 0x6f, 0xf0, 0xab, 0x9b, 0x5c, 0xf2, 0x84, 0x85, 0xff, 0x29, 0xac,
0x8b, 0xd8, 0x12, 0xa3, 0x39, 0xaa, 0x8c, 0x5b, 0xdb, 0x37, 0xb7, 0x32, 0x34, 0xb6, 0x44, 0x78,
0x7b, 0xc1, 0x41, 0x18, 0xcf, 0x30, 0xf5, 0xc2, 0xe0, 0x11, 0x49, 0x12, 0x7c, 0x48, 0xac, 0xf4,
0x0c, 0xda, 0x83, 0x56, 0x40, 0x5e, 0xd9, 0xa9, 0x0b, 0xe0, 0x2e, 0xc6, 0x4b, 0x2e, 0x26, 0x2f,
0xc3, 0x98, 0xae, 0xf0, 0x03, 0x01, 0x79, 0xf5, 0x42, 0xba, 0x7a, 0x0a, 0x3d, 0x97, 0xf8, 0x84,
0x12, 0x37, 0x73, 0xd7, 0xfa, 0x9b, 0xee, 0xba, 0xd2, 0x81, 0x74, 0x69, 0x3e, 0x87, 0x41, 0x96,
0x4c, 0x8b, 0x24, 0x51, 0x18, 0x24, 0x04, 0x8d, 0xa1, 0x27, 0xfc, 0x4f, 0xbc, 0xd7, 0x64, 0xdf,
0x9b, 0x79, 0x94, 0x67, 0xb8, 0x6a, 0x95, 0xc5, 0xe8, 0x22, 0xd4, 0x7d, 0x82, 0x5d, 0x12, 0xcb,
0xb4, 0xca, 0x9d, 0xf9, 0xbb, 0x0e, 0xc6, 0x69, 0xd0, 0xf0, 0x9a, 0x71, 0xb9, 0xc7, 0x8e, 0xa5,
0x7b, 0x2e, 0xcb, 0x49, 0xe2, 0xbd, 0x26, 0xbc, 0x66, 0xaa, 0x16, 0x5f, 0xa3, 0x6b, 0x00, 0x4e,
0xe8, 0xfb, 0xc4, 0x61, 0x07, 0xa5, 0x73, 0x45, 0xc2, 0x72, 0xc6, 0xcb, 0x20, 0x2f, 0x97, 0xaa,
0xd5, 0x64, 0x12, 0x51, 0x29, 0x37, 0xa0, 0x2d, 0x1e, 0x2a, 0x0d, 0x44, 0xa5, 0xb4, 0x84, 0x4c,
0x98, 0xfc, 0x17, 0x50, 0x0a, 0xe6, 0x74, 0x91, 0x19, 0xd6, 0xb9, 0x61, 0x5f, 0x6a, 0xee, 0x2d,
0x52, 0xeb, 0x2b, 0xd0, 0x8c, 0x09, 0x76, 0xed, 0x30, 0xf0, 0x17, 0xbc, 0x78, 0x1a, 0x56, 0x83,
0x09, 0x1e, 0x07, 0xfe, 0x02, 0xfd, 0x07, 0x06, 0x31, 0x89, 0x7c, 0xcf, 0xc1, 0x76, 0xe4, 0x63,
0x87, 0xcc, 0x48, 0x90, 0xd6, 0x51, 0x5f, 0x2a, 0x9e, 0xa4, 0x72, 0x64, 0xc0, 0xfa, 0x31, 0x89,
0x13, 0xf6, 0xac, 0x26, 0x37, 0x49, 0xb7, 0xa8, 0x0f, 0x15, 0x4a, 0x7d, 0x03, 0xb8, 0x94, 0x2d,
0xd1, 0x2d, 0xe8, 0x3b, 0xe1, 0x2c, 0xc2, 0x0e, 0xb5, 0x63, 0x72, 0xec, 0xf1, 0x43, 0x2d, 0xae,
0xee, 0x49, 0xb9, 0x25, 0xc5, 0xe6, 0x2f, 0x1a, 0x5c, 0x3d, 0x33, 0xf5, 0x4b, 0xb0, 0x9f, 0x07,
0xf1, 0xbb, 0x7a, 0x95, 0xb9, 0x0e, 0xb5, 0xdd, 0x59, 0x44, 0x17, 0xe6, 0xaf, 0x1a, 0xf4, 0x26,
0xf3, 0x88, 0xc4, 0xf7, 0xfc, 0xd0, 0x39, 0xda, 0x3d, 0xa1, 0x31, 0x46, 0x8f, 0xa1, 0x4b, 0x62,
0x9c, 0xcc, 0x63, 0x96, 0x11, 0xd7, 0x0b, 0x0e, 0x79, 0xc4, 0xc5, 0x12, 0x2f, 0x9d, 0xd9, 0xda,
0x15, 0x07, 0x76, 0xb8, 0xbd, 0xd5, 0x21, 0xea, 0x76, 0xf8, 0x25, 0x74, 0x0a, 0x7a, 0x56, 0x6e,
0x8c, 0x10, 0x24, 0x12, 0x7c, 0xcd, 0xea, 0x38, 0xc2, 0xb1, 0x47, 0x17, 0x92, 0xb8, 0xe4, 0x8e,
0x95, 0x99, 0xe4, 0x25, 0xcf, 0x4d, 0x8c, 0xca, 0xa8, 0xc2, 0xa8, 0x41, 0x48, 0xf6, 0xdc, 0xc4,
0xbc, 0x05, 0x1b, 0x3b, 0xbe, 0x47, 0x02, 0xba, 0xef, 0x25, 0x94, 0x04, 0x16, 0xf9, 0x66, 0x4e,
0x12, 0xca, 0x6e, 0x08, 0xf0, 0x8c, 0x48, 0x5a, 0xe4, 0x6b, 0xf3, 0x5b, 0xe8, 0x8a, 0xf4, 0xec,
0x87, 0x0e, 0x4f, 0x0b, 0x03, 0x86, 0xf1, 0xa1, 0x30, 0x62, 0xcb, 0x12, 0x51, 0xea, 0x65, 0xa2,
0xbc, 0x0c, 0x0d, 0xce, 0x24, 0x79, 0x28, 0xeb, 0x8c, 0x1c, 0x3c, 0x37, 0xc9, 0xeb, 0xdd, 0x15,
0xea, 0x2a, 0x57, 0xb7, 0xd2, 0x8f, 0xdd, 0x73, 0x13, 0xf3, 0x19, 0x6c, 0xec, 0x87, 0xe1, 0xd1,
0x3c, 0x12, 0x61, 0xa4, 0xb1, 0x16, 0x5f, 0xa8, 0x8d, 0x2a, 0xec, 0xce, 0xec, 0x85, 0xa5, 0x22,
0xd1, 0xcb, 0x45, 0x62, 0xfe, 0xa1, 0xc1, 0x66, 0xd1, 0xad, 0xe4, 0x90, 0xaf, 0x61, 0x23, 0xf3,
0x6b, 0xfb, 0xf2, 0xcd, 0xe2, 0x82, 0xd6, 0xf6, 0x6d, 0x25, 0x99, 0xab, 0x4e, 0xa7, 0xb4, 0xea,
0xa6, 0x60, 0x59, 0x83, 0xe3, 0x92, 0x24, 0x19, 0x9e, 0x40, 0xbf, 0x6c, 0xc6, 0x3e, 0xd3, 0xec,
0x56, 0x89, 0x6c, 0x23, 0x3d, 0x89, 0x3e, 0x80, 0x66, 0x1e, 0x88, 0xce, 0x03, 0xd9, 0x28, 0x04,
0x22, 0xef, 0xca, 0xad, 0xd0, 0x26, 0xd4, 0x48, 0x1c, 0x87, 0x29, 0xbd, 0x89, 0x8d, 0xf9, 0x31,
0x34, 0xfe, 0x71, 0x16, 0xcd, 0x37, 0x1a, 0x74, 0xee, 0x26, 0x89, 0x77, 0x98, 0x95, 0xcb, 0x26,
0xd4, 0x04, 0xf9, 0x08, 0x92, 0x15, 0x1b, 0x34, 0x82, 0x96, 0xfc, 0xca, 0x14, 0xe8, 0x55, 0xd1,
0xb9, 0x1f, 0xb0, 0xfc, 0xf2, 0xaa, 0x22, 0x34, 0xc6, 0x27, 0xa5, 0xf6, 0x58, 0x3b, 0xb5, 0x3d,
0xd6, 0x95, 0xf6, 0x78, 0x05, 0x9a, 0xfc, 0x50, 0x10, 0xba, 0x44, 0xf6, 0xcd, 0x06, 0x13, 0x7c,
0x1e, 0xba, 0xc4, 0xfc, 0x59, 0x83, 0x6e, 0xfa, 0x1a, 0x99, 0xf9, 0x3e, 0x54, 0x0e, 0x32, 0xf4,
0xd9, 0x32, 0xc5, 0x48, 0x3f, 0x0d, 0xa3, 0xa5, 0x91, 0x20, 0x43, 0xa4, 0xaa, 0x22, 0x92, 0x25,
0xa3, 0xa6, 0x24, 0x83, 0x85, 0x8c, 0xe7, 0xf4, 0x65, 0x1a, 0x32, 0x5b, 0x9b, 0x87, 0x30, 0x98,
0x50, 0x4c, 0xbd, 0x84, 0x7a, 0x4e, 0x92, 0xc2, 0x5c, 0x02, 0x54, 0x3b, 0x0f, 0x50, 0xfd, 0x34,
0x40, 0x2b, 0x19, 0xa0, 0xe6, 0x6f, 0x1a, 0x20, 0xf5, 0x26, 0x09, 0xc1, 0x3b, 0xb8, 0x8a, 0x41,
0x46, 0x43, 0x8a, 0x7d, 0x9b, 0xf7, 0x4a, 0xd9, 0xf1, 0xb8, 0x84, 0xb5, 0x63, 0x96, 0xa5, 0x79,
0x42, 0x5c, 0xa1, 0x15, 0xed, 0xae, 0xc1, 0x04, 0x5c, 0x59, 0xec, 0x96, 0xf5, 0x52, 0xb7, 0x34,
0xef, 0x42, 0x6b, 0x42, 0xc3, 0x18, 0x1f, 0x92, 0x67, 0x8b, 0xe8, 0x6d, 0xa2, 0x97, 0xd1, 0xe9,
0x39, 0x10, 0x23, 0x80, 0x9d, 0x3c, 0xfa, 0x55, 0x04, 0x78, 0x09, 0x2e, 0xe4, 0x16, 0x8c, 0x2f,
0x65, 0x5e, 0xcc, 0xa7, 0x70, 0xb1, 0xac, 0x90, 0x30, 0x7e, 0x04, 0xad, 0x1c, 0x92, 0x94, 0x3b,
0x2e, 0x28, 0x9f, 0x6c, 0x7e, 0xce, 0x52, 0x2d, 0xcd, 0xff, 0xc1, 0xa5, 0x5c, 0x75, 0x9f, 0x93,
0xe0, 0x59, 0xdc, 0x3c, 0x04, 0x63, 0xd9, 0x5c, 0xc4, 0x60, 0xfe, 0xa4, 0x43, 0xfb, 0xbe, 0xac,
0x76, 0xd6, 0x54, 0x95, 0x36, 0xda, 0xe4, 0x6d, 0xf4, 0x06, 0xb4, 0x0b, 0xa3, 0xab, 0x98, 0x62,
0x5a, 0xc7, 0xca, 0xdc, 0xba, 0x6a, 0xc2, 0xad, 0x70, 0xb3, 0xf2, 0x84, 0xfb, 0x6f, 0x18, 0x1c,
0xc4, 0x84, 0x2c, 0x0f, 0xc3, 0x55, 0xab, 0xc7, 0x14, 0xaa, 0xed, 0x16, 0x6c, 0x60, 0x87, 0x7a,
0xc7, 0x25, 0x6b, 0x91, 0xfb, 0x81, 0x50, 0xa9, 0xf6, 0x0f, 0xb2, 0x40, 0xbd, 0xe0, 0x20, 0x4c,
0x8c, 0xfa, 0xdb, 0x0f, 0xb3, 0xf2, 0x35, 0x4c, 0x93, 0x98, 0xdf, 0xeb, 0xd0, 0xb0, 0xb0, 0x73,
0xf4, 0x7e, 0xa3, 0x71, 0x07, 0x7a, 0x19, 0xab, 0x15, 0x00, 0xb9, 0xa4, 0x00, 0xa2, 0x26, 0xde,
0xea, 0xb8, 0xca, 0x2e, 0x31, 0xff, 0xd4, 0xa0, 0x7b, 0x3f, 0x63, 0xce, 0xf7, 0x1b, 0x8c, 0x6d,
0x00, 0x46, 0xf5, 0x05, 0x1c, 0xd4, 0xd6, 0x98, 0xa6, 0xdb, 0x6a, 0xc6, 0x72, 0x95, 0x98, 0x3f,
0xea, 0xd0, 0x7e, 0x16, 0x46, 0xa1, 0x1f, 0x1e, 0x2e, 0xde, 0xef, 0xd7, 0xef, 0xc2, 0x40, 0xe9,
0x8a, 0x05, 0x10, 0x2e, 0x97, 0x8a, 0x21, 0x4f, 0xb6, 0xd5, 0x73, 0x0b, 0xfb, 0xc4, 0xdc, 0x80,
0x81, 0x9c, 0xf0, 0x14, 0x72, 0xfb, 0x4e, 0x03, 0xa4, 0x4a, 0x25, 0xb3, 0x7d, 0x02, 0x1d, 0x2a,
0xb1, 0xe3, 0xf7, 0xc9, 0x21, 0x57, 0xad, 0x3d, 0x15, 0x5b, 0xab, 0x4d, 0x55, 0xa4, 0xff, 0x0f,
0x9b, 0xf2, 0x65, 0x8c, 0xed, 0x6d, 0x9f, 0xfd, 0x14, 0xb3, 0x67, 0x53, 0x89, 0xf0, 0xa0, 0xf4,
0x23, 0xed, 0xd1, 0x74, 0xfb, 0x87, 0x1a, 0xac, 0x4f, 0x08, 0x7e, 0x45, 0x88, 0x8b, 0xf6, 0xa0,
0x33, 0x21, 0x81, 0x9b, 0xff, 0x84, 0xdf, 0x54, 0x2e, 0xcd, 0xa4, 0xc3, 0x7f, 0xad, 0x92, 0x66,
0xac, 0xb8, 0x36, 0xd6, 0x6e, 0x6b, 0xe8, 0x09, 0x74, 0x1e, 0x12, 0x12, 0xed, 0x84, 0x41, 0x40,
0x1c, 0x4a, 0x5c, 0x74, 0x4d, 0xe5, 0xe6, 0xe5, 0xc1, 0x78, 0x78, 0x79, 0x89, 0x6c, 0xd2, 0x39,
0x4a, 0x7a, 0x7c, 0x0a, 0x6d, 0x75, 0x1e, 0x2c, 0x38, 0x5c, 0x31, 0xbd, 0x0e, 0xaf, 0x9f, 0x33,
0x48, 0x9a, 0x6b, 0xe8, 0x0e, 0xd4, 0xc5, 0x80, 0x82, 0x0c, 0xc5, 0xb8, 0x30, 0x81, 0x15, 0xe2,
0x2a, 0x4e, 0x33, 0xe6, 0x1a, 0x7a, 0x08, 0x90, 0xb7, 0x78, 0xa4, 0xe2, 0xb2, 0x34, 0x63, 0x0c,
0xaf, 0x9e, 0xa2, 0xcd, 0x9c, 0x7d, 0x01, 0xdd, 0x62, 0xb3, 0x43, 0xa3, 0x95, 0xfd, 0x4c, 0xa9,
0xa1, 0xe1, 0x8d, 0x33, 0x2c, 0x32, 0xc7, 0x5f, 0x41, 0xbf, 0xdc, 0xc3, 0x90, 0xb9, 0xf2, 0x60,
0xa1, 0x1f, 0x0e, 0x6f, 0x9e, 0x69, 0xa3, 0x82, 0x90, 0x97, 0x71, 0x01, 0x84, 0xa5, 0x9a, 0x2f,
0x80, 0xb0, 0x5c, 0xfb, 0xe6, 0xda, 0xb4, 0xce, 0xff, 0x54, 0xfa, 0xf0, 0xaf, 0x00, 0x00, 0x00,
0xff, 0xff, 0x94, 0xee, 0xe2, 0x89, 0x64, 0x12, 0x00, 0x00,
}

3
weed/server/master_grpc_server_volume.go

@ -135,7 +135,8 @@ func (ms *MasterServer) VolumeList(ctx context.Context, req *master_pb.VolumeLis
}
resp := &master_pb.VolumeListResponse{
TopologyInfo: ms.Topo.ToTopologyInfo(),
TopologyInfo: ms.Topo.ToTopologyInfo(),
VolumeSizeLimitMb: uint64(ms.volumeSizeLimitMB),
}
return resp, nil

211
weed/shell/command_volume_balance.go

@ -0,0 +1,211 @@
package shell
import (
"context"
"flag"
"fmt"
"io"
"os"
"sort"
"time"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
func init() {
commands = append(commands, &commandVolumeBalance{})
}
type commandVolumeBalance struct {
}
func (c *commandVolumeBalance) Name() string {
return "volume.balance"
}
func (c *commandVolumeBalance) Help() string {
return `balance all volumes among volume servers
volume.balance [-c collectionName] [-f]
Algorithm:
For each type of volume server (different max volume count limit){
balanceWritableVolumes()
balanceReadOnlyVolumes()
}
func balanceWritableVolumes(){
idealWritableVolumes = totalWritableVolumes / numVolumeServers
for {
sort all volume servers ordered by{
local writable volumes
}
pick the volume server A with the lowest number of writable volumes x
pick the volume server B with the highest number of writable volumes y
if y > idealWritableVolumes and x +1 < idealWritableVolumes {
if B has a writable volume id v that A does not have {
move writable volume v from A to B
}
}
}
}
func balanceReadOnlyVolumes(){
//similar to balanceWritableVolumes
}
`
}
func (c *commandVolumeBalance) Do(args []string, commandEnv *commandEnv, writer io.Writer) (err error) {
balanceCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
collection := balanceCommand.String("c", "", "collection name. use \"ALL\" for all collections")
applyBalancing := balanceCommand.Bool("f", false, "apply the balancing plan.")
if err = balanceCommand.Parse(args); err != nil {
return nil
}
var resp *master_pb.VolumeListResponse
ctx := context.Background()
err = commandEnv.masterClient.WithClient(ctx, func(client master_pb.SeaweedClient) error {
resp, err = client.VolumeList(ctx, &master_pb.VolumeListRequest{})
return err
})
if err != nil {
return err
}
typeToNodes := collectVolumeServersByType(resp.TopologyInfo)
for _, volumeServers := range typeToNodes {
if len(volumeServers) < 2 {
continue
}
balanceVolumeServers(commandEnv, volumeServers, resp.VolumeSizeLimitMb*1024*1024, *collection, *applyBalancing)
}
return nil
}
func balanceVolumeServers(commandEnv *commandEnv, dataNodeInfos []*master_pb.DataNodeInfo, volumeSizeLimit uint64, collection string, applyBalancing bool) {
var nodes []*Node
for _, dn := range dataNodeInfos {
nodes = append(nodes, &Node{
info: dn,
})
}
// balance writable volumes
for _, n := range nodes {
n.prepareVolumes(func(v *master_pb.VolumeInformationMessage) bool {
if collection != "ALL" {
if v.Collection != collection {
return false
}
}
return !v.ReadOnly && v.Size < volumeSizeLimit
})
}
balanceSelectedVolume(commandEnv, nodes, sortWritableVolumes, applyBalancing)
// balance readable volumes
for _, n := range nodes {
n.prepareVolumes(func(v *master_pb.VolumeInformationMessage) bool {
if collection != "ALL" {
if v.Collection != collection {
return false
}
}
return v.ReadOnly || v.Size >= volumeSizeLimit
})
}
balanceSelectedVolume(commandEnv, nodes, sortReadOnlyVolumes, applyBalancing)
}
func collectVolumeServersByType(t *master_pb.TopologyInfo) (typeToNodes map[uint64][]*master_pb.DataNodeInfo) {
typeToNodes = make(map[uint64][]*master_pb.DataNodeInfo)
for _, dc := range t.DataCenterInfos {
for _, r := range dc.RackInfos {
for _, dn := range r.DataNodeInfos {
typeToNodes[dn.MaxVolumeCount] = append(typeToNodes[dn.MaxVolumeCount], dn)
}
}
}
return
}
type Node struct {
info *master_pb.DataNodeInfo
selectedVolumes map[uint32]*master_pb.VolumeInformationMessage
}
func sortWritableVolumes(volumes []*master_pb.VolumeInformationMessage) {
sort.Slice(volumes, func(i, j int) bool {
return volumes[i].Size < volumes[j].Size
})
}
func sortReadOnlyVolumes(volumes []*master_pb.VolumeInformationMessage) {
sort.Slice(volumes, func(i, j int) bool {
return volumes[i].Id < volumes[j].Id
})
}
func balanceSelectedVolume(commandEnv *commandEnv, nodes []*Node, sortCandidatesFn func(volumes []*master_pb.VolumeInformationMessage), applyBalancing bool) {
selectedVolumeCount := 0
for _, dn := range nodes {
selectedVolumeCount += len(dn.selectedVolumes)
}
idealSelectedVolumes := selectedVolumeCount / len(nodes)
hasMove := true
for hasMove {
hasMove = false
sort.Slice(nodes, func(i, j int) bool {
return len(nodes[i].selectedVolumes) < len(nodes[j].selectedVolumes)
})
emptyNode, fullNode := nodes[0], nodes[len(nodes)-1]
if len(fullNode.selectedVolumes) > idealSelectedVolumes && len(emptyNode.selectedVolumes)+1 <= idealSelectedVolumes {
// sort the volumes to move
var candidateVolumes []*master_pb.VolumeInformationMessage
for _, v := range fullNode.selectedVolumes {
candidateVolumes = append(candidateVolumes, v)
}
sortCandidatesFn(candidateVolumes)
for _, v := range candidateVolumes {
if _, found := emptyNode.selectedVolumes[v.Id]; !found {
moveVolume(commandEnv, v, fullNode, emptyNode, applyBalancing)
delete(fullNode.selectedVolumes, v.Id)
emptyNode.selectedVolumes[v.Id] = v
hasMove = true
break
}
}
}
}
}
func moveVolume(commandEnv *commandEnv, v *master_pb.VolumeInformationMessage, fullNode *Node, emptyNode *Node, applyBalancing bool) {
collectionPrefix := v.Collection + "_"
if v.Collection == "" {
collectionPrefix = ""
}
fmt.Fprintf(os.Stdout, "moving volume %s%d %s => %s\n", collectionPrefix, v.Id, fullNode.info.Id, emptyNode.info.Id)
if applyBalancing {
ctx := context.Background()
LiveMoveVolume(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(v.Id), fullNode.info.Id, emptyNode.info.Id, 5*time.Second)
}
}
func (node *Node) prepareVolumes(fn func(v *master_pb.VolumeInformationMessage) bool) {
node.selectedVolumes = make(map[uint32]*master_pb.VolumeInformationMessage)
for _, v := range node.info.VolumeInfos {
if fn(v) {
node.selectedVolumes[v.Id] = v
}
}
}
Loading…
Cancel
Save