Repository: giraph Updated Branches: refs/heads/trunk e4b8db5d8 -> a00c4ecbb
GIRAPH-904: Giraph can hang when hostnames include uppercase letters (netj via pavanka) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/a00c4ecb Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/a00c4ecb Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/a00c4ecb Branch: refs/heads/trunk Commit: a00c4ecbb2e3e6d0bb200e8109962c5424be570a Parents: e4b8db5 Author: Pavan Kumar <[email protected]> Authored: Sun Jun 8 18:23:22 2014 -0700 Committer: Pavan Kumar <[email protected]> Committed: Sun Jun 8 18:23:22 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/conf/GiraphConfiguration.java | 2 +- giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/a00c4ecb/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index fce8fb5..bdc0c10 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-904: Giraph can hang when hostnames include uppercase letters (netj via pavanka) + GIRAPH-900: Remove timers for compute method (majakabiljo via pavanka) GIRAPH-894: make giraphconfiguration available to workercontext (pavanka) http://git-wip-us.apache.org/repos/asf/giraph/blob/a00c4ecb/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java index a32c938..d764307 100644 --- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java +++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConfiguration.java @@ -1071,7 +1071,7 @@ public class GiraphConfiguration extends Configuration public String getLocalHostname() throws UnknownHostException { return DNS.getDefaultHost( GiraphConstants.DNS_INTERFACE.get(this), - GiraphConstants.DNS_NAMESERVER.get(this)); + GiraphConstants.DNS_NAMESERVER.get(this)).toLowerCase(); } /** http://git-wip-us.apache.org/repos/asf/giraph/blob/a00c4ecb/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java b/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java index 536af0f..d593204 100644 --- a/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java +++ b/giraph-core/src/main/java/org/apache/giraph/graph/TaskInfo.java @@ -48,7 +48,7 @@ public abstract class TaskInfo implements Writable { * @return Hostname */ public String getHostname() { - return hostname; + return hostname.toLowerCase(); } /**
