You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by bg...@apache.org on 2017/09/02 13:55:38 UTC
reef git commit: [REEF-1879] Downgrade netty dependency to
4.0.23.Final
Repository: reef
Updated Branches:
refs/heads/master b8cecb612 -> e0634a48d
[REEF-1879] Downgrade netty dependency to 4.0.23.Final
This addressed the issue by
* downgrading REEF to use Netty 4.0.23.Final for Hadoop compatibility
* updating NameLookupClient to throw NamingException on replyQueue.poll timeout instead of NullPointerException
JIRA:
[REEF-1879](https://issues.apache.org/jira/browse/REEF-1879)
Pull request:
This closes #1373
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/e0634a48
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/e0634a48
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/e0634a48
Branch: refs/heads/master
Commit: e0634a48d501c7cde124e90cc0e54573fdbfa89a
Parents: b8cecb6
Author: JangHo Seo <ja...@jangho.kr>
Authored: Sat Sep 2 16:28:05 2017 +0900
Committer: Byung-Gon Chun <bg...@apache.org>
Committed: Sat Sep 2 22:49:53 2017 +0900
----------------------------------------------------------------------
.../common/driver/evaluator/EvaluatorManagerFactory.java | 2 +-
.../org/apache/reef/io/network/naming/NameLookupClient.java | 4 +++-
.../wake/remote/transport/netty/ChunkedReadWriteHandler.java | 8 ++++----
.../wake/remote/transport/netty/NettyMessagingTransport.java | 2 +-
pom.xml | 2 +-
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/e0634a48/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java
index bd3d691..0e10680 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java
@@ -61,7 +61,7 @@ public final class EvaluatorManagerFactory {
if (nodeDescriptor == null) {
final String nodeId = resourceEvent.getNodeId();
- LOG.log(Level.WARNING, "Node {} is not in our catalog, adding it", nodeId);
+ LOG.log(Level.WARNING, "Node {0} is not in our catalog, adding it", nodeId);
final String[] hostNameAndPort = nodeId.split(":");
Validate.isTrue(hostNameAndPort.length == 2);
final NodeDescriptorEvent nodeDescriptorEvent = NodeDescriptorEventImpl.newBuilder().setIdentifier(nodeId)
http://git-wip-us.apache.org/repos/asf/reef/blob/e0634a48/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java
index 327b9d6..d5bf71a 100644
--- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java
+++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/naming/NameLookupClient.java
@@ -49,6 +49,7 @@ import javax.inject.Inject;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
@@ -206,7 +207,8 @@ public final class NameLookupClient implements Stage, NamingLookup {
}
}
- final List<NameAssignment> list = resp.getNameAssignments();
+ final List<NameAssignment> list = resp == null ? Collections.<NameAssignment>emptyList()
+ : resp.getNameAssignments();
if (list.isEmpty()) {
throw new NamingException("Cannot find " + id + " from the name server");
} else {
http://git-wip-us.apache.org/repos/asf/reef/blob/e0634a48/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java
index e27de5d..bee3374 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java
@@ -147,9 +147,9 @@ public class ChunkedReadWriteHandler extends ChunkedWriteHandler {
*/
private byte[] sizeAsByteArr(final int size) {
final byte[] ret = new byte[INT_SIZE];
- final ByteBuf intBuffer = Unpooled.wrappedBuffer(ret);
+ final ByteBuf intBuffer = Unpooled.wrappedBuffer(ret).order(Unpooled.LITTLE_ENDIAN);
intBuffer.clear();
- intBuffer.writeIntLE(size);
+ intBuffer.writeInt(size);
intBuffer.release();
return ret;
}
@@ -170,8 +170,8 @@ public class ChunkedReadWriteHandler extends ChunkedWriteHandler {
return 0;
}
- final ByteBuf intBuffer = Unpooled.wrappedBuffer(data, offset, INT_SIZE);
- final int ret = intBuffer.readIntLE();
+ final ByteBuf intBuffer = Unpooled.wrappedBuffer(data, offset, INT_SIZE).order(Unpooled.LITTLE_ENDIAN);
+ final int ret = intBuffer.readInt();
intBuffer.release();
return ret;
http://git-wip-us.apache.org/repos/asf/reef/blob/e0634a48/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java
index 08ab08f..2643030 100644
--- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java
+++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java
@@ -320,7 +320,7 @@ public final class NettyMessagingTransport implements Transport {
}
break;
} catch (final Exception e) {
- if (e.getClass().getSimpleName().compareTo("AnnotatedConnectException") == 0) {
+ if (e.getClass().getSimpleName().compareTo("ConnectException") == 0) {
LOG.log(Level.WARNING, "Connection refused. Retry {0} of {1}",
new Object[]{i + 1, this.numberOfTries});
synchronized (flag) {
http://git-wip-us.apache.org/repos/asf/reef/blob/e0634a48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b7870c..6633316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -703,7 +703,7 @@ under the License.
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.15.Final</version>
+ <version>4.0.23.Final</version>
</dependency>
<dependency>