From 316bd27f75e416e803280bc03bd45ed76ce417fa Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Apr 2019 23:53:37 -0700 Subject: [PATCH] add remove volumes with version info --- weed/pb/master.proto | 1 + weed/pb/master_pb/master.pb.go | 162 +++++++++++++++++---------------- weed/storage/store.go | 4 + weed/storage/volume_info.go | 1 + weed/topology/topology.go | 10 +- weed/topology/topology_test.go | 53 ++++++++++- weed/topology/volume_layout.go | 9 +- 7 files changed, 155 insertions(+), 85 deletions(-) diff --git a/weed/pb/master.proto b/weed/pb/master.proto index 424f70805..2d1262b07 100644 --- a/weed/pb/master.proto +++ b/weed/pb/master.proto @@ -63,6 +63,7 @@ message VolumeShortInformationMessage { uint32 id = 1; string collection = 3; uint32 replica_placement = 8; + uint32 version = 9; uint32 ttl = 10; } diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go index 1ffa770ef..90d946e4a 100644 --- a/weed/pb/master_pb/master.pb.go +++ b/weed/pb/master_pb/master.pb.go @@ -280,6 +280,7 @@ type VolumeShortInformationMessage struct { Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` ReplicaPlacement uint32 `protobuf:"varint,8,opt,name=replica_placement,json=replicaPlacement" json:"replica_placement,omitempty"` + Version uint32 `protobuf:"varint,9,opt,name=version" json:"version,omitempty"` Ttl uint32 `protobuf:"varint,10,opt,name=ttl" json:"ttl,omitempty"` } @@ -309,6 +310,13 @@ func (m *VolumeShortInformationMessage) GetReplicaPlacement() uint32 { return 0 } +func (m *VolumeShortInformationMessage) GetVersion() uint32 { + if m != nil { + return m.Version + } + return 0 +} + func (m *VolumeShortInformationMessage) GetTtl() uint32 { if m != nil { return m.Ttl @@ -1483,92 +1491,92 @@ var fileDescriptor0 = []byte{ 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, 0xd2, 0x43, 0xdf, 0xa7, 0x97, 0x1e, 0xf3, 0x30, 0x05, 0x7a, 0x2f, 0x50, 0xec, - 0x0f, 0xc9, 0x25, 0x25, 0xdb, 0x49, 0x81, 0x1e, 0x72, 0xdb, 0x9d, 0x99, 0x9d, 0x9d, 0xfd, 0x66, - 0xf8, 0xcd, 0x48, 0xb0, 0x3a, 0x21, 0x29, 0xa3, 0xc9, 0x66, 0x9c, 0x44, 0x2c, 0x42, 0x2d, 0xb9, - 0x73, 0xe2, 0x7d, 0xfc, 0xa6, 0x06, 0xad, 0xaf, 0x29, 0x49, 0xd8, 0x3e, 0x25, 0x0c, 0x75, 0xc1, - 0xf4, 0x63, 0xcb, 0x18, 0x1a, 0xa3, 0x96, 0x6d, 0xfa, 0x31, 0x42, 0x50, 0x8f, 0xa3, 0x84, 0x59, - 0xe6, 0xd0, 0x18, 0x75, 0x6c, 0xb1, 0x46, 0x57, 0x01, 0xe2, 0xe9, 0x7e, 0xe0, 0xbb, 0xce, 0x34, - 0x09, 0xac, 0x9a, 0xb0, 0x6d, 0x49, 0xc9, 0xb3, 0x24, 0x40, 0x23, 0xe8, 0x4d, 0xc8, 0x89, 0x73, - 0x1c, 0x05, 0xd3, 0x09, 0x75, 0xdc, 0x68, 0x1a, 0x32, 0xab, 0x2e, 0x8e, 0x77, 0x27, 0xe4, 0xe4, - 0xb9, 0x10, 0x6f, 0x73, 0x29, 0x1a, 0xf2, 0xa8, 0x4e, 0x9c, 0x03, 0x3f, 0xa0, 0xce, 0x11, 0x9d, - 0x59, 0xcb, 0x43, 0x63, 0x54, 0xb7, 0x61, 0x42, 0x4e, 0x1e, 0xf8, 0x01, 0x7d, 0x48, 0x67, 0xe8, - 0x3a, 0xb4, 0x3d, 0xc2, 0x88, 0xe3, 0xd2, 0x90, 0xd1, 0xc4, 0x6a, 0x88, 0xbb, 0x80, 0x8b, 0xb6, - 0x85, 0x84, 0xc7, 0x97, 0x10, 0xf7, 0xc8, 0x5a, 0x11, 0x1a, 0xb1, 0xe6, 0xf1, 0x11, 0x6f, 0xe2, - 0x87, 0x8e, 0x88, 0xbc, 0x29, 0xae, 0x6e, 0x09, 0xc9, 0x63, 0x1e, 0xfe, 0x57, 0xb0, 0x22, 0x63, - 0x4b, 0xad, 0xd6, 0xb0, 0x36, 0x6a, 0x6f, 0xdd, 0xdc, 0xcc, 0xd1, 0xd8, 0x94, 0xe1, 0xed, 0x86, - 0x07, 0x51, 0x32, 0x21, 0xcc, 0x8f, 0xc2, 0x6f, 0x68, 0x9a, 0x92, 0x43, 0x6a, 0x67, 0x67, 0xd0, - 0x2e, 0xb4, 0x43, 0xfa, 0xd2, 0xc9, 0x5c, 0x80, 0x70, 0x31, 0x9a, 0x73, 0x31, 0x7e, 0x11, 0x25, - 0x6c, 0x81, 0x1f, 0x08, 0xe9, 0xcb, 0xe7, 0xca, 0xd5, 0x13, 0x58, 0xf3, 0x68, 0x40, 0x19, 0xf5, - 0x72, 0x77, 0xed, 0x77, 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, - 0x63, 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, 0x23, 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, 0xaf, 0x0d, 0xb8, 0x7a, 0x66, 0xea, 0xe7, 0x60, 0x3f, 0x0f, 0xe2, 0x77, - 0x7a, 0xd5, 0x5c, 0xec, 0x78, 0x05, 0x96, 0x77, 0x26, 0x31, 0x9b, 0xe1, 0x3f, 0x0c, 0x58, 0x1b, + 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, 0x38, 0xee, 0x9e, 0x1f, 0x1e, 0x8a, 0xb8, 0xca, 0x85, 0x5c, 0x39, 0xb3, 0xb9, - 0x23, 0x0f, 0x6c, 0x0b, 0x7b, 0xbb, 0x43, 0xf5, 0xed, 0xe0, 0x7b, 0xe8, 0x94, 0xf4, 0xbc, 0xa8, - 0xf8, 0x67, 0xaf, 0xde, 0x2b, 0xd6, 0xbc, 0x5a, 0x63, 0x92, 0xf8, 0x6c, 0xa6, 0xe8, 0x49, 0xed, - 0x78, 0x31, 0x29, 0xf6, 0xf1, 0xbd, 0xd4, 0xaa, 0x0d, 0x6b, 0x9c, 0x00, 0xa4, 0x64, 0xd7, 0x4b, - 0xf1, 0x2d, 0x58, 0xdf, 0x0e, 0x7c, 0x1a, 0xb2, 0x3d, 0x3f, 0x65, 0x34, 0xb4, 0xe9, 0x4f, 0x53, - 0x9a, 0x32, 0x7e, 0x43, 0x48, 0x26, 0x54, 0x91, 0x9f, 0x58, 0xe3, 0x9f, 0xa1, 0x2b, 0x93, 0xb0, - 0x17, 0xb9, 0x02, 0x7c, 0x0e, 0x0c, 0x67, 0x3d, 0x69, 0xc4, 0x97, 0x15, 0x3a, 0x34, 0xab, 0x74, - 0x78, 0x19, 0x9a, 0x82, 0x2f, 0x8a, 0x50, 0x56, 0x38, 0x05, 0xf8, 0x5e, 0x5a, 0x54, 0xb5, 0x27, - 0xd5, 0x75, 0xa1, 0x6e, 0x67, 0x9f, 0xb4, 0xef, 0xa5, 0xf8, 0x29, 0xac, 0xef, 0x45, 0xd1, 0xd1, - 0x34, 0x96, 0x61, 0x64, 0xb1, 0x96, 0x5f, 0x68, 0x0c, 0x6b, 0xfc, 0xce, 0xfc, 0x85, 0x95, 0x52, - 0x30, 0xab, 0xa5, 0x80, 0xff, 0x36, 0x60, 0xa3, 0xec, 0x56, 0x31, 0xc5, 0x8f, 0xb0, 0x9e, 0xfb, - 0x75, 0x02, 0xf5, 0x66, 0x79, 0x41, 0x7b, 0xeb, 0xb6, 0x96, 0xcc, 0x45, 0xa7, 0x33, 0xf2, 0xf4, - 0x32, 0xb0, 0xec, 0xfe, 0x71, 0x45, 0x92, 0x0e, 0x4e, 0xa0, 0x57, 0x35, 0xe3, 0x1f, 0x63, 0x7e, - 0xab, 0x42, 0xb6, 0x99, 0x9d, 0x44, 0x9f, 0x42, 0xab, 0x08, 0xc4, 0x14, 0x81, 0xac, 0x97, 0x02, - 0x51, 0x77, 0x15, 0x56, 0x68, 0x03, 0x96, 0x69, 0x92, 0x44, 0x19, 0x89, 0xc9, 0x0d, 0xfe, 0x02, - 0x9a, 0xff, 0x39, 0x8b, 0xf8, 0x8d, 0x01, 0x9d, 0xbb, 0x69, 0xea, 0x1f, 0xe6, 0xe5, 0xb2, 0x01, - 0xcb, 0x92, 0x62, 0x24, 0x95, 0xca, 0x0d, 0x1a, 0x42, 0x5b, 0x7d, 0x4b, 0x1a, 0xf4, 0xba, 0xe8, - 0xdc, 0xcf, 0x54, 0x7d, 0x79, 0x75, 0x19, 0x1a, 0x67, 0x8d, 0x4a, 0x13, 0x5c, 0x3e, 0xb5, 0x09, - 0x36, 0xb4, 0x26, 0x78, 0x05, 0x5a, 0xe2, 0x50, 0x18, 0x79, 0x54, 0x75, 0xc7, 0x26, 0x17, 0x7c, - 0x1b, 0x79, 0x14, 0xff, 0x6e, 0x40, 0x37, 0x7b, 0x8d, 0xca, 0x7c, 0x0f, 0x6a, 0x07, 0x39, 0xfa, - 0x7c, 0x99, 0x61, 0x64, 0x9e, 0x86, 0xd1, 0x5c, 0xe3, 0xcf, 0x11, 0xa9, 0xeb, 0x88, 0xe4, 0xc9, + 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, 0xf8, 0x1f, 0xae, 0xe2, 0x90, - 0xb1, 0x88, 0x91, 0xc0, 0x11, 0x1d, 0x51, 0xf5, 0x35, 0x21, 0xe1, 0x4d, 0x97, 0x67, 0x69, 0x9a, - 0x52, 0x4f, 0x6a, 0x65, 0x53, 0x6b, 0x72, 0x81, 0x50, 0x96, 0x7b, 0x62, 0xa3, 0xd2, 0x13, 0xf1, - 0x5d, 0x68, 0x8f, 0x59, 0x94, 0x90, 0x43, 0xfa, 0x74, 0x16, 0xbf, 0x4d, 0xf4, 0x2a, 0x3a, 0xb3, - 0x00, 0x62, 0x08, 0xb0, 0x5d, 0x44, 0xbf, 0x88, 0x00, 0x2f, 0xc1, 0x85, 0xc2, 0x82, 0xf3, 0xa5, - 0xca, 0x0b, 0x7e, 0x02, 0x17, 0xab, 0x0a, 0x05, 0xe3, 0xe7, 0xd0, 0x2e, 0x20, 0xc9, 0xb8, 0xe3, - 0x82, 0xf6, 0xc9, 0x16, 0xe7, 0x6c, 0xdd, 0x12, 0x7f, 0x02, 0x97, 0x0a, 0xd5, 0x7d, 0x41, 0x82, - 0x67, 0x71, 0xf3, 0x00, 0xac, 0x79, 0x73, 0x19, 0x03, 0xfe, 0xcd, 0x84, 0xd5, 0xfb, 0xaa, 0xda, - 0x79, 0xeb, 0xd4, 0x9a, 0x65, 0x4b, 0x34, 0xcb, 0x1b, 0xb0, 0x5a, 0x1a, 0x50, 0xe5, 0xac, 0xd2, - 0x3e, 0xd6, 0xa6, 0xd3, 0x45, 0x73, 0x6c, 0x4d, 0x98, 0x55, 0xe7, 0xd8, 0x0f, 0xa1, 0x7f, 0x90, - 0x50, 0x3a, 0x3f, 0xf2, 0xd6, 0xed, 0x35, 0xae, 0xd0, 0x6d, 0x37, 0x61, 0x9d, 0xb8, 0xcc, 0x3f, - 0xae, 0x58, 0xcb, 0xdc, 0xf7, 0xa5, 0x4a, 0xb7, 0x7f, 0x90, 0x07, 0xea, 0x87, 0x07, 0x51, 0x6a, - 0x35, 0xde, 0x7e, 0x64, 0x55, 0xaf, 0xe1, 0x9a, 0x14, 0xff, 0x62, 0x42, 0xd3, 0x26, 0xee, 0xd1, - 0xfb, 0x8d, 0xc6, 0x1d, 0x58, 0xcb, 0x59, 0xad, 0x04, 0xc8, 0x25, 0x0d, 0x10, 0x3d, 0xf1, 0x76, - 0xc7, 0xd3, 0x76, 0x29, 0xfe, 0xc7, 0x80, 0xee, 0xfd, 0x9c, 0x39, 0xdf, 0x6f, 0x30, 0xb6, 0x00, - 0x38, 0xd5, 0x97, 0x70, 0xd0, 0x5b, 0x63, 0x96, 0x6e, 0xbb, 0x95, 0xa8, 0x55, 0x8a, 0x5f, 0x9b, - 0xb0, 0xfa, 0x34, 0x8a, 0xa3, 0x20, 0x3a, 0x9c, 0xbd, 0xdf, 0xaf, 0xdf, 0x81, 0xbe, 0xd6, 0x15, + 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, 0xbe, 0x84, 0x0e, 0x53, 0xd0, 0x89, - 0xeb, 0xd4, 0x8c, 0xab, 0x97, 0x9e, 0x0e, 0xad, 0xbd, 0xca, 0xb4, 0xdd, 0xd6, 0xaf, 0xcb, 0xb0, - 0x32, 0xa6, 0xe4, 0x25, 0xa5, 0x1e, 0xda, 0x85, 0xce, 0x98, 0x86, 0x5e, 0xf1, 0xb3, 0x7b, 0x43, - 0xf3, 0x91, 0x4b, 0x07, 0x1f, 0x2c, 0x92, 0xe6, 0x1c, 0xb7, 0x34, 0x32, 0x6e, 0x1b, 0xe8, 0x31, + 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, 0x83, 0x6e, - 0xb9, 0x75, 0xa1, 0xe1, 0xc2, 0xee, 0xa4, 0x55, 0xc4, 0xe0, 0xc6, 0x19, 0x16, 0xb9, 0xe3, 0x1f, + 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, - 0x3f, 0x82, 0x3e, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x41, 0x9f, 0x9c, 0x18, 0x12, 0x00, + 0xbf, 0x88, 0x3e, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x7b, 0x75, 0x79, 0x32, 0x12, 0x00, 0x00, } diff --git a/weed/storage/store.go b/weed/storage/store.go index 5b2110bd8..2f2c70171 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -105,6 +105,7 @@ func (s *Store) addVolume(vid needle.VolumeId, collection string, needleMapKind Id: uint32(vid), Collection: collection, ReplicaPlacement: uint32(replicaPlacement.Byte()), + Version: uint32(volume.Version()), Ttl: ttl.ToUint32(), } return nil @@ -241,6 +242,7 @@ func (s *Store) MountVolume(i needle.VolumeId) error { Id: uint32(v.Id), Collection: v.Collection, ReplicaPlacement: uint32(v.ReplicaPlacement.Byte()), + Version: uint32(v.Version()), Ttl: v.Ttl.ToUint32(), } return nil @@ -259,6 +261,7 @@ func (s *Store) UnmountVolume(i needle.VolumeId) error { Id: uint32(v.Id), Collection: v.Collection, ReplicaPlacement: uint32(v.ReplicaPlacement.Byte()), + Version: uint32(v.Version()), Ttl: v.Ttl.ToUint32(), } for _, location := range s.Locations { @@ -281,6 +284,7 @@ func (s *Store) DeleteVolume(i needle.VolumeId) error { Id: uint32(v.Id), Collection: v.Collection, ReplicaPlacement: uint32(v.ReplicaPlacement.Byte()), + Version: uint32(v.Version()), Ttl: v.Ttl.ToUint32(), } for _, location := range s.Locations { diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go index a49cb94ba..0e05019d2 100644 --- a/weed/storage/volume_info.go +++ b/weed/storage/volume_info.go @@ -47,6 +47,7 @@ func NewVolumeInfoFromShort(m *master_pb.VolumeShortInformationMessage) (vi Volu vi = VolumeInfo{ 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/topology.go b/weed/topology/topology.go index c7dfffff0..44dd1484b 100644 --- a/weed/topology/topology.go +++ b/weed/topology/topology.go @@ -189,7 +189,6 @@ func (t *Topology) IncrementalSyncDataNodeRegistration(newVolumes, deletedVolume continue } newVis = append(newVis, vi) - t.RegisterVolumeLayout(vi, dn) } for _, v := range deletedVolumes { vi, err := storage.NewVolumeInfoFromShort(v) @@ -198,8 +197,15 @@ func (t *Topology) IncrementalSyncDataNodeRegistration(newVolumes, deletedVolume continue } oldVis = append(oldVis, vi) - t.UnRegisterVolumeLayout(vi, dn) } dn.DeltaUpdateVolumes(newVis, oldVis) + + for _, vi := range newVis { + t.RegisterVolumeLayout(vi, dn) + } + for _, vi := range oldVis { + t.UnRegisterVolumeLayout(vi, dn) + } + return } diff --git a/weed/topology/topology_test.go b/weed/topology/topology_test.go index ec745ee93..7d7d4d7ad 100644 --- a/weed/topology/topology_test.go +++ b/weed/topology/topology_test.go @@ -41,7 +41,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { DeletedByteCount: 34524, ReadOnly: false, ReplicaPlacement: uint32(0), - Version: uint32(1), + Version: uint32(needle.CurrentVersion), Ttl: 0, } volumeMessages = append(volumeMessages, volumeMessage) @@ -66,15 +66,63 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { DeletedByteCount: 345240, ReadOnly: false, ReplicaPlacement: uint32(0), - Version: uint32(1), + Version: uint32(needle.CurrentVersion), Ttl: 0, } volumeMessages = append(volumeMessages, volumeMessage) } topo.SyncDataNodeRegistration(volumeMessages, dn) + //rp, _ := storage.NewReplicaPlacementFromString("000") + //layout := topo.GetVolumeLayout("", rp, needle.EMPTY_TTL) + //assert(t, "writables", len(layout.writables), volumeCount) + + assert(t, "activeVolumeCount1", int(topo.activeVolumeCount), volumeCount) + assert(t, "volumeCount", int(topo.volumeCount), volumeCount) + } + + { + volumeCount := 6 + newVolumeShortMessage := &master_pb.VolumeShortInformationMessage{ + Id: uint32(3), + Collection: "", + ReplicaPlacement: uint32(0), + Version: uint32(needle.CurrentVersion), + Ttl: 0, + } + topo.IncrementalSyncDataNodeRegistration( + []*master_pb.VolumeShortInformationMessage{newVolumeShortMessage}, + nil, + dn) + rp, _ := storage.NewReplicaPlacementFromString("000") + layout := topo.GetVolumeLayout("", rp, needle.EMPTY_TTL) + assert(t, "writables after repeated add", len(layout.writables), volumeCount) + assert(t, "activeVolumeCount1", int(topo.activeVolumeCount), volumeCount) assert(t, "volumeCount", int(topo.volumeCount), volumeCount) + + topo.IncrementalSyncDataNodeRegistration( + nil, + []*master_pb.VolumeShortInformationMessage{newVolumeShortMessage}, + dn) + assert(t, "writables after deletion", len(layout.writables), volumeCount-1) + assert(t, "activeVolumeCount1", int(topo.activeVolumeCount), volumeCount-1) + assert(t, "volumeCount", int(topo.volumeCount), volumeCount-1) + + topo.IncrementalSyncDataNodeRegistration( + []*master_pb.VolumeShortInformationMessage{newVolumeShortMessage}, + nil, + dn) + + for vid, _ := range layout.vid2location{ + println("after add volume id", vid) + } + for _, vid := range layout.writables{ + println("after add writable volume id", vid) + } + + assert(t, "writables after add back", len(layout.writables), volumeCount) + } topo.UnRegisterDataNode(dn) @@ -112,6 +160,7 @@ func TestAddRemoveVolume(t *testing.T) { dn.UpdateVolumes([]storage.VolumeInfo{v}) topo.RegisterVolumeLayout(v, dn) + topo.RegisterVolumeLayout(v, dn) if _, hasCollection := topo.FindCollection(v.Collection); !hasCollection { t.Errorf("collection %v should exist", v.Collection) diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go index b3aa7d251..6ab90e9e2 100644 --- a/weed/topology/volume_layout.go +++ b/weed/topology/volume_layout.go @@ -50,7 +50,7 @@ func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) { vl.accessLock.Lock() defer vl.accessLock.Unlock() - if _, ok := vl.vid2location[v.Id]; !ok { + if _, ok := vl.vid2location[v.Id]; !ok || vl.vid2location[v.Id] == nil { vl.vid2location[v.Id] = NewVolumeLocationList() } vl.vid2location[v.Id].Set(dn) @@ -58,7 +58,7 @@ func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) { for _, dn := range vl.vid2location[v.Id].list { if vInfo, err := dn.GetVolumesById(v.Id); err == nil { if vInfo.ReadOnly { - glog.V(3).Infof("vid %d removed from writable", v.Id) + glog.V(1).Infof("vid %d removed from writable", v.Id) vl.removeFromWritable(v.Id) vl.readonlyVolumes[v.Id] = true return @@ -66,7 +66,7 @@ func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) { delete(vl.readonlyVolumes, v.Id) } } else { - glog.V(3).Infof("vid %d removed from writable", v.Id) + glog.V(1).Infof("vid %d removed from writable", v.Id) vl.removeFromWritable(v.Id) delete(vl.readonlyVolumes, v.Id) return @@ -93,7 +93,8 @@ func (vl *VolumeLayout) UnRegisterVolume(v *storage.VolumeInfo, dn *DataNode) { defer vl.accessLock.Unlock() vl.removeFromWritable(v.Id) - delete(vl.vid2location, v.Id) + delete(vl.vid2location, v.Id) // somehow this line does not work as expected + // vl.vid2location[v.Id] = nil } func (vl *VolumeLayout) addToWritable(vid needle.VolumeId) {