1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8249812: java/net/DatagramSocket/PortUnreachable.java still fails intermittently with SocketTimeoutException

Browse Source 
Fixed the test to reenable its retry logic

Reviewed-by: alanb
This commit is contained in:
Daniel Fuchs 2020-07-23 20:25:41 +01:00
parent 6d665ed31f
commit 9f23c2c159
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/jdk/java/net/DatagramSocket/PortUnreachable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,26 +43,22 @@ public class PortUnreachable {
int serverPort;
int clientPort;
public void serverSend() {
try {
InetAddress addr = InetAddress.getLocalHost();
Thread.sleep(1000);
// send a delayed packet which should mean a delayed icmp
// port unreachable
byte b[] = "A late msg".getBytes();
DatagramPacket packet = new DatagramPacket(b, b.length, addr,
serverPort);
clientSock.send(packet);
public void serverSend() throws Exception {
InetAddress addr = InetAddress.getLocalHost();
Thread.sleep(1000);
// send a delayed packet which should mean a delayed icmp
// port unreachable
byte b[] = "A late msg".getBytes();
DatagramPacket packet = new DatagramPacket(b, b.length, addr,
serverPort);
clientSock.send(packet);
DatagramSocket sock = recreateServerSocket(serverPort);
b = "Greetings from the server".getBytes();
packet = new DatagramPacket(b, b.length, addr, clientPort);
sock.send(packet);
Thread.sleep(500); // give time to the kernel to send packet
sock.close();
} catch (Exception e) {
e.printStackTrace();
}
DatagramSocket sock = recreateServerSocket(serverPort);
b = "Greetings from the server".getBytes();
packet = new DatagramPacket(b, b.length, addr, clientPort);
sock.send(packet);
Thread.sleep(500); // give time to the kernel to send packet
sock.close();
}
DatagramSocket recreateServerSocket (int serverPort) throws Exception {
@ -180,9 +176,12 @@ public class PortUnreachable {
test.execute();
return;
} catch (BindException bEx) {
System.out.println("Failed to bind server: " + bEx);
if (++catchCount > 3) {
System.out.printf("Max retry count exceeded (%d)%n", catchCount);
throw bEx;
}
System.out.printf("Retrying; retry count: %d%n", catchCount);
}
}
}