integration: use only digits in unix ports #7106
Conversation
| @@ -39,7 +39,7 @@ type bridge struct { | |||
|
|
|||
| func newBridge(addr string) (*bridge, error) { | |||
| b := &bridge{ | |||
| inaddr: addr + ".bridge", | |||
| inaddr: addr + "0", | |||
There was a problem hiding this comment.
Can this do something with the address like "bridge-" + addr? The 0 seems like it could conflict with other addresses (e.g., c+basePort = 50, pid=50 => ":100"; c+basePort=5, pid=5, bridge => ":100") . Or will that cause cert name conflicts?
| @@ -510,7 +510,7 @@ func mustNewMember(t *testing.T, mcfg memberConfig) *member { | |||
| // listenGRPC starts a grpc server over a unix domain socket on the member | |||
| func (m *member) listenGRPC() error { | |||
| // prefix with localhost so cert has right domain | |||
| m.grpcAddr = "localhost:" + m.Name + ".sock" | |||
| m.grpcAddr = "localhost:" + m.Name + "0" | |||
There was a problem hiding this comment.
can probably drop the "0" entirely?
| @@ -420,7 +420,7 @@ func isMembersEqual(membs []client.Member, wmembs []client.Member) bool { | |||
|
|
|||
| func newLocalListener(t *testing.T) net.Listener { | |||
| c := atomic.AddInt64(&localListenCount, 1) | |||
| addr := fmt.Sprintf("127.0.0.1:%d.%d.sock", c+basePort, os.Getpid()) | |||
| addr := fmt.Sprintf("127.0.0.1:%d%d", c+basePort, os.Getpid()) | |||
There was a problem hiding this comment.
can these be 0-padded? otherwise there can be collisions given the right port/pid
|
does embed_test.go need to updated too? |
gyuho
force-pushed
the
go1.8
branch
3 times, most recently
from
739cf09 to
0473fb3
Compare
|
@heyitsanthony All fixed.
PTAL. Thanks. |
| @@ -39,7 +40,7 @@ type bridge struct { | |||
|
|
|||
| func newBridge(addr string) (*bridge, error) { | |||
| b := &bridge{ | |||
| inaddr: addr + ".bridge", | |||
| inaddr: fmt.Sprint(addr, rand.Intn(30000)), | |||
There was a problem hiding this comment.
This doesn't help with still collisions:
port=1, pid=1, rand=10 => 1 000001 10
port=10, pid=11, rand=0 => 10 000011 0
I think the 0 is better since it's not introducing more changing parts. Needs some commenting about the schema needing port numbers, though:
// bridge "port" is ("%05d%05d0", port, pid) since go1.8 expects the port to be a number
| @@ -420,7 +420,7 @@ func isMembersEqual(membs []client.Member, wmembs []client.Member) bool { | |||
|
|
|||
| func newLocalListener(t *testing.T) net.Listener { | |||
| c := atomic.AddInt64(&localListenCount, 1) | |||
| addr := fmt.Sprintf("127.0.0.1:%d.%d.sock", c+basePort, os.Getpid()) | |||
| addr := fmt.Sprintf("127.0.0.1:%d%06d", c+basePort, os.Getpid()) | |||
There was a problem hiding this comment.
%05d%05d so that nested bridges won't collide and comment about 1.8 requiring numbers in ports?
|
lgtm |
Fix #6959.
Otherwise Travis keeps failing.