You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hs...@apache.org on 2015/03/31 01:40:51 UTC
flink git commit: Small clenaup to wrap very long lines in
flink-runtime package.
Repository: flink
Updated Branches:
refs/heads/master ee273dbe0 -> 121a5a0c7
Small clenaup to wrap very long lines in flink-runtime package.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/121a5a0c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/121a5a0c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/121a5a0c
Branch: refs/heads/master
Commit: 121a5a0c7e982e0c89f682eca6f7ac175eb195eb
Parents: ee273db
Author: Henry Saputra <he...@gmail.com>
Authored: Mon Mar 30 16:40:27 2015 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Mon Mar 30 16:40:27 2015 -0700
----------------------------------------------------------------------
.../flink/runtime/io/network/NetworkEnvironment.java | 4 +++-
.../runtime/io/network/netty/NettyConnectionManager.java | 10 ++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/121a5a0c/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java
index faba252..d490784 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/NetworkEnvironment.java
@@ -354,7 +354,9 @@ public class NetworkEnvironment {
public boolean hasReleasedAllResources() {
String msg = String.format("Network buffer pool: %d missing memory segments. %d registered buffer pools. Connection manager: %d active connections. Task event dispatcher: %d registered writers.",
- networkBufferPool.getTotalNumberOfMemorySegments() - networkBufferPool.getNumberOfAvailableMemorySegments(), networkBufferPool.getNumberOfRegisteredBufferPools(), connectionManager.getNumberOfActiveConnections(), taskEventDispatcher.getNumberOfRegisteredWriters());
+ networkBufferPool.getTotalNumberOfMemorySegments() - networkBufferPool.getNumberOfAvailableMemorySegments(),
+ networkBufferPool.getNumberOfRegisteredBufferPools(), connectionManager.getNumberOfActiveConnections(),
+ taskEventDispatcher.getNumberOfRegisteredWriters());
boolean success = networkBufferPool.getTotalNumberOfMemorySegments() == networkBufferPool.getNumberOfAvailableMemorySegments() &&
networkBufferPool.getNumberOfRegisteredBufferPools() == 0 &&
http://git-wip-us.apache.org/repos/asf/flink/blob/121a5a0c/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
index c097098..0b66b2c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyConnectionManager.java
@@ -42,15 +42,18 @@ public class NettyConnectionManager implements ConnectionManager {
}
@Override
- public void start(ResultPartitionProvider partitionProvider, TaskEventDispatcher taskEventDispatcher, NetworkBufferPool networkbufferPool) throws IOException {
- PartitionRequestProtocol partitionRequestProtocol = new PartitionRequestProtocol(partitionProvider, taskEventDispatcher, networkbufferPool);
+ public void start(ResultPartitionProvider partitionProvider, TaskEventDispatcher taskEventDispatcher, NetworkBufferPool networkbufferPool)
+ throws IOException {
+ PartitionRequestProtocol partitionRequestProtocol =
+ new PartitionRequestProtocol(partitionProvider, taskEventDispatcher, networkbufferPool);
client.init(partitionRequestProtocol);
server.init(partitionRequestProtocol);
}
@Override
- public PartitionRequestClient createPartitionRequestClient(ConnectionID connectionId) throws IOException, InterruptedException {
+ public PartitionRequestClient createPartitionRequestClient(ConnectionID connectionId)
+ throws IOException, InterruptedException {
return partitionRequestClientFactory.createPartitionRequestClient(connectionId);
}
@@ -70,4 +73,3 @@ public class NettyConnectionManager implements ConnectionManager {
server.shutdown();
}
}
-