You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2018/05/16 14:41:09 UTC
[1/2] flink git commit: Revert "[FLINK-8286] Fix Kerberos integration
for FLIP-6 YarnTaskExecutorRunner"
Repository: flink
Updated Branches:
refs/heads/release-1.5 4365dcb0a -> 7fb94fb34
Revert "[FLINK-8286] Fix Kerberos integration for FLIP-6 YarnTaskExecutorRunner"
This reverts commit 93d1c47a14ab500b07331b2c415c86973fbeca29.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/01811317
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/01811317
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/01811317
Branch: refs/heads/release-1.5
Commit: 01811317d709ad54f1e0c105d5e3e6e36f85d24d
Parents: 4365dcb
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed May 16 15:53:18 2018 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed May 16 15:53:18 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/01811317/flink-yarn/src/main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java
index 94cd5a9..0c676e7 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnTaskExecutorRunner.java
@@ -125,13 +125,13 @@ public class YarnTaskExecutorRunner {
LOG.info("YARN daemon is running as: {} Yarn client user obtainer: {}",
currentUser.getShortUserName(), yarnClientUsername);
+ SecurityConfiguration sc = new SecurityConfiguration(configuration);
+
if (keytabPath != null && remoteKeytabPrincipal != null) {
configuration.setString(SecurityOptions.KERBEROS_LOGIN_KEYTAB, keytabPath);
configuration.setString(SecurityOptions.KERBEROS_LOGIN_PRINCIPAL, remoteKeytabPrincipal);
}
- SecurityConfiguration sc = new SecurityConfiguration(configuration);
-
final String containerId = ENV.get(YarnFlinkResourceManager.ENV_FLINK_CONTAINER_ID);
Preconditions.checkArgument(containerId != null,
"ContainerId variable %s not set", YarnFlinkResourceManager.ENV_FLINK_CONTAINER_ID);
[2/2] flink git commit: [hotfix][test-scripts] Properly wait for
cluster to be up in common.sh
Posted by al...@apache.org.
[hotfix][test-scripts] Properly wait for cluster to be up in common.sh
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7fb94fb3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7fb94fb3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7fb94fb3
Branch: refs/heads/release-1.5
Commit: 7fb94fb345fd6a8d414162e61a000ac8101d81b5
Parents: 0181131
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed May 16 16:39:15 2018 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed May 16 16:40:36 2018 +0200
----------------------------------------------------------------------
flink-end-to-end-tests/test-scripts/common.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7fb94fb3/flink-end-to-end-tests/test-scripts/common.sh
----------------------------------------------------------------------
diff --git a/flink-end-to-end-tests/test-scripts/common.sh b/flink-end-to-end-tests/test-scripts/common.sh
index b4e38a2..b2a09d0 100644
--- a/flink-end-to-end-tests/test-scripts/common.sh
+++ b/flink-end-to-end-tests/test-scripts/common.sh
@@ -157,9 +157,9 @@ function start_cluster {
# without the || true this would exit our script if the JobManager is not yet up
QUERY_RESULT=$(curl "http://localhost:8081/taskmanagers" 2> /dev/null || true)
- if [[ "$QUERY_RESULT" == "" ]]; then
- echo "Dispatcher/TaskManagers are not yet up"
- elif [[ "$QUERY_RESULT" != "{\"taskmanagers\":[]}" ]]; then
+ # ensure the taskmanagers field is there at all and is not empty
+ if [[ ${QUERY_RESULT} =~ \{\"taskmanagers\":\[.+\]\} ]]; then
+
echo "Dispatcher REST endpoint is up."
break
fi