Author: nextgens
Date: 2006-06-02 12:17:04 +0000 (Fri, 02 Jun 2006)
New Revision: 8981
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/Version.java
Log:
471:
We get rid of the workaround for NPTL, and we hope that the watchdog will cope
with the problem
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-06-02 11:30:51 UTC (rev
8980)
+++ trunk/freenet/src/freenet/node/Node.java 2006-06-02 12:17:04 UTC (rev
8981)
@@ -1468,9 +1468,12 @@
Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM version:
"+jvmVersion+", OS name: "+osName+", OS version: "+osVersion);
+ // If we are using the wrapper, we ignore:
+ // Any problem should be detected by the watchdog and the node
will be restarted
if(osName.equals("Linux") && jvmVendor.startsWith("Sun ") &&
(osVersion.indexOf("nptl")!=-1 ||
osVersion.startsWith("2.6") ||
- osVersion.startsWith("2.7") ||
osVersion.startsWith("3."))) {
+ osVersion.startsWith("2.7") ||
osVersion.startsWith("3."))
+ && !isUsingWrapper()) {
// Hopefully we won't still have to deal with this ****
when THAT comes out!
// Check the environment.
String assumeKernel;
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2006-06-02 11:30:51 UTC
(rev 8980)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2006-06-02 12:17:04 UTC
(rev 8981)
@@ -61,12 +61,21 @@
if(diff > 3*60*1000) {
System.err.println("Restarting node:
PacketSender froze for 3 minutes! ("+diff+")");
Logger.error(this, "Restarting node:
PacketSender froze for 3 minutes! ("+diff+")");
+
try {
-
WrapperManager.requestThreadDump();
+ if(node.isUsingWrapper()){
+
WrapperManager.requestThreadDump();
+
WrapperManager.restart();
+ }else{
+ // No wrapper : we
don't want to let it harm the network!
+
Logger.error(this,"Error : can't restart the node : consider installing the
wrapper. PLEASE REPORT THAT ERROR TO devl at freenetproject.org");
+ node.exit();
+ }
} catch (Throwable t) {
- // Ignore
+ Logger.error(this,"Error :
can't restart the node : consider installing the wrapper. PLEASE REPORT THAT
ERROR TO devl at freenetproject.org");
+ node.exit();
}
- WrapperManager.restart();
+
}
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-02 11:30:51 UTC (rev
8980)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-02 12:17:04 UTC (rev
8981)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 770;
+ private static final int buildNumber = 771;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 765;
