From 48d43ee2eed7b2920d5be8c780de0be6323fc131 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Mon, 7 Oct 2019 23:37:13 -0400 Subject: [PATCH] enable redis over wireguard Signed-off-by: Evan Hazlett --- api/v1/heimdall.pb.go | 146 ++++++++++++++++++++++-------------------- api/v1/heimdall.proto | 1 + go.mod | 1 + go.sum | 16 +++++ server/net.go | 2 + server/node.go | 24 +++++-- server/peer.go | 7 +- server/server.go | 98 ++++++++++++++++++++++++++-- 8 files changed, 210 insertions(+), 85 deletions(-) diff --git a/api/v1/heimdall.pb.go b/api/v1/heimdall.pb.go index 90e875d..b6a3d76 100644 --- a/api/v1/heimdall.pb.go +++ b/api/v1/heimdall.pb.go @@ -32,6 +32,7 @@ type Master struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` GRPCAddress string `protobuf:"bytes,2,opt,name=grpc_address,json=grpcAddress,proto3" json:"grpc_address,omitempty"` RedisURL string `protobuf:"bytes,3,opt,name=redis_url,json=redisUrl,proto3" json:"redis_url,omitempty"` + GatewayIP string `protobuf:"bytes,4,opt,name=gateway_ip,json=gatewayIp,proto3" json:"gateway_ip,omitempty"` Peers []*Peer `protobuf:"bytes,5,rep,name=peers,proto3" json:"peers,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -83,6 +84,13 @@ func (m *Master) GetRedisURL() string { return "" } +func (m *Master) GetGatewayIP() string { + if m != nil { + return m.GatewayIP + } + return "" +} + func (m *Master) GetPeers() []*Peer { if m != nil { return m.Peers @@ -1031,75 +1039,75 @@ func init() { } var fileDescriptor_b6184fc395da86b1 = []byte{ - // 1076 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x6f, 0xe3, 0x44, - 0x10, 0xc7, 0xf9, 0x9f, 0x49, 0xd3, 0x4a, 0xab, 0x53, 0xf1, 0x05, 0x21, 0x97, 0x9c, 0x10, 0x39, - 0x74, 0xb2, 0xdb, 0x02, 0xe2, 0xcf, 0xe9, 0x10, 0x4d, 0x73, 0x1c, 0xa6, 0x50, 0x85, 0x3d, 0xee, - 0x05, 0x9d, 0x14, 0xdc, 0x78, 0x2e, 0x75, 0xeb, 0xd8, 0x8b, 0xbd, 0x69, 0x15, 0x3e, 0x01, 0x8f, - 0x7c, 0x1f, 0x24, 0x9e, 0x79, 0xe1, 0x9d, 0xa7, 0x20, 0xe5, 0x13, 0xf0, 0xc6, 0x2b, 0xda, 0xf5, - 0xda, 0x97, 0xb4, 0x8d, 0xea, 0xf6, 0x8e, 0xb7, 0xee, 0xec, 0xfc, 0x66, 0x32, 0xbf, 0xdf, 0xcc, - 0xac, 0x0b, 0x9f, 0x8c, 0x3c, 0x7e, 0x3c, 0x39, 0x32, 0x87, 0xe1, 0xd8, 0x8a, 0x39, 0xfa, 0xbe, - 0x13, 0xb1, 0x28, 0x3c, 0xc1, 0x21, 0xb7, 0x8e, 0xd1, 0x1b, 0xbb, 0x8e, 0xef, 0x5b, 0x0e, 0xf3, - 0xac, 0xb3, 0x9d, 0xec, 0x6c, 0xb2, 0x28, 0xe4, 0x21, 0x79, 0xc7, 0x0b, 0xcd, 0x65, 0x84, 0x99, - 0x79, 0x38, 0xcc, 0x33, 0xcf, 0x76, 0x5a, 0x77, 0x46, 0xe1, 0x28, 0x94, 0xde, 0x96, 0xf8, 0x2b, - 0x01, 0xb6, 0xde, 0x1a, 0x85, 0xe1, 0xc8, 0x47, 0x4b, 0x9e, 0x8e, 0x26, 0x2f, 0x2c, 0x1c, 0x33, - 0x3e, 0x55, 0x97, 0xc6, 0xc5, 0x4b, 0xee, 0x8d, 0x31, 0xe6, 0xce, 0x98, 0x25, 0x0e, 0xed, 0xdf, - 0x35, 0xa8, 0x7c, 0xeb, 0xc4, 0x1c, 0x23, 0xb2, 0x09, 0x05, 0xcf, 0xd5, 0xb5, 0x2d, 0xad, 0x53, - 0xef, 0x56, 0xe6, 0x33, 0xa3, 0x60, 0xf7, 0x68, 0xc1, 0x73, 0xc9, 0x2e, 0xac, 0x8d, 0x22, 0x36, - 0x1c, 0x38, 0xae, 0x1b, 0x61, 0x1c, 0xeb, 0x05, 0xe9, 0xb1, 0x31, 0x9f, 0x19, 0x8d, 0x27, 0xb4, - 0xbf, 0xbf, 0x97, 0x98, 0x69, 0x43, 0x38, 0xa9, 0x03, 0xb9, 0x0f, 0xf5, 0x08, 0x5d, 0x2f, 0x1e, - 0x4c, 0x22, 0x5f, 0x2f, 0x4a, 0xc0, 0xda, 0x7c, 0x66, 0xd4, 0xa8, 0x30, 0x3e, 0xa3, 0xdf, 0xd0, - 0x9a, 0xbc, 0x7e, 0x16, 0xf9, 0xe4, 0x11, 0x94, 0x19, 0x62, 0x14, 0xeb, 0xe5, 0xad, 0x62, 0xa7, - 0xb1, 0xfb, 0x9e, 0x79, 0x2d, 0x11, 0x66, 0x1f, 0x31, 0xa2, 0x09, 0xaa, 0xfd, 0xaf, 0x06, 0x8d, - 0xaf, 0x43, 0x2f, 0xa0, 0xf8, 0xd3, 0x04, 0x63, 0xbe, 0xb2, 0x0a, 0x03, 0x1a, 0x43, 0x7f, 0x22, - 0x0a, 0x1d, 0x9c, 0xe2, 0x34, 0x29, 0x82, 0x82, 0x32, 0x1d, 0xe0, 0xf4, 0x52, 0x99, 0xc5, 0x1c, - 0x65, 0x5a, 0xd0, 0xc0, 0xc0, 0x65, 0xa1, 0x17, 0xf0, 0x81, 0xc7, 0xf4, 0x92, 0x84, 0xac, 0xcf, - 0x67, 0x06, 0x3c, 0x56, 0x66, 0xbb, 0x4f, 0x21, 0x75, 0xb1, 0x19, 0xb9, 0x07, 0xcd, 0x0c, 0xc0, - 0xc2, 0x88, 0xeb, 0xe5, 0x2d, 0xad, 0x53, 0xa2, 0x6b, 0xa9, 0xb1, 0x1f, 0x46, 0x9c, 0xbc, 0x0b, - 0xeb, 0x5e, 0xc0, 0x31, 0x7a, 0xe1, 0x0c, 0x71, 0x10, 0x38, 0x63, 0xd4, 0x2b, 0xf2, 0xd7, 0x36, - 0x33, 0xeb, 0xa1, 0x33, 0xc6, 0xf6, 0x9f, 0x1a, 0xac, 0x25, 0x95, 0xc7, 0x2c, 0x0c, 0x62, 0x24, - 0x7b, 0x50, 0x19, 0x4b, 0x29, 0x65, 0xf9, 0x8d, 0xdd, 0xfb, 0x39, 0xa8, 0x4c, 0xb4, 0xa7, 0x0a, - 0x48, 0x1e, 0x42, 0x29, 0x08, 0x5d, 0x94, 0xf4, 0xe4, 0xd3, 0xe2, 0x30, 0x74, 0x91, 0x4a, 0xd0, - 0x4b, 0x25, 0x8b, 0xb7, 0x52, 0xb2, 0x03, 0xeb, 0xfb, 0x61, 0x10, 0xe0, 0x90, 0x5f, 0xa3, 0x65, - 0xfb, 0x2f, 0x0d, 0x36, 0x32, 0x57, 0x55, 0xfc, 0x77, 0x50, 0x3d, 0xc5, 0x29, 0x73, 0xbc, 0xb4, - 0xfa, 0xf7, 0x73, 0xa4, 0x3f, 0xc0, 0x69, 0xdf, 0xf1, 0xa2, 0x6e, 0x63, 0x3e, 0x33, 0xaa, 0xea, - 0x40, 0xd3, 0x38, 0x44, 0x87, 0xea, 0x52, 0xcf, 0xd3, 0xf4, 0xf8, 0x8a, 0x95, 0x92, 0xbb, 0x50, - 0x74, 0x83, 0x58, 0x2f, 0x6d, 0x15, 0x3b, 0xf5, 0x6e, 0x75, 0x3e, 0x33, 0x8a, 0xbd, 0xc3, 0xa7, - 0x54, 0xd8, 0xda, 0x26, 0xdc, 0xd9, 0x9b, 0xf0, 0xe3, 0x30, 0xf2, 0x7e, 0x46, 0x09, 0xb9, 0x86, - 0x8a, 0x6d, 0xd8, 0xec, 0xa1, 0x73, 0x13, 0x84, 0x0e, 0x9b, 0x59, 0x06, 0x57, 0x00, 0x62, 0x85, - 0x68, 0x7f, 0x08, 0x6f, 0x5e, 0xba, 0x51, 0xec, 0xde, 0x85, 0xa2, 0xe7, 0xc6, 0xba, 0xf6, 0xf2, - 0x17, 0xdb, 0xbd, 0x98, 0x0a, 0x5b, 0xdb, 0x86, 0x94, 0x39, 0x31, 0x63, 0x2c, 0xf2, 0xce, 0x1c, - 0x8e, 0x72, 0xc6, 0xb4, 0x64, 0xc6, 0x94, 0x49, 0xcc, 0xd8, 0xdb, 0x00, 0x6c, 0x72, 0xe4, 0x7b, - 0xc3, 0x85, 0x19, 0xac, 0x27, 0x96, 0x03, 0x9c, 0xb6, 0xff, 0x29, 0x40, 0x49, 0xf4, 0xd3, 0xca, - 0x21, 0x26, 0x50, 0x12, 0x12, 0x28, 0xa4, 0xfc, 0x7b, 0x51, 0xf8, 0xe2, 0x6b, 0x12, 0xfe, 0xff, - 0x19, 0xeb, 0x07, 0x00, 0x23, 0x87, 0xe3, 0xb9, 0x33, 0x15, 0x41, 0xe5, 0x48, 0x77, 0x9b, 0xf3, - 0x99, 0x51, 0x7f, 0x92, 0x58, 0xed, 0x3e, 0xad, 0x2b, 0x07, 0x9b, 0x91, 0xcf, 0xa1, 0x3a, 0x61, - 0xae, 0xc3, 0xd1, 0xd5, 0xab, 0xb2, 0xac, 0x96, 0x99, 0xec, 0x72, 0x33, 0xdd, 0xe5, 0xe6, 0xf7, - 0xe9, 0x2e, 0xef, 0xd6, 0xfe, 0x98, 0x19, 0x6f, 0xfc, 0xfa, 0xb7, 0xa1, 0xd1, 0x14, 0x74, 0xc5, - 0x12, 0xa9, 0x5d, 0xb5, 0x44, 0xd6, 0x61, 0x4d, 0x30, 0x9e, 0xf5, 0xc0, 0x21, 0x34, 0xd5, 0x59, - 0x29, 0xff, 0x08, 0xca, 0x62, 0xb8, 0x13, 0xed, 0x6f, 0xb0, 0x12, 0x12, 0x94, 0x78, 0x5f, 0x4a, - 0xa2, 0x95, 0x56, 0x4a, 0xba, 0x20, 0x5f, 0xe1, 0xf5, 0xc9, 0xe7, 0xf8, 0x7e, 0x78, 0x8e, 0xee, - 0xc0, 0x63, 0xc9, 0x8c, 0x2a, 0xf9, 0xf6, 0x12, 0xb3, 0xdd, 0x8f, 0x29, 0x28, 0x17, 0x9b, 0xc5, - 0xa4, 0x05, 0xb5, 0x54, 0xa9, 0x44, 0x6c, 0x9a, 0x9d, 0x05, 0x41, 0x4b, 0x43, 0x72, 0x08, 0xcd, - 0xe5, 0xd1, 0xc8, 0x76, 0x81, 0x76, 0xab, 0xad, 0xf7, 0x25, 0x94, 0x69, 0x38, 0xe1, 0x48, 0xee, - 0x41, 0x55, 0x50, 0x36, 0xc8, 0x58, 0x82, 0xf9, 0xcc, 0xa8, 0x08, 0x2e, 0xed, 0x1e, 0xad, 0x88, - 0x2b, 0xdb, 0x15, 0x2b, 0x29, 0x40, 0x7e, 0x1e, 0x46, 0xa7, 0xe9, 0x4a, 0x52, 0xc7, 0xf6, 0x53, - 0x20, 0xfb, 0x11, 0x3a, 0x1c, 0x65, 0xb4, 0x74, 0x09, 0xbc, 0x62, 0x50, 0x13, 0x48, 0x0f, 0x7d, - 0xbc, 0x10, 0x74, 0xc1, 0x5f, 0x5b, 0xf6, 0xdf, 0x80, 0xa6, 0xf4, 0xcc, 0xd8, 0xa2, 0xb0, 0x9e, - 0x1a, 0x14, 0x5d, 0x5f, 0x40, 0x25, 0x92, 0x16, 0xc5, 0x57, 0x27, 0x07, 0x5f, 0x49, 0x76, 0x85, - 0xdb, 0xfd, 0xad, 0x06, 0xb5, 0xaf, 0x94, 0x07, 0x61, 0x50, 0x55, 0x2f, 0x01, 0xd9, 0xc9, 0x11, - 0x69, 0xf9, 0x81, 0x69, 0xed, 0xde, 0x04, 0xa2, 0x0a, 0xf8, 0x11, 0x9a, 0x4b, 0x1b, 0x9a, 0x7c, - 0x9c, 0x23, 0xc8, 0x55, 0x3b, 0xbd, 0xb5, 0x79, 0x69, 0xa2, 0x1f, 0x8b, 0x4f, 0x37, 0xe2, 0xc2, - 0xc6, 0x85, 0x9d, 0x4e, 0x3e, 0xcd, 0x91, 0xe3, 0xea, 0x77, 0x60, 0x65, 0x96, 0x5f, 0x34, 0xd8, - 0xb8, 0xb0, 0xee, 0x73, 0xa5, 0xb9, 0xfa, 0xf1, 0x68, 0x7d, 0x76, 0x1b, 0xa8, 0xa2, 0x74, 0x04, - 0x25, 0xf1, 0x21, 0x43, 0xcc, 0x1c, 0x31, 0x16, 0xbe, 0xf5, 0x5a, 0x56, 0x6e, 0x7f, 0x95, 0x68, - 0x0c, 0x95, 0xa4, 0x1d, 0xc9, 0x76, 0xde, 0xb6, 0xcb, 0x0a, 0xdc, 0xb9, 0x01, 0x42, 0xa5, 0x7b, - 0x0e, 0x8d, 0x85, 0x99, 0x24, 0x1f, 0xe5, 0xe9, 0xb6, 0x4b, 0x33, 0xbc, 0x52, 0xc0, 0xe7, 0xd0, - 0x58, 0x18, 0xce, 0x5c, 0xd1, 0x2f, 0x0f, 0xf3, 0xca, 0xe8, 0x27, 0x50, 0x96, 0x0f, 0x01, 0xb1, - 0x72, 0x6e, 0xfc, 0x8c, 0xa8, 0xed, 0xfc, 0x00, 0xc5, 0xd3, 0x09, 0x94, 0x93, 0xfe, 0xb3, 0x72, - 0x2e, 0xcf, 0x1b, 0xe5, 0x5a, 0xea, 0xb5, 0xae, 0xf9, 0xc3, 0x83, 0xdc, 0xff, 0xa3, 0x3d, 0x3c, - 0xdb, 0x39, 0xaa, 0x48, 0x5e, 0x3e, 0xf8, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x58, 0x29, 0xda, 0xfa, - 0xda, 0x0d, 0x00, 0x00, + // 1082 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0xc6, 0xf9, 0x9d, 0x97, 0xa6, 0x95, 0x46, 0xab, 0xe2, 0x0d, 0x42, 0x2e, 0x59, 0x21, 0xb2, + 0x68, 0x65, 0xb7, 0x05, 0xc4, 0x8f, 0xd5, 0x22, 0xda, 0x66, 0x59, 0x4c, 0xa1, 0x0a, 0xb3, 0xec, + 0x05, 0xad, 0x14, 0xdc, 0xf8, 0x6d, 0xea, 0xd6, 0xf1, 0x0c, 0xf6, 0xa4, 0x55, 0xf8, 0x0b, 0x38, + 0xf2, 0xff, 0x20, 0x71, 0xe6, 0xc2, 0x9d, 0x53, 0x90, 0x72, 0xe6, 0xc0, 0x8d, 0x2b, 0x1a, 0x7b, + 0xec, 0x26, 0x6d, 0xa3, 0xba, 0xdd, 0xdd, 0x5b, 0xe7, 0xcd, 0xfb, 0xde, 0xcb, 0xfb, 0xde, 0x7b, + 0xdf, 0xb8, 0xf0, 0xc9, 0xd0, 0x13, 0x47, 0xe3, 0x43, 0x73, 0xc0, 0x46, 0x56, 0x24, 0xd0, 0xf7, + 0x9d, 0x90, 0x87, 0xec, 0x18, 0x07, 0xc2, 0x3a, 0x42, 0x6f, 0xe4, 0x3a, 0xbe, 0x6f, 0x39, 0xdc, + 0xb3, 0x4e, 0xb7, 0xb2, 0xb3, 0xc9, 0x43, 0x26, 0x18, 0x79, 0xc7, 0x63, 0xe6, 0x22, 0xc2, 0xcc, + 0x3c, 0x1c, 0xee, 0x99, 0xa7, 0x5b, 0xad, 0x3b, 0x43, 0x36, 0x64, 0xb1, 0xb7, 0x25, 0xff, 0x4a, + 0x80, 0xad, 0xb7, 0x86, 0x8c, 0x0d, 0x7d, 0xb4, 0xe2, 0xd3, 0xe1, 0xf8, 0x85, 0x85, 0x23, 0x2e, + 0x26, 0xea, 0xd2, 0xb8, 0x78, 0x29, 0xbc, 0x11, 0x46, 0xc2, 0x19, 0xf1, 0xc4, 0xa1, 0xfd, 0x8f, + 0x06, 0x95, 0x6f, 0x9d, 0x48, 0x60, 0x48, 0xd6, 0xa1, 0xe0, 0xb9, 0xba, 0xb6, 0xa1, 0x75, 0xea, + 0xbb, 0x95, 0xd9, 0xd4, 0x28, 0xd8, 0x5d, 0x5a, 0xf0, 0x5c, 0xb2, 0x0d, 0x2b, 0xc3, 0x90, 0x0f, + 0xfa, 0x8e, 0xeb, 0x86, 0x18, 0x45, 0x7a, 0x21, 0xf6, 0x58, 0x9b, 0x4d, 0x8d, 0xc6, 0x13, 0xda, + 0xdb, 0xdb, 0x49, 0xcc, 0xb4, 0x21, 0x9d, 0xd4, 0x81, 0xdc, 0x87, 0x7a, 0x88, 0xae, 0x17, 0xf5, + 0xc7, 0xa1, 0xaf, 0x17, 0x63, 0xc0, 0xca, 0x6c, 0x6a, 0xd4, 0xa8, 0x34, 0x3e, 0xa3, 0xdf, 0xd0, + 0x5a, 0x7c, 0xfd, 0x2c, 0xf4, 0xc9, 0x03, 0x80, 0xa1, 0x23, 0xf0, 0xcc, 0x99, 0xf4, 0x3d, 0xae, + 0x97, 0x62, 0xdf, 0xe6, 0x6c, 0x6a, 0xd4, 0x9f, 0x24, 0x56, 0xbb, 0x47, 0xeb, 0xca, 0xc1, 0xe6, + 0xe4, 0x11, 0x94, 0x39, 0x62, 0x18, 0xe9, 0xe5, 0x8d, 0x62, 0xa7, 0xb1, 0xfd, 0x9e, 0x79, 0x2d, + 0x6d, 0x66, 0x0f, 0x31, 0xa4, 0x09, 0xaa, 0xfd, 0x9f, 0x06, 0x8d, 0xaf, 0x99, 0x17, 0x50, 0xfc, + 0x69, 0x8c, 0x91, 0x58, 0x5a, 0xb3, 0x01, 0x8d, 0x81, 0x3f, 0x96, 0xb4, 0xf4, 0x4f, 0x70, 0x92, + 0x94, 0x4c, 0x41, 0x99, 0xf6, 0x71, 0x72, 0x89, 0x94, 0x62, 0x0e, 0x52, 0x2c, 0x68, 0x60, 0xe0, + 0x72, 0xe6, 0x05, 0xe2, 0xbc, 0xd4, 0xd5, 0xd9, 0xd4, 0x80, 0xc7, 0xca, 0x6c, 0xf7, 0x28, 0xa4, + 0x2e, 0x36, 0x27, 0xf7, 0xa0, 0x99, 0x01, 0x38, 0x0b, 0x85, 0x5e, 0xde, 0xd0, 0x3a, 0x25, 0xba, + 0x92, 0x1a, 0x7b, 0x2c, 0x14, 0xe4, 0x5d, 0x58, 0xf5, 0x02, 0x81, 0xe1, 0x0b, 0x67, 0x80, 0xfd, + 0xc0, 0x19, 0xa1, 0x5e, 0x89, 0x7f, 0x6d, 0x33, 0xb3, 0x1e, 0x38, 0x23, 0x6c, 0xff, 0xa9, 0xc1, + 0x4a, 0x52, 0x79, 0xc4, 0x59, 0x10, 0x21, 0xd9, 0x81, 0xca, 0x28, 0x6e, 0x7c, 0x5c, 0x7e, 0x63, + 0xfb, 0x7e, 0x0e, 0x2a, 0x93, 0x49, 0xa1, 0x0a, 0x48, 0x1e, 0x42, 0x29, 0x60, 0x2e, 0xc6, 0xf4, + 0xe4, 0xeb, 0xc5, 0x01, 0x73, 0x91, 0xc6, 0xa0, 0xf3, 0x4e, 0x16, 0x6f, 0xd5, 0xc9, 0x0e, 0xac, + 0xee, 0xb1, 0x20, 0xc0, 0x81, 0xb8, 0xa6, 0x97, 0xed, 0xbf, 0x34, 0x58, 0xcb, 0x5c, 0x55, 0xf1, + 0xdf, 0x41, 0xf5, 0x04, 0x27, 0xdc, 0xf1, 0xd2, 0xea, 0xdf, 0xcf, 0x91, 0x7e, 0x1f, 0x27, 0x3d, + 0xc7, 0x0b, 0x77, 0x1b, 0xb3, 0xa9, 0x51, 0x55, 0x07, 0x9a, 0xc6, 0x21, 0x3a, 0x54, 0x17, 0x36, + 0x84, 0xa6, 0xc7, 0x97, 0xac, 0x94, 0xdc, 0x85, 0xa2, 0x1b, 0x44, 0x7a, 0x69, 0xa3, 0xd8, 0xa9, + 0xef, 0x56, 0x67, 0x53, 0xa3, 0xd8, 0x3d, 0x78, 0x4a, 0xa5, 0xad, 0x6d, 0xc2, 0x9d, 0x9d, 0xb1, + 0x38, 0x62, 0xa1, 0xf7, 0x33, 0xc6, 0x90, 0x6b, 0xa8, 0xd8, 0x84, 0xf5, 0x2e, 0x3a, 0x37, 0x41, + 0xe8, 0xb0, 0x9e, 0x65, 0x70, 0x25, 0x20, 0x52, 0x88, 0xf6, 0x87, 0xf0, 0xe6, 0xa5, 0x1b, 0xc5, + 0xee, 0x5d, 0x28, 0x7a, 0x6e, 0xa4, 0x6b, 0xe7, 0xbf, 0xd8, 0xee, 0x46, 0x54, 0xda, 0xda, 0x36, + 0xa4, 0xcc, 0xc9, 0x1d, 0xe3, 0xa1, 0x77, 0xea, 0x08, 0x8c, 0x77, 0x4c, 0x4b, 0x76, 0x4c, 0x99, + 0xe4, 0x8e, 0xbd, 0x0d, 0xc0, 0xc7, 0x87, 0xbe, 0x37, 0x98, 0xdb, 0xc1, 0x7a, 0x62, 0xd9, 0xc7, + 0x49, 0xfb, 0xdf, 0x02, 0x94, 0xe4, 0x3c, 0x2d, 0x5d, 0x62, 0x02, 0x25, 0xd9, 0x02, 0x85, 0x8c, + 0xff, 0x9e, 0x6f, 0x7c, 0xf1, 0x15, 0x35, 0xfe, 0xf5, 0xac, 0xf5, 0xa2, 0x2c, 0x56, 0xae, 0x91, + 0xc5, 0xcf, 0xa1, 0x3a, 0xe6, 0xae, 0x23, 0xd0, 0xd5, 0xab, 0x71, 0x59, 0x2d, 0x33, 0x51, 0x7e, + 0x33, 0x55, 0x7e, 0xf3, 0xfb, 0x54, 0xf9, 0x77, 0x6b, 0x7f, 0x4c, 0x8d, 0x37, 0x7e, 0xfd, 0xdb, + 0xd0, 0x68, 0x0a, 0xba, 0x42, 0x44, 0x6a, 0x57, 0x89, 0xc8, 0x2a, 0xac, 0x48, 0xc6, 0xb3, 0x19, + 0x38, 0x80, 0xa6, 0x3a, 0xab, 0xce, 0x3f, 0x82, 0xb2, 0x5c, 0xee, 0xa4, 0xf7, 0x37, 0x90, 0x84, + 0x04, 0xd5, 0xfe, 0x5d, 0x83, 0x92, 0x1c, 0xa5, 0xa5, 0x2d, 0x9d, 0x6b, 0x5f, 0xe1, 0xd5, 0xb5, + 0xcf, 0xf1, 0x7d, 0x76, 0x86, 0x6e, 0xdf, 0xe3, 0xc9, 0x8e, 0xaa, 0xf6, 0xed, 0x24, 0x66, 0xbb, + 0x17, 0x51, 0x50, 0x2e, 0x36, 0x8f, 0x48, 0x0b, 0x6a, 0x69, 0xa7, 0x92, 0x66, 0xd3, 0xec, 0x2c, + 0x09, 0x5a, 0x58, 0x92, 0x03, 0x68, 0x2e, 0xae, 0x46, 0xa6, 0x05, 0xda, 0xad, 0x54, 0xef, 0x4b, + 0x28, 0x53, 0x36, 0x16, 0x48, 0xee, 0x41, 0x55, 0x52, 0xd6, 0xcf, 0x58, 0x82, 0xd9, 0xd4, 0xa8, + 0x48, 0x2e, 0xed, 0x2e, 0xad, 0xc8, 0x2b, 0xdb, 0x95, 0x92, 0x14, 0xa0, 0x38, 0x63, 0xe1, 0x49, + 0x2a, 0x49, 0xea, 0xd8, 0x7e, 0x0a, 0x64, 0x2f, 0x44, 0x47, 0x60, 0x1c, 0x2d, 0x15, 0x81, 0x97, + 0x0c, 0x6a, 0x02, 0xe9, 0xa2, 0x8f, 0x17, 0x82, 0xce, 0xf9, 0x6b, 0x8b, 0xfe, 0x6b, 0xd0, 0x8c, + 0x3d, 0x33, 0xb6, 0x28, 0xac, 0xa6, 0x06, 0x45, 0xd7, 0x17, 0x50, 0x09, 0x63, 0x8b, 0xe2, 0xab, + 0x93, 0x83, 0xaf, 0x24, 0xbb, 0xc2, 0x6d, 0xff, 0x56, 0x83, 0xda, 0x57, 0xca, 0x83, 0x70, 0xa8, + 0xaa, 0x97, 0x80, 0x6c, 0xe5, 0x88, 0xb4, 0xf8, 0xc0, 0xb4, 0xb6, 0x6f, 0x02, 0x51, 0x05, 0xfc, + 0x08, 0xcd, 0x05, 0x85, 0x26, 0x1f, 0xe7, 0x08, 0x72, 0x95, 0xa6, 0xb7, 0xd6, 0x2f, 0x6d, 0xf4, + 0x63, 0xf9, 0xa1, 0x47, 0x5c, 0x58, 0xbb, 0xa0, 0xe9, 0xe4, 0xd3, 0x1c, 0x39, 0xae, 0x7e, 0x07, + 0x96, 0x66, 0xf9, 0x45, 0x83, 0xb5, 0x0b, 0x72, 0x9f, 0x2b, 0xcd, 0xd5, 0x8f, 0x47, 0xeb, 0xb3, + 0xdb, 0x40, 0x15, 0xa5, 0x43, 0x28, 0xc9, 0x0f, 0x19, 0x62, 0xe6, 0x88, 0x31, 0xf7, 0xad, 0xd7, + 0xb2, 0x72, 0xfb, 0xab, 0x44, 0x23, 0xa8, 0x24, 0xe3, 0x48, 0x36, 0xf3, 0x8e, 0x5d, 0x56, 0xe0, + 0xd6, 0x0d, 0x10, 0x2a, 0xdd, 0x73, 0x68, 0xcc, 0xed, 0x24, 0xf9, 0x28, 0xcf, 0xb4, 0x5d, 0xda, + 0xe1, 0xa5, 0x0d, 0x7c, 0x0e, 0x8d, 0xb9, 0xe5, 0xcc, 0x15, 0xfd, 0xf2, 0x32, 0x2f, 0x8d, 0x7e, + 0x0c, 0xe5, 0xf8, 0x21, 0x20, 0x56, 0x4e, 0xc5, 0xcf, 0x88, 0xda, 0xcc, 0x0f, 0x50, 0x3c, 0x1d, + 0x43, 0x39, 0x99, 0x3f, 0x2b, 0xa7, 0x78, 0xde, 0x28, 0xd7, 0xc2, 0xac, 0xed, 0x9a, 0x3f, 0x3c, + 0xc8, 0xfd, 0x1f, 0xdd, 0xc3, 0xd3, 0xad, 0xc3, 0x4a, 0xcc, 0xcb, 0x07, 0xff, 0x07, 0x00, 0x00, + 0xff, 0xff, 0xdf, 0x73, 0xc4, 0x68, 0x08, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/v1/heimdall.proto b/api/v1/heimdall.proto index 97d0bdf..c2b0dea 100644 --- a/api/v1/heimdall.proto +++ b/api/v1/heimdall.proto @@ -25,6 +25,7 @@ message Master { string id = 1 [(gogoproto.customname) = "ID"]; string grpc_address = 2 [(gogoproto.customname) = "GRPCAddress"]; string redis_url = 3 [(gogoproto.customname) = "RedisURL"]; + string gateway_ip = 4 [(gogoproto.customname) = "GatewayIP"]; repeated Peer peers = 5; } diff --git a/go.mod b/go.mod index 8acc446..2dc38a6 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67 // indirect github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd github.com/crosbymichael/guard v0.0.0-20190716141324-5c2daadf8067 // indirect + github.com/digineo/go-ping v1.0.0 github.com/dustin/go-humanize v1.0.0 github.com/getsentry/raven-go v0.2.0 // indirect github.com/gogo/googleapis v1.3.0 diff --git a/go.sum b/go.sum index 89603fb..31810a7 100644 --- a/go.sum +++ b/go.sum @@ -19,9 +19,16 @@ github.com/crosbymichael/guard v0.0.0-20190716141324-5c2daadf8067/go.mod h1:+l2f github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/digineo/go-logwrap v0.0.0-20181106161722-a178c58ea3f0 h1:OT/LKmj81wMymnWXaKaKBR9n1vPlu+GC0VVKaZP6kzs= +github.com/digineo/go-logwrap v0.0.0-20181106161722-a178c58ea3f0/go.mod h1:DmqdumeAKGQNU5E8MN0ruT5ZGx8l/WbAsMbXCXcSEts= +github.com/digineo/go-ping v1.0.0 h1:gOuD3YzkIcW/0Y2IAe27bsMKtpfNZdoX1Rnc1RGYOSI= +github.com/digineo/go-ping v1.0.0/go.mod h1:YLDBnHoAygacawa2aubI4vXhZ4do5f62oJSvRiJVEjw= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/ehazlett/ttlcache v0.0.0-20190820213212-4400e3aef9f0/go.mod h1:D7IiYXsX2n2xixWvFTxGeZucCvvNtI14ikLj6L9Kp9E= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -61,6 +68,10 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -89,6 +100,7 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/rivo/tview v0.0.0-20181226202439-36893a669792/go.mod h1:J4W+hErFfITUbyFAEXizpmkuxX7ZN56dopxHB4XQhMw= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -115,6 +127,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= @@ -125,6 +138,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -144,9 +158,11 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/server/net.go b/server/net.go index a766069..9490d4d 100644 --- a/server/net.go +++ b/server/net.go @@ -30,6 +30,7 @@ import ( "github.com/gomodule/redigo/redis" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) type subnetRange struct { @@ -39,6 +40,7 @@ type subnetRange struct { } func (s *Server) updateNodeNetwork(ctx context.Context, id string, subnet string) error { + logrus.Debugf("updating node network: id=%s subnet=%s", id, subnet) if _, err := s.master(ctx, "SET", s.getNodeNetworkKey(id), subnet); err != nil { return err } diff --git a/server/node.go b/server/node.go index c624a35..a8243f3 100644 --- a/server/node.go +++ b/server/node.go @@ -115,12 +115,14 @@ func (s *Server) configureNode() error { continue } - // TODO: start tunnel + // start tunnel if err := s.updatePeerConfig(ctx, r.Node, r.Peers); err != nil { return err } - // TODO: wait for tunnel to come up - time.Sleep(time.Second * 20) + // wait for tunnel to come up + if err := s.waitForMaster(ctx, r.Master); err != nil { + return err + } if err := s.joinMaster(r.Master); err != nil { c.Close() @@ -128,6 +130,11 @@ func (s *Server) configureNode() error { continue } + logrus.Debug("waiting for redis sync") + if err := s.waitForRedisSync(ctx); err != nil { + return err + } + go s.replicaMonitor() return nil @@ -200,10 +207,12 @@ func (s *Server) replicaMonitor() { logrus.Error(err) continue } + logrus.Debugf("replica monitor: node=%s", n) if n == nil || n.ID != s.cfg.ID { - logrus.Debugf("waiting for new master to initialize: %s", n.ID) + logrus.Debug("waiting for new master to initialize") continue } + logrus.Debugf("replica monitor: configuring node with master %+v", n) if err := s.configureNode(); err != nil { logrus.Error(err) continue @@ -285,11 +294,13 @@ func (s *Server) joinMaster(m *v1.Master) error { func (s *Server) updateMasterInfo(ctx context.Context) error { // update master info if _, err := s.master(ctx, "SET", clusterKey, s.cfg.ClusterKey); err != nil { + logrus.Error("updateMasterInfo.setClusterKey") return err } // build redis url with gateway ip gatewayIP, _, err := s.getNodeIP(ctx, s.cfg.ID) if err != nil { + logrus.Error("updateMasterInfo.getNodeIP") return err } u, err := url.Parse(s.cfg.RedisURL) @@ -302,6 +313,7 @@ func (s *Server) updateMasterInfo(ctx context.Context) error { ID: s.cfg.ID, GRPCAddress: s.cfg.AdvertiseGRPCAddress, RedisURL: u.String(), + GatewayIP: gatewayIP.String(), } data, err := proto.Marshal(m) if err != nil { @@ -334,11 +346,11 @@ func (s *Server) updateLocalNodeInfo(ctx context.Context) error { key := s.getNodeKey(s.cfg.ID) keyPair, err := s.getOrCreateKeyPair(ctx, s.cfg.ID) if err != nil { - return err + return errors.Wrapf(err, "error getting keypair for %s", s.cfg.ID) } nodeIP, _, err := s.getNodeIP(ctx, s.cfg.ID) if err != nil { - return err + return errors.Wrapf(err, "error getting node IP for %s", s.cfg.ID) } node := &v1.Node{ Updated: time.Now(), diff --git a/server/peer.go b/server/peer.go index e57aa4d..623e1d7 100644 --- a/server/peer.go +++ b/server/peer.go @@ -234,15 +234,10 @@ func (s *Server) updatePeerConfig(ctx context.Context, node *v1.Node, peers []*v nodePeers = append(nodePeers, peer) } - keyPair, err := s.getOrCreateKeyPair(ctx, node.ID) - if err != nil { - return err - } - //size, _ := gatewayNet.Mask.Size() wireguardCfg := &wg.Config{ Iface: node.InterfaceName, - PrivateKey: keyPair.PrivateKey, + PrivateKey: node.KeyPair.PrivateKey, ListenPort: int(node.EndpointPort), Address: fmt.Sprintf("%s/%d", node.GatewayIP, 16), Peers: nodePeers, diff --git a/server/server.go b/server/server.go index 10b1d60..26f8465 100644 --- a/server/server.go +++ b/server/server.go @@ -22,15 +22,20 @@ package server import ( + "bufio" + "bytes" "context" "fmt" "io/ioutil" + "net" "net/url" "path/filepath" "runtime" "runtime/pprof" + "strings" "time" + ping "github.com/digineo/go-ping" "github.com/gogo/protobuf/proto" ptypes "github.com/gogo/protobuf/types" "github.com/gomodule/redigo/redis" @@ -137,19 +142,27 @@ func (s *Server) Run() error { return err } - logrus.Debugf("response: %+v", r) + logrus.Debugf("master info received: %+v", r) // start tunnel if err := s.updatePeerConfig(ctx, r.Node, r.Peers); err != nil { return errors.Wrap(err, "error updating peer config") } - // TODO: wait for tunnel to come up - time.Sleep(time.Second * 20) - logrus.Debugf("master info received: %+v", r) + // wait for tunnel to come up + if err := s.waitForMaster(ctx, r.Master); err != nil { + return errors.Wrap(err, "error waiting for master") + } + + logrus.Debugf("joining master: %s", r.Master.ID) if err := s.joinMaster(r.Master); err != nil { return err } + logrus.Debug("waiting for redis sync") + if err := s.waitForRedisSync(ctx); err != nil { + return err + } + go s.replicaMonitor() } else { if err := s.configureNode(); err != nil { @@ -251,6 +264,80 @@ func getPool(redisUrl string) (*redis.Pool, error) { return pool, nil } +func (s *Server) waitForMaster(ctx context.Context, m *v1.Master) error { + p, err := ping.New("0.0.0.0", "") + if err != nil { + return err + } + defer p.Close() + + doneCh := make(chan time.Duration) + errCh := make(chan error) + + go func() { + for { + ip, err := net.ResolveIPAddr("ip4", m.GatewayIP) + if err != nil { + errCh <- err + return + } + rtt, err := p.Ping(ip, time.Second*30) + if err != nil { + errCh <- err + } + doneCh <- rtt + } + }() + + select { + case rtt := <-doneCh: + logrus.Debugf("rtt master ping: %s", rtt) + return nil + case err := <-errCh: + return err + } + return nil +} + +func (s *Server) waitForRedisSync(ctx context.Context) error { + doneCh := make(chan bool) + errCh := make(chan error) + + go func() { + for { + info, err := redis.String(s.local(ctx, "INFO", "REPLICATION")) + if err != nil { + logrus.Warn(err) + continue + } + + b := bytes.NewBufferString(info) + s := bufio.NewScanner(b) + + for s.Scan() { + v := s.Text() + parts := strings.SplitN(v, ":", 2) + if parts[0] == "master_link_status" { + if parts[1] == "up" { + doneCh <- true + return + } + } + } + time.Sleep(time.Second * 1) + } + }() + + select { + case <-doneCh: + return nil + case err := <-errCh: + return err + case <-time.After(nodeHeartbeatInterval): + return fmt.Errorf("timeout waiting on sync") + } +} + func (s *Server) ensureNetworkSubnet(ctx context.Context, id string) error { network, err := redis.String(s.local(ctx, "GET", s.getNodeNetworkKey(id))) if err != nil { @@ -267,6 +354,7 @@ func (s *Server) ensureNetworkSubnet(ctx context.Context, id string) error { if err != nil { return err } + logrus.Debugf("node networks: %s", nodeNetworkKeys) lookup := map[string]struct{}{} for _, netKey := range nodeNetworkKeys { n, err := redis.String(s.local(ctx, "GET", netKey)) @@ -276,6 +364,8 @@ func (s *Server) ensureNetworkSubnet(ctx context.Context, id string) error { lookup[n] = struct{}{} } + logrus.Debugf("lookup: %+v", lookup) + subnet := r.Subnet size, _ := subnet.Mask.Size()