You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/04/13 20:15:44 UTC
[1/2] flink git commit: [FLINK-9103] Using CanonicalHostName instead
of IP for SSL coonection on NettyClient
Repository: flink
Updated Branches:
refs/heads/master 635612886 -> ffb03821f
[FLINK-9103] Using CanonicalHostName instead of IP for SSL coonection on NettyClient
This closes #5789.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ffb03821
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ffb03821
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ffb03821
Branch: refs/heads/master
Commit: ffb03821ff118b0949d7d42d6b67312ee8732c2b
Parents: 7a78d00
Author: EAlexRojas <al...@gmail.com>
Authored: Thu Mar 29 16:01:24 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Apr 13 12:56:32 2018 -0700
----------------------------------------------------------------------
.../org/apache/flink/runtime/io/network/netty/NettyClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ffb03821/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java
index c845cb3..5fb083d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyClient.java
@@ -179,7 +179,7 @@ class NettyClient {
// SSL handler should be added first in the pipeline
if (clientSSLContext != null) {
SSLEngine sslEngine = clientSSLContext.createSSLEngine(
- serverSocketAddress.getAddress().getHostAddress(),
+ serverSocketAddress.getAddress().getCanonicalHostName(),
serverSocketAddress.getPort());
sslEngine.setUseClientMode(true);
[2/2] flink git commit: [hotfix] Replace nio.Path with File in
RestHandlerConfiguration
Posted by tr...@apache.org.
[hotfix] Replace nio.Path with File in RestHandlerConfiguration
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7a78d005
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7a78d005
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7a78d005
Branch: refs/heads/master
Commit: 7a78d00545ddd26d2147f58a100b1f8db689fbf3
Parents: 6356128
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Apr 13 12:53:01 2018 -0700
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Apr 13 12:56:32 2018 -0700
----------------------------------------------------------------------
.../flink/runtime/entrypoint/ClusterEntrypoint.java | 6 ++----
.../runtime/rest/handler/RestHandlerConfiguration.java | 11 +++++------
.../flink/runtime/webmonitor/WebMonitorEndpoint.java | 9 ++++-----
3 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
index b25729b..0993cb6 100755
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java
@@ -83,8 +83,6 @@ import javax.annotation.concurrent.GuardedBy;
import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;
@@ -539,9 +537,9 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler {
final Configuration resultConfiguration = new Configuration(Preconditions.checkNotNull(configuration));
final String webTmpDir = configuration.getString(WebOptions.TMP_DIR);
- final Path uniqueWebTmpDir = Paths.get(webTmpDir, "flink-web-" + UUID.randomUUID());
+ final File uniqueWebTmpDir = new File(webTmpDir, "flink-web-" + UUID.randomUUID());
- resultConfiguration.setString(WebOptions.TMP_DIR, uniqueWebTmpDir.toAbsolutePath().toString());
+ resultConfiguration.setString(WebOptions.TMP_DIR, uniqueWebTmpDir.getAbsolutePath());
return resultConfiguration;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java
index 3f6516a..336e3aa 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java
@@ -23,8 +23,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.WebOptions;
import org.apache.flink.util.Preconditions;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.File;
/**
* Configuration object containing values for the rest handler configuration.
@@ -37,13 +36,13 @@ public class RestHandlerConfiguration {
private final Time timeout;
- private final Path webUiDir;
+ private final File webUiDir;
public RestHandlerConfiguration(
long refreshInterval,
int maxCheckpointStatisticCacheEntries,
Time timeout,
- Path webUiDir) {
+ File webUiDir) {
Preconditions.checkArgument(refreshInterval > 0L, "The refresh interval (ms) should be larger than 0.");
this.refreshInterval = refreshInterval;
@@ -65,7 +64,7 @@ public class RestHandlerConfiguration {
return timeout;
}
- public Path getWebUiDir() {
+ public File getWebUiDir() {
return webUiDir;
}
@@ -77,7 +76,7 @@ public class RestHandlerConfiguration {
final Time timeout = Time.milliseconds(configuration.getLong(WebOptions.TIMEOUT));
final String rootDir = "flink-web-ui";
- final Path webUiDir = Paths.get(configuration.getString(WebOptions.TMP_DIR), rootDir);
+ final File webUiDir = new File(configuration.getString(WebOptions.TMP_DIR), rootDir);
return new RestHandlerConfiguration(
refreshInterval,
http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
index af346a7..7e552de 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java
@@ -130,7 +130,6 @@ import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -516,7 +515,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
timeout,
responseHeaders);
- final Path webUiDir = restConfiguration.getWebUiDir();
+ final File webUiDir = restConfiguration.getWebUiDir();
Optional<StaticFileServerHandler<T>> optWebContent;
@@ -525,7 +524,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
leaderRetriever,
restAddressFuture,
timeout,
- webUiDir.toFile());
+ webUiDir);
} catch (IOException e) {
log.warn("Could not load web content handler.", e);
optWebContent = Optional.empty();
@@ -655,7 +654,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
final CompletableFuture<Void> shutdownFuture = super.shutDownInternal();
- final Path webUiDir = restConfiguration.getWebUiDir();
+ final File webUiDir = restConfiguration.getWebUiDir();
return FutureUtils.runAfterwardsAsync(
shutdownFuture,
@@ -663,7 +662,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp
Exception exception = null;
try {
log.info("Removing cache directory {}", webUiDir);
- FileUtils.deleteDirectory(webUiDir.toFile());
+ FileUtils.deleteDirectory(webUiDir);
} catch (Exception e) {
exception = e;
}