Skip to content

Commit

Permalink
Backporting -md5skip command line option from h2o-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalohlava authored and arnocandel committed Oct 21, 2014
1 parent 362169f commit 57a19c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/main/java/water/H2O.java
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,10 @@ private static InetAddress guessInetAddress(List<InetAddress> ips) {
// using google's DNS server as an external IP to find
// Add a timeout to the touch of google.
// https://0xdata.atlassian.net/browse/HEX-743
s = new Socket();
s = new Socket();
// only 3000 milliseconds before giving up
// Exceptions: IOException, SocketTimeoutException, plus two Illegal* exceptions
s.connect(new InetSocketAddress("8.8.8.8", 53), 3000);
s.connect(new InetSocketAddress("8.8.8.8", 53), 3000);
m+="Using " + s.getLocalAddress() + "\n";
return s.getLocalAddress();
} catch( java.net.SocketException se ) {
Expand Down Expand Up @@ -708,6 +708,7 @@ public static class OptArgs extends Arguments.Opt {
public String single_precision = null;
public String beta = null;
public String mem_watchdog = null; // For developer debugging
public boolean md5skip = false;
}

public static void printHelp() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/water/Paxos.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public abstract class Paxos {
static synchronized int doHeartbeat( H2ONode h2o ) {
// Kill somebody if the jar files mismatch. Do not attempt to deal with
// mismatched jars.
if( !h2o._heartbeat.check_jar_md5() ) {
if( !H2O.OPT_ARGS.md5skip && !h2o._heartbeat.check_jar_md5() ) {
if( H2O.CLOUD.size() > 1 ) {
Log.warn("Killing "+h2o+" because of H2O version mismatch (md5 differs).");
UDPRebooted.T.mismatch.send(h2o);
Expand Down

0 comments on commit 57a19c2

Please sign in to comment.