diff --git a/cluster.go b/cluster.go index 1ed810ea0..d531c90d6 100644 --- a/cluster.go +++ b/cluster.go @@ -297,22 +297,16 @@ func (c *Cluster) IsCoordinator() bool { return c.Static || c.Coordinator == c.Node.URI } -// SetCoordinator updates the Coordinator to new if it is -// currently old. Returns true if the Coordinator changed. -func (c *Cluster) SetCoordinator(o, n *Node) bool { - // Get old node. - oldNode := c.nodeByID(o.ID) - if oldNode == nil { - return false - } - +// SetCoordinator updates the Coordinator to n. +// Returns true if the Coordinator changed. +func (c *Cluster) SetCoordinator(n *Node) bool { // Get new node. newNode := c.nodeByID(n.ID) if newNode == nil { return false } - if c.Coordinator == oldNode.URI && oldNode != newNode { + if c.Coordinator != newNode.URI { c.Coordinator = newNode.URI return true } diff --git a/cluster_test.go b/cluster_test.go index 9bcacac9a..5a5fa4de4 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -517,14 +517,14 @@ func TestCluster_SetCoordinator(t *testing.T) { newNode := c.Nodes[1] // Set coordinator to the same value. - if set := c.SetCoordinator(oldNode, oldNode); set { + if c.SetCoordinator(oldNode) { t.Errorf("did not expect coordinator to change") } else if c.Coordinator != oldNode.URI { t.Errorf("expected coordinator: %s, but got: %s", c.Coordinator, oldNode.URI) } // Set coordinator to a new value. - if set := c.SetCoordinator(oldNode, newNode); !set { + if !c.SetCoordinator(newNode) { t.Errorf("expected coordinator to change") } else if c.Coordinator != newNode.URI { t.Errorf("expected coordinator: %s, but got: %s", c.Coordinator, newNode.URI) diff --git a/handler.go b/handler.go index a12e7b391..dd438e977 100644 --- a/handler.go +++ b/handler.go @@ -1964,11 +1964,6 @@ func (h *Handler) handlePostClusterResizeSetCoordinator(w http.ResponseWriter, r return } - oldNode := h.Cluster.nodeByURI(h.Cluster.Coordinator) - if oldNode == nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } newNode := h.Cluster.nodeByID(req.ID) if newNode == nil { http.Error(w, err.Error(), http.StatusBadRequest) @@ -1979,7 +1974,6 @@ func (h *Handler) handlePostClusterResizeSetCoordinator(w http.ResponseWriter, r // Send the set-coordinator message to all nodes. err := h.Broadcaster.SendSync( &internal.SetCoordinatorMessage{ - Old: EncodeNode(oldNode), New: EncodeNode(newNode), }) if err != nil { @@ -1987,7 +1981,7 @@ func (h *Handler) handlePostClusterResizeSetCoordinator(w http.ResponseWriter, r } // Set Coordinator on local node. - _ = h.Cluster.SetCoordinator(oldNode, newNode) + _ = h.Cluster.SetCoordinator(newNode) return nil }(); err != nil { @@ -1997,7 +1991,6 @@ func (h *Handler) handlePostClusterResizeSetCoordinator(w http.ResponseWriter, r // Encode response. if err := json.NewEncoder(w).Encode(setCoordinatorResponse{ - Old: oldNode, New: newNode, }); err != nil { h.logger().Printf("response encoding error: %s", err) diff --git a/internal/private.pb.go b/internal/private.pb.go index ae6247bb6..b584a10a9 100644 --- a/internal/private.pb.go +++ b/internal/private.pb.go @@ -1029,8 +1029,7 @@ func (m *ResizeInstructionComplete) GetError() string { } type SetCoordinatorMessage struct { - Old *Node `protobuf:"bytes,1,opt,name=Old" json:"Old,omitempty"` - New *Node `protobuf:"bytes,2,opt,name=New" json:"New,omitempty"` + New *Node `protobuf:"bytes,1,opt,name=New" json:"New,omitempty"` } func (m *SetCoordinatorMessage) Reset() { *m = SetCoordinatorMessage{} } @@ -1038,13 +1037,6 @@ func (m *SetCoordinatorMessage) String() string { return proto.Compac func (*SetCoordinatorMessage) ProtoMessage() {} func (*SetCoordinatorMessage) Descriptor() ([]byte, []int) { return fileDescriptorPrivate, []int{31} } -func (m *SetCoordinatorMessage) GetOld() *Node { - if m != nil { - return m.Old - } - return nil -} - func (m *SetCoordinatorMessage) GetNew() *Node { if m != nil { return m.New @@ -2405,26 +2397,16 @@ func (m *SetCoordinatorMessage) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Old != nil { + if m.New != nil { dAtA[i] = 0xa i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.Old.Size())) - n21, err := m.Old.MarshalTo(dAtA[i:]) + i = encodeVarintPrivate(dAtA, i, uint64(m.New.Size())) + n21, err := m.New.MarshalTo(dAtA[i:]) if err != nil { return 0, err } i += n21 } - if m.New != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintPrivate(dAtA, i, uint64(m.New.Size())) - n22, err := m.New.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n22 - } return i, nil } @@ -3065,10 +3047,6 @@ func (m *ResizeInstructionComplete) Size() (n int) { func (m *SetCoordinatorMessage) Size() (n int) { var l int _ = l - if m.Old != nil { - l = m.Old.Size() - n += 1 + l + sovPrivate(uint64(l)) - } if m.New != nil { l = m.New.Size() n += 1 + l + sovPrivate(uint64(l)) @@ -7524,39 +7502,6 @@ func (m *SetCoordinatorMessage) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Old", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPrivate - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthPrivate - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Old == nil { - m.Old = &Node{} - } - if err := m.Old.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field New", wireType) } @@ -7826,84 +7771,84 @@ var ( func init() { proto.RegisterFile("private.proto", fileDescriptorPrivate) } var fileDescriptorPrivate = []byte{ - // 1258 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5b, 0x6f, 0x1b, 0x45, - 0x14, 0x66, 0xbd, 0xb6, 0x63, 0x1f, 0xd7, 0xa9, 0x33, 0xb4, 0xc1, 0xad, 0x22, 0xd7, 0x8c, 0x10, - 0x0d, 0x95, 0x88, 0x8a, 0x2b, 0x71, 0x09, 0xaa, 0x54, 0x12, 0xbb, 0xea, 0x02, 0x49, 0xcb, 0x38, - 0x2d, 0x12, 0x48, 0x48, 0x13, 0x7b, 0x48, 0x57, 0x59, 0xef, 0x9a, 0xdd, 0x75, 0x12, 0xf7, 0x81, - 0x47, 0x84, 0x84, 0x78, 0x47, 0xbc, 0xf2, 0x67, 0x78, 0xe4, 0x27, 0xa0, 0xf0, 0x23, 0x90, 0x78, - 0x01, 0x9d, 0xb9, 0xec, 0xae, 0xaf, 0x21, 0x85, 0xb7, 0x3d, 0xdf, 0xb9, 0xcc, 0x37, 0xe7, 0x9c, - 0x39, 0x33, 0x0b, 0xd5, 0x61, 0xe8, 0x9e, 0xf0, 0x58, 0x6c, 0x0d, 0xc3, 0x20, 0x0e, 0x48, 0xc9, - 0xf5, 0x63, 0x11, 0xfa, 0xdc, 0xa3, 0x8f, 0xa1, 0xec, 0xf8, 0x7d, 0x71, 0xb6, 0x27, 0x62, 0x4e, - 0x9a, 0x50, 0xd9, 0x0d, 0xbc, 0xd1, 0xc0, 0xff, 0x94, 0x1f, 0x0a, 0xaf, 0x6e, 0x35, 0xad, 0xcd, - 0x32, 0xcb, 0x42, 0x68, 0x71, 0xe0, 0x0e, 0xc4, 0x67, 0x23, 0xee, 0xc7, 0xa3, 0x41, 0x3d, 0xa7, - 0x2c, 0x32, 0x10, 0xfd, 0xcb, 0x82, 0xf2, 0xc3, 0x90, 0x0f, 0x84, 0x8c, 0x78, 0x13, 0x4a, 0x2c, - 0x38, 0xcd, 0x86, 0x4b, 0x64, 0xf2, 0x26, 0xac, 0x3a, 0xfe, 0x89, 0x08, 0x23, 0xd1, 0xf1, 0xf9, - 0xa1, 0x27, 0xfa, 0x32, 0x5c, 0x89, 0x4d, 0xa1, 0x64, 0x03, 0xca, 0xbb, 0xbc, 0xf7, 0x5c, 0x1c, - 0x8c, 0x87, 0xa2, 0x6e, 0xcb, 0x20, 0x29, 0x90, 0x68, 0xbb, 0xee, 0x0b, 0x51, 0xcf, 0x37, 0xad, - 0xcd, 0x2a, 0x4b, 0x81, 0x69, 0xbe, 0x85, 0x19, 0xbe, 0x84, 0xc2, 0x15, 0xc6, 0xfd, 0xa3, 0x84, - 0x43, 0x51, 0x72, 0x98, 0xc0, 0xc8, 0x6d, 0x28, 0x3e, 0x74, 0x85, 0xd7, 0x8f, 0xea, 0x2b, 0x4d, - 0x7b, 0xb3, 0xd2, 0xba, 0xba, 0x65, 0xf2, 0xb7, 0x25, 0x71, 0xa6, 0xd5, 0x94, 0xc2, 0xaa, 0x33, - 0x18, 0x06, 0x61, 0xcc, 0x44, 0x34, 0x0c, 0xfc, 0x48, 0x90, 0x1a, 0xd8, 0x9d, 0x30, 0xd4, 0x7b, - 0xc7, 0x4f, 0xfa, 0x2d, 0xd4, 0x76, 0xbc, 0xa0, 0x77, 0xdc, 0xe6, 0x31, 0x67, 0xe2, 0x9b, 0x91, - 0x88, 0x62, 0x72, 0x0d, 0x0a, 0xb2, 0x0a, 0xda, 0x4e, 0x09, 0x88, 0xca, 0x4c, 0xea, 0x34, 0x2b, - 0x01, 0x51, 0xe9, 0x2f, 0x53, 0x91, 0x67, 0x4a, 0x40, 0xb4, 0xeb, 0xb9, 0x3d, 0x95, 0x82, 0x3c, - 0x53, 0x02, 0x21, 0x90, 0x7f, 0xe6, 0x8a, 0x53, 0xbd, 0x6f, 0xf9, 0x4d, 0x1d, 0x58, 0xcb, 0xac, - 0xaf, 0x69, 0xae, 0x43, 0x91, 0x05, 0xa7, 0x4e, 0x3b, 0xaa, 0x5b, 0x4d, 0x7b, 0x33, 0xcf, 0xb4, - 0x24, 0xb3, 0x2b, 0xcb, 0x8f, 0xaa, 0x9c, 0x54, 0xa5, 0x00, 0xbd, 0x01, 0x05, 0x99, 0x6a, 0xdc, - 0x65, 0xea, 0x8b, 0x9f, 0xf4, 0x6f, 0x0b, 0xca, 0x7b, 0xfc, 0x4c, 0xd2, 0x88, 0xc8, 0x7d, 0x28, - 0x75, 0x63, 0xee, 0xf7, 0x79, 0xd8, 0x97, 0x46, 0x95, 0xd6, 0xeb, 0x69, 0x0a, 0x13, 0xb3, 0x2d, - 0x63, 0xd3, 0xf1, 0xe3, 0x70, 0xcc, 0x12, 0x17, 0xb2, 0x0d, 0x2b, 0xba, 0x27, 0x24, 0x87, 0x4a, - 0xab, 0x39, 0xcf, 0x3b, 0x69, 0x1b, 0x74, 0x36, 0x0e, 0x37, 0x3f, 0x84, 0xea, 0x44, 0x58, 0xe4, - 0x7a, 0x2c, 0xc6, 0xa6, 0x22, 0xc7, 0x62, 0x8c, 0xb9, 0x3b, 0xe1, 0xde, 0x48, 0xe5, 0x39, 0xcf, - 0x94, 0xb0, 0x9d, 0x7b, 0xdf, 0xba, 0xb9, 0x0d, 0x57, 0xb2, 0x51, 0x2f, 0xe3, 0x4b, 0xbf, 0x02, - 0xb2, 0x1b, 0x0a, 0x1e, 0x0b, 0x49, 0x6f, 0x4f, 0x44, 0x11, 0x3f, 0x12, 0x8b, 0x2b, 0xad, 0xaa, - 0x97, 0xcb, 0x56, 0x6f, 0x03, 0xca, 0x4e, 0x64, 0x36, 0x6e, 0xcb, 0xbe, 0x4c, 0x01, 0x7a, 0x07, - 0x48, 0x5b, 0x78, 0x22, 0x16, 0xfa, 0xfc, 0x2e, 0x89, 0x4f, 0xbb, 0x86, 0xcb, 0xc5, 0xb6, 0xe4, - 0x36, 0xe4, 0xf1, 0xe8, 0x4a, 0x2a, 0x95, 0xd6, 0xab, 0x69, 0xa6, 0x93, 0x39, 0xc1, 0xa4, 0x01, - 0x75, 0x4d, 0x50, 0x7d, 0xdc, 0x2f, 0xd8, 0xe0, 0x9c, 0x56, 0x36, 0x4b, 0xd9, 0xd3, 0x4b, 0x25, - 0x03, 0x44, 0x2f, 0xf5, 0xc0, 0xec, 0xf5, 0x65, 0x97, 0xa2, 0x5f, 0x68, 0x14, 0x8f, 0xc4, 0x3e, - 0x6a, 0x95, 0x8f, 0xfc, 0x5e, 0xbc, 0xe5, 0x29, 0x1e, 0x18, 0x1b, 0xcf, 0x50, 0x54, 0xb7, 0x9b, - 0x36, 0xc6, 0x96, 0x02, 0xbd, 0x07, 0xc5, 0x6e, 0xef, 0xb9, 0x18, 0x70, 0xf2, 0x16, 0x36, 0x6a, - 0x5f, 0x9c, 0x89, 0x48, 0xb7, 0xf9, 0xd5, 0xa9, 0xf4, 0x31, 0xa3, 0xa7, 0x3f, 0x58, 0x9a, 0xfd, - 0x02, 0x46, 0x45, 0xb9, 0x76, 0x54, 0xcf, 0xcf, 0x4c, 0x1c, 0xc4, 0x99, 0x56, 0x93, 0x0e, 0xd4, - 0x1c, 0x7f, 0x38, 0x8a, 0xdb, 0xe2, 0x6b, 0xd7, 0x77, 0x63, 0x37, 0xf0, 0xa3, 0x7a, 0x51, 0xba, - 0xdc, 0xc8, 0x2e, 0x3d, 0x61, 0xc1, 0x66, 0x5c, 0xe8, 0x77, 0x16, 0x5c, 0x9d, 0x02, 0x2f, 0xe0, - 0x95, 0x5b, 0xce, 0xeb, 0xdd, 0x64, 0x64, 0xda, 0xd2, 0xb0, 0xb1, 0x90, 0xcd, 0xe4, 0x04, 0xfd, - 0xc5, 0x82, 0x6b, 0xf3, 0x0c, 0xe6, 0xb2, 0x69, 0x00, 0x3c, 0x09, 0xdd, 0x01, 0x0f, 0xc7, 0x9f, - 0x88, 0xb1, 0xbe, 0x3d, 0x32, 0x08, 0xf9, 0x1c, 0xd6, 0xa7, 0x62, 0x7d, 0xd4, 0x53, 0x29, 0x52, - 0xa4, 0x6e, 0x2d, 0x24, 0xa5, 0xec, 0xd8, 0x02, 0x77, 0xfa, 0xa7, 0x05, 0xd7, 0xe7, 0xaa, 0xd2, - 0xee, 0xb3, 0xb2, 0x8d, 0x7e, 0x07, 0x6a, 0xcf, 0x70, 0x30, 0xb4, 0x45, 0x14, 0xbb, 0x3e, 0x47, - 0x4b, 0xdd, 0x9e, 0x33, 0x38, 0x71, 0xa0, 0x24, 0xb1, 0x3d, 0x3e, 0xd4, 0x34, 0xdf, 0xbe, 0x80, - 0xe6, 0x96, 0xb1, 0xd7, 0x73, 0xd3, 0x88, 0x48, 0x46, 0xce, 0x71, 0x73, 0x29, 0x48, 0x01, 0x27, - 0xe2, 0x84, 0xc3, 0xa5, 0xa6, 0x5a, 0x00, 0x1b, 0x66, 0x92, 0x4c, 0x30, 0x59, 0x7e, 0x26, 0x3f, - 0x00, 0x48, 0x4d, 0xf5, 0x71, 0x5f, 0xd2, 0x9f, 0x19, 0x63, 0xfa, 0x08, 0x36, 0xcc, 0x98, 0xbb, - 0xc4, 0x82, 0xa6, 0x5b, 0x72, 0x69, 0xb7, 0xd0, 0x0e, 0xd8, 0x4f, 0x99, 0x83, 0x57, 0x9d, 0x3c, - 0xad, 0xa6, 0x44, 0x5a, 0x42, 0x97, 0x47, 0x41, 0x14, 0x1b, 0x17, 0xfc, 0x46, 0xec, 0x49, 0x10, - 0xc6, 0x92, 0x71, 0x95, 0xc9, 0x6f, 0xfa, 0x1e, 0xe4, 0xf7, 0x83, 0xbe, 0x20, 0xab, 0x90, 0x73, - 0xda, 0x3a, 0x46, 0xce, 0x69, 0x93, 0x5b, 0x32, 0xbc, 0x9e, 0x21, 0xd5, 0x74, 0x73, 0x4f, 0x99, - 0xc3, 0x50, 0x43, 0x1f, 0x40, 0x0d, 0x1d, 0xbb, 0x31, 0x8f, 0x93, 0x11, 0xb6, 0x0e, 0x45, 0xc4, - 0x92, 0x40, 0x5a, 0x92, 0x17, 0x02, 0xda, 0x99, 0x21, 0x26, 0x05, 0xfa, 0xa3, 0x05, 0x60, 0x42, - 0x8c, 0x22, 0x42, 0x15, 0x13, 0xe9, 0x5a, 0x69, 0xad, 0xa6, 0x4b, 0x22, 0xca, 0x14, 0xcb, 0x77, - 0x32, 0xd7, 0xf0, 0xec, 0x7c, 0x4b, 0x54, 0x2c, 0x73, 0x59, 0x6f, 0x9a, 0x71, 0xa6, 0x0b, 0x55, - 0x4b, 0xed, 0x15, 0xae, 0x53, 0x86, 0x37, 0x40, 0x75, 0xd7, 0x1b, 0x45, 0xb1, 0x08, 0x35, 0x23, - 0x7c, 0x2e, 0x28, 0x20, 0xd9, 0x51, 0x0a, 0xcc, 0xdf, 0x14, 0x79, 0x03, 0x0a, 0xc8, 0xd4, 0x9c, - 0xc9, 0xe9, 0x6d, 0x28, 0x25, 0xed, 0x42, 0x61, 0xf1, 0x1c, 0x20, 0x90, 0x97, 0x8f, 0x43, 0x5d, - 0x3a, 0xf9, 0x2e, 0xac, 0x81, 0xbd, 0xe7, 0xaa, 0x5e, 0xb3, 0x19, 0x7e, 0x4a, 0x84, 0x9f, 0xc9, - 0xb3, 0x80, 0x08, 0xc7, 0x6b, 0x71, 0x4d, 0x35, 0x33, 0xce, 0xf1, 0x97, 0xb9, 0xc0, 0xcc, 0xfb, - 0xca, 0xce, 0xbc, 0xaf, 0xba, 0xb0, 0xa6, 0x1a, 0xf6, 0xff, 0x0c, 0xfa, 0x73, 0x0e, 0xd6, 0x98, - 0x88, 0xdc, 0x17, 0xc2, 0xf1, 0xa3, 0x38, 0x1c, 0x25, 0xc3, 0xe6, 0xe3, 0xe0, 0x50, 0xa7, 0xda, - 0x66, 0x4a, 0x48, 0xda, 0x22, 0xb7, 0xa4, 0x2d, 0xee, 0xe2, 0x4b, 0x3f, 0x08, 0xfb, 0x38, 0x74, - 0x82, 0x50, 0x17, 0x7a, 0xda, 0x34, 0x6b, 0x42, 0xee, 0xc2, 0x4a, 0x37, 0x18, 0x85, 0xbd, 0xe4, - 0x4a, 0x5a, 0x4f, 0xad, 0x15, 0x33, 0xa5, 0x66, 0xc6, 0x2c, 0xd3, 0x47, 0x85, 0xe5, 0x7d, 0x44, - 0xee, 0x4f, 0xf5, 0x91, 0x7c, 0x84, 0x57, 0x5a, 0xaf, 0xa5, 0x0e, 0x13, 0x6a, 0x36, 0x69, 0x4d, - 0xbf, 0xb7, 0xe0, 0x4a, 0x96, 0xc2, 0xbf, 0x3a, 0x18, 0x49, 0x45, 0x72, 0x73, 0x2b, 0x62, 0xcf, - 0xab, 0x48, 0x3e, 0xad, 0x48, 0xfa, 0x64, 0x2b, 0x64, 0x9e, 0x6c, 0xf4, 0x18, 0x6e, 0xcc, 0x94, - 0x69, 0x37, 0x18, 0x0c, 0xb1, 0x1f, 0xfe, 0x43, 0xb9, 0xae, 0x41, 0xa1, 0x13, 0x86, 0xba, 0x50, - 0x65, 0xa6, 0x04, 0xfa, 0x25, 0x5c, 0xef, 0x8a, 0x38, 0x53, 0x24, 0xd3, 0x6d, 0x4d, 0xb0, 0x1f, - 0x7b, 0xfd, 0x05, 0xdb, 0x47, 0x15, 0x5a, 0xec, 0x8b, 0xd3, 0x05, 0x6b, 0xa2, 0x8a, 0xee, 0x40, - 0xe9, 0x20, 0x18, 0x06, 0x5e, 0x70, 0x34, 0xbe, 0xe0, 0x58, 0xd7, 0x61, 0x45, 0x4d, 0x2d, 0xf5, - 0x28, 0x28, 0x33, 0x23, 0xee, 0xd4, 0x7e, 0x3d, 0x6f, 0x58, 0xbf, 0x9d, 0x37, 0xac, 0xdf, 0xcf, - 0x1b, 0xd6, 0x4f, 0x7f, 0x34, 0x5e, 0x39, 0x2c, 0xca, 0xff, 0xcf, 0x7b, 0xff, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x03, 0x63, 0x93, 0xf4, 0x90, 0x0e, 0x00, 0x00, + // 1250 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5d, 0x6f, 0x1b, 0x45, + 0x17, 0x7e, 0xd7, 0xbb, 0x76, 0xec, 0xe3, 0x38, 0x71, 0xe6, 0x4d, 0x83, 0x13, 0x45, 0xae, 0x19, + 0x21, 0x1a, 0x2a, 0x11, 0x15, 0x57, 0x02, 0x1a, 0x54, 0xa9, 0x24, 0x76, 0xd5, 0x05, 0x12, 0xca, + 0x38, 0x2d, 0x12, 0x17, 0x48, 0x13, 0x7b, 0x48, 0x57, 0x59, 0xef, 0x9a, 0xdd, 0x71, 0x12, 0xf7, + 0x82, 0x4b, 0x84, 0x84, 0xb8, 0x47, 0xdc, 0xf2, 0x67, 0xb8, 0xe4, 0x27, 0xa0, 0xf0, 0x23, 0x90, + 0xb8, 0x01, 0xcd, 0xd7, 0xee, 0xfa, 0x33, 0xa4, 0x70, 0xb7, 0xe7, 0x39, 0x1f, 0xf3, 0xcc, 0x39, + 0x67, 0xce, 0xcc, 0x42, 0x65, 0x10, 0x79, 0xe7, 0x94, 0xb3, 0xdd, 0x41, 0x14, 0xf2, 0x10, 0x15, + 0xbd, 0x80, 0xb3, 0x28, 0xa0, 0x3e, 0xfe, 0x14, 0x4a, 0x6e, 0xd0, 0x63, 0x97, 0x87, 0x8c, 0x53, + 0xd4, 0x80, 0xf2, 0x41, 0xe8, 0x0f, 0xfb, 0xc1, 0x27, 0xf4, 0x84, 0xf9, 0x35, 0xab, 0x61, 0xed, + 0x94, 0x48, 0x16, 0x12, 0x16, 0xc7, 0x5e, 0x9f, 0x7d, 0x36, 0xa4, 0x01, 0x1f, 0xf6, 0x6b, 0x39, + 0x65, 0x91, 0x81, 0xf0, 0x9f, 0x16, 0x94, 0x1e, 0x47, 0xb4, 0xcf, 0x64, 0xc4, 0x2d, 0x28, 0x92, + 0xf0, 0x22, 0x1b, 0x2e, 0x91, 0xd1, 0x9b, 0xb0, 0xe2, 0x06, 0xe7, 0x2c, 0x8a, 0x59, 0x3b, 0xa0, + 0x27, 0x3e, 0xeb, 0xc9, 0x70, 0x45, 0x32, 0x81, 0xa2, 0x6d, 0x28, 0x1d, 0xd0, 0xee, 0x0b, 0x76, + 0x3c, 0x1a, 0xb0, 0x9a, 0x2d, 0x83, 0xa4, 0x40, 0xa2, 0xed, 0x78, 0x2f, 0x59, 0xcd, 0x69, 0x58, + 0x3b, 0x15, 0x92, 0x02, 0x93, 0x7c, 0xf3, 0x53, 0x7c, 0x11, 0x86, 0x65, 0x42, 0x83, 0xd3, 0x84, + 0x43, 0x41, 0x72, 0x18, 0xc3, 0xd0, 0x1d, 0x28, 0x3c, 0xf6, 0x98, 0xdf, 0x8b, 0x6b, 0x4b, 0x0d, + 0x7b, 0xa7, 0xdc, 0x5c, 0xdd, 0x35, 0xf9, 0xdb, 0x95, 0x38, 0xd1, 0x6a, 0x8c, 0x61, 0xc5, 0xed, + 0x0f, 0xc2, 0x88, 0x13, 0x16, 0x0f, 0xc2, 0x20, 0x66, 0xa8, 0x0a, 0x76, 0x3b, 0x8a, 0xf4, 0xde, + 0xc5, 0x27, 0xfe, 0x06, 0xaa, 0xfb, 0x7e, 0xd8, 0x3d, 0x6b, 0x51, 0x4e, 0x09, 0xfb, 0x7a, 0xc8, + 0x62, 0x8e, 0xd6, 0x21, 0x2f, 0xab, 0xa0, 0xed, 0x94, 0x20, 0x50, 0x99, 0x49, 0x9d, 0x66, 0x25, + 0x08, 0x54, 0xfa, 0xcb, 0x54, 0x38, 0x44, 0x09, 0x02, 0xed, 0xf8, 0x5e, 0x57, 0xa5, 0xc0, 0x21, + 0x4a, 0x40, 0x08, 0x9c, 0xe7, 0x1e, 0xbb, 0xd0, 0xfb, 0x96, 0xdf, 0xd8, 0x85, 0xb5, 0xcc, 0xfa, + 0x9a, 0xe6, 0x06, 0x14, 0x48, 0x78, 0xe1, 0xb6, 0xe2, 0x9a, 0xd5, 0xb0, 0x77, 0x1c, 0xa2, 0x25, + 0x99, 0x5d, 0x59, 0x7e, 0xa1, 0xca, 0x49, 0x55, 0x0a, 0xe0, 0x4d, 0xc8, 0xcb, 0x54, 0x8b, 0x5d, + 0xa6, 0xbe, 0xe2, 0x13, 0xff, 0x65, 0x41, 0xe9, 0x90, 0x5e, 0x4a, 0x1a, 0x31, 0x7a, 0x08, 0xc5, + 0x0e, 0xa7, 0x41, 0x8f, 0x46, 0x3d, 0x69, 0x54, 0x6e, 0xbe, 0x9e, 0xa6, 0x30, 0x31, 0xdb, 0x35, + 0x36, 0xed, 0x80, 0x47, 0x23, 0x92, 0xb8, 0xa0, 0x3d, 0x58, 0xd2, 0x3d, 0x21, 0x39, 0x94, 0x9b, + 0x8d, 0x59, 0xde, 0x49, 0xdb, 0x08, 0x67, 0xe3, 0xb0, 0xf5, 0x01, 0x54, 0xc6, 0xc2, 0x0a, 0xae, + 0x67, 0x6c, 0x64, 0x2a, 0x72, 0xc6, 0x46, 0x22, 0x77, 0xe7, 0xd4, 0x1f, 0xaa, 0x3c, 0x3b, 0x44, + 0x09, 0x7b, 0xb9, 0xf7, 0xad, 0xad, 0x3d, 0x58, 0xce, 0x46, 0xbd, 0x89, 0x2f, 0xfe, 0x12, 0xd0, + 0x41, 0xc4, 0x28, 0x67, 0x92, 0xde, 0x21, 0x8b, 0x63, 0x7a, 0xca, 0xe6, 0x57, 0x5a, 0x55, 0x2f, + 0x97, 0xad, 0xde, 0x36, 0x94, 0xdc, 0xd8, 0x6c, 0xdc, 0x96, 0x7d, 0x99, 0x02, 0xf8, 0x2e, 0xa0, + 0x16, 0xf3, 0x19, 0x67, 0xfa, 0xfc, 0x2e, 0x88, 0x8f, 0x3b, 0x86, 0xcb, 0xf5, 0xb6, 0xe8, 0x0e, + 0x38, 0xe2, 0xe8, 0x4a, 0x2a, 0xe5, 0xe6, 0xff, 0xd3, 0x4c, 0x27, 0x73, 0x82, 0x48, 0x03, 0xec, + 0x99, 0xa0, 0xfa, 0xb8, 0x5f, 0xb3, 0xc1, 0x19, 0xad, 0x6c, 0x96, 0xb2, 0x27, 0x97, 0x4a, 0x06, + 0x88, 0x5e, 0xea, 0x91, 0xd9, 0xeb, 0xab, 0x2e, 0x85, 0xbf, 0xd0, 0xa8, 0x38, 0x12, 0x47, 0x42, + 0xab, 0x7c, 0xe4, 0xf7, 0xfc, 0x2d, 0x4f, 0xf0, 0x10, 0xb1, 0xc5, 0x19, 0x8a, 0x6b, 0x76, 0xc3, + 0x16, 0xb1, 0xa5, 0x80, 0xef, 0x43, 0xa1, 0xd3, 0x7d, 0xc1, 0xfa, 0x14, 0xbd, 0x25, 0x1a, 0xb5, + 0xc7, 0x2e, 0x59, 0xac, 0xdb, 0x7c, 0x75, 0x22, 0x7d, 0xc4, 0xe8, 0xf1, 0xf7, 0x96, 0x66, 0x3f, + 0x87, 0x51, 0x41, 0xae, 0x1d, 0xd7, 0x9c, 0xa9, 0x89, 0x23, 0x70, 0xa2, 0xd5, 0xa8, 0x0d, 0x55, + 0x37, 0x18, 0x0c, 0x79, 0x8b, 0x7d, 0xe5, 0x05, 0x1e, 0xf7, 0xc2, 0x20, 0xae, 0x15, 0xa4, 0xcb, + 0x66, 0x76, 0xe9, 0x31, 0x0b, 0x32, 0xe5, 0x82, 0xbf, 0xb5, 0x60, 0x75, 0x02, 0xbc, 0x86, 0x57, + 0x6e, 0x31, 0xaf, 0x77, 0x93, 0x91, 0x69, 0x4b, 0xc3, 0xfa, 0x5c, 0x36, 0xe3, 0x13, 0xf4, 0x67, + 0x0b, 0xd6, 0x67, 0x19, 0xcc, 0x64, 0x53, 0x07, 0x78, 0x1a, 0x79, 0x7d, 0x1a, 0x8d, 0x3e, 0x66, + 0x23, 0x7d, 0x7b, 0x64, 0x10, 0xf4, 0x39, 0x6c, 0x4c, 0xc4, 0xfa, 0xb0, 0xab, 0x52, 0xa4, 0x48, + 0xdd, 0x9e, 0x4b, 0x4a, 0xd9, 0x91, 0x39, 0xee, 0xf8, 0x0f, 0x0b, 0x6e, 0xcd, 0x54, 0xa5, 0xdd, + 0x67, 0x65, 0x1b, 0xfd, 0x2e, 0x54, 0x9f, 0x8b, 0xc1, 0xd0, 0x62, 0x31, 0xf7, 0x02, 0x2a, 0x2c, + 0x75, 0x7b, 0x4e, 0xe1, 0xc8, 0x85, 0xa2, 0xc4, 0x0e, 0xe9, 0x40, 0xd3, 0x7c, 0xfb, 0x1a, 0x9a, + 0xbb, 0xc6, 0x5e, 0xcf, 0x4d, 0x23, 0x0a, 0x32, 0x72, 0x8e, 0x9b, 0x4b, 0x41, 0x0a, 0x62, 0x22, + 0x8e, 0x39, 0xdc, 0x68, 0xaa, 0x85, 0xb0, 0x6d, 0x26, 0xc9, 0x18, 0x93, 0xc5, 0x67, 0xf2, 0x01, + 0x40, 0x6a, 0xaa, 0x8f, 0xfb, 0x82, 0xfe, 0xcc, 0x18, 0xe3, 0x27, 0xb0, 0x6d, 0xc6, 0xdc, 0x0d, + 0x16, 0x34, 0xdd, 0x92, 0x4b, 0xbb, 0x05, 0xb7, 0xc1, 0x7e, 0x46, 0x5c, 0x71, 0xd5, 0xc9, 0xd3, + 0x6a, 0x4a, 0xa4, 0x25, 0xe1, 0xf2, 0x24, 0x8c, 0xb9, 0x71, 0x11, 0xdf, 0x02, 0x7b, 0x1a, 0x46, + 0x5c, 0x32, 0xae, 0x10, 0xf9, 0x8d, 0xdf, 0x03, 0xe7, 0x28, 0xec, 0x31, 0xb4, 0x02, 0x39, 0xb7, + 0xa5, 0x63, 0xe4, 0xdc, 0x16, 0xba, 0x2d, 0xc3, 0xeb, 0x19, 0x52, 0x49, 0x37, 0xf7, 0x8c, 0xb8, + 0x44, 0x68, 0xf0, 0x23, 0xa8, 0x0a, 0xc7, 0x0e, 0xa7, 0x3c, 0x19, 0x61, 0x1b, 0x50, 0x10, 0x58, + 0x12, 0x48, 0x4b, 0xf2, 0x42, 0x10, 0x76, 0x66, 0x88, 0x49, 0x01, 0xff, 0x60, 0x01, 0x98, 0x10, + 0xc3, 0x18, 0x61, 0xc5, 0x44, 0xba, 0x96, 0x9b, 0x2b, 0xe9, 0x92, 0x02, 0x25, 0x8a, 0xe5, 0x3b, + 0x99, 0x6b, 0x78, 0x7a, 0xbe, 0x25, 0x2a, 0x92, 0xb9, 0xac, 0x77, 0xcc, 0x38, 0xd3, 0x85, 0xaa, + 0xa6, 0xf6, 0x0a, 0xd7, 0x29, 0x13, 0x37, 0x40, 0xe5, 0xc0, 0x1f, 0xc6, 0x9c, 0x45, 0x9a, 0x91, + 0x78, 0x2e, 0x28, 0x20, 0xd9, 0x51, 0x0a, 0xcc, 0xde, 0x14, 0x7a, 0x03, 0xf2, 0x82, 0xa9, 0x39, + 0x93, 0x93, 0xdb, 0x50, 0x4a, 0xdc, 0x81, 0xfc, 0xfc, 0x39, 0x80, 0xc0, 0x91, 0x8f, 0x43, 0x5d, + 0x3a, 0xf9, 0x2e, 0xac, 0x82, 0x7d, 0xe8, 0xa9, 0x5e, 0xb3, 0x89, 0xf8, 0x94, 0x08, 0xbd, 0x94, + 0x67, 0x41, 0x20, 0x54, 0x5c, 0x8b, 0x6b, 0xaa, 0x99, 0xc5, 0x1c, 0x7f, 0x95, 0x0b, 0xcc, 0xbc, + 0xaf, 0xec, 0xcc, 0xfb, 0xaa, 0x03, 0x6b, 0xaa, 0x61, 0xff, 0xcb, 0xa0, 0x3f, 0xe5, 0x60, 0x8d, + 0xb0, 0xd8, 0x7b, 0xc9, 0xdc, 0x20, 0xe6, 0xd1, 0x30, 0x19, 0x36, 0x1f, 0x85, 0x27, 0x3a, 0xd5, + 0x36, 0x51, 0x42, 0xd2, 0x16, 0xb9, 0x05, 0x6d, 0x71, 0x4f, 0xbc, 0xf4, 0xc3, 0xa8, 0x27, 0x86, + 0x4e, 0x18, 0xe9, 0x42, 0x4f, 0x9a, 0x66, 0x4d, 0xd0, 0x3d, 0x58, 0xea, 0x84, 0xc3, 0xa8, 0x9b, + 0x5c, 0x49, 0x1b, 0xa9, 0xb5, 0x62, 0xa6, 0xd4, 0xc4, 0x98, 0x65, 0xfa, 0x28, 0xbf, 0xb8, 0x8f, + 0xd0, 0xc3, 0x89, 0x3e, 0x92, 0x8f, 0xf0, 0x72, 0xf3, 0xb5, 0xd4, 0x61, 0x4c, 0x4d, 0xc6, 0xad, + 0xf1, 0x77, 0x16, 0x2c, 0x67, 0x29, 0xfc, 0xa3, 0x83, 0x91, 0x54, 0x24, 0x37, 0xb3, 0x22, 0xf6, + 0xac, 0x8a, 0x38, 0x69, 0x45, 0xd2, 0x27, 0x5b, 0x3e, 0xf3, 0x64, 0xc3, 0x67, 0xb0, 0x39, 0x55, + 0xa6, 0x83, 0xb0, 0x3f, 0x10, 0xfd, 0xf0, 0x2f, 0xca, 0xb5, 0x0e, 0xf9, 0x76, 0x14, 0xe9, 0x42, + 0x95, 0x88, 0x12, 0xf0, 0x03, 0xb8, 0xd5, 0x61, 0x3c, 0x53, 0x24, 0xd3, 0x6d, 0x0d, 0xb0, 0x8f, + 0xd8, 0xc5, 0x9c, 0xed, 0x0b, 0x15, 0xde, 0x87, 0xe2, 0x71, 0x38, 0x08, 0xfd, 0xf0, 0x74, 0x74, + 0xcd, 0xa1, 0xad, 0xc1, 0x92, 0x9a, 0x49, 0xea, 0xca, 0x2f, 0x11, 0x23, 0xee, 0x57, 0x7f, 0xb9, + 0xaa, 0x5b, 0xbf, 0x5e, 0xd5, 0xad, 0xdf, 0xae, 0xea, 0xd6, 0x8f, 0xbf, 0xd7, 0xff, 0x77, 0x52, + 0x90, 0x7f, 0x97, 0xf7, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xc5, 0x2e, 0x66, 0x6e, 0x0e, + 0x00, 0x00, } diff --git a/internal/private.proto b/internal/private.proto index 1686b3be2..4e3261079 100644 --- a/internal/private.proto +++ b/internal/private.proto @@ -186,8 +186,7 @@ message ResizeInstructionComplete { } message SetCoordinatorMessage { - Node Old = 1; - Node New = 2; + Node New = 1; } message Topology { diff --git a/server.go b/server.go index 7652a6c5b..63c14a88e 100644 --- a/server.go +++ b/server.go @@ -442,7 +442,7 @@ func (s *Server) ReceiveMessage(pb proto.Message) error { return err } case *internal.SetCoordinatorMessage: - s.Cluster.SetCoordinator(DecodeNode(obj.Old), DecodeNode(obj.New)) + s.Cluster.SetCoordinator(DecodeNode(obj.New)) case *internal.NodeStateMessage: err := s.Cluster.ReceiveNodeState(obj.NodeID, obj.State) if err != nil {