Skip to content

Commit 57a19c2

Browse files
mmalohlavaarnocandel
authored andcommitted
Backporting -md5skip command line option from h2o-dev
1 parent 362169f commit 57a19c2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/java/water/H2O.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,10 @@ private static InetAddress guessInetAddress(List<InetAddress> ips) {
418418
// using google's DNS server as an external IP to find
419419
// Add a timeout to the touch of google.
420420
// https://0xdata.atlassian.net/browse/HEX-743
421-
s = new Socket();
421+
s = new Socket();
422422
// only 3000 milliseconds before giving up
423423
// Exceptions: IOException, SocketTimeoutException, plus two Illegal* exceptions
424-
s.connect(new InetSocketAddress("8.8.8.8", 53), 3000);
424+
s.connect(new InetSocketAddress("8.8.8.8", 53), 3000);
425425
m+="Using " + s.getLocalAddress() + "\n";
426426
return s.getLocalAddress();
427427
} catch( java.net.SocketException se ) {
@@ -708,6 +708,7 @@ public static class OptArgs extends Arguments.Opt {
708708
public String single_precision = null;
709709
public String beta = null;
710710
public String mem_watchdog = null; // For developer debugging
711+
public boolean md5skip = false;
711712
}
712713

713714
public static void printHelp() {

src/main/java/water/Paxos.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public abstract class Paxos {
3939
static synchronized int doHeartbeat( H2ONode h2o ) {
4040
// Kill somebody if the jar files mismatch. Do not attempt to deal with
4141
// mismatched jars.
42-
if( !h2o._heartbeat.check_jar_md5() ) {
42+
if( !H2O.OPT_ARGS.md5skip && !h2o._heartbeat.check_jar_md5() ) {
4343
if( H2O.CLOUD.size() > 1 ) {
4444
Log.warn("Killing "+h2o+" because of H2O version mismatch (md5 differs).");
4545
UDPRebooted.T.mismatch.send(h2o);

0 commit comments

Comments
 (0)