This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.6 by this push:
new 4aa5d7f [FLINK-10101][mesos] Announce web UI url at Mesos master
4aa5d7f is described below
commit 4aa5d7ffd0508f5709951bbeffa60347c8a960b3
Author: liurenjie1024 <[email protected]>
AuthorDate: Wed Aug 8 07:24:36 2018 +0800
[FLINK-10101][mesos] Announce web UI url at Mesos master
This commit announces the cluster's web UI url at the Mesos master so that
it
is visible in the Mesos UI.
This closes #6522.
---
.../flink/mesos/entrypoint/MesosJobClusterEntrypoint.java | 4 ++--
.../mesos/entrypoint/MesosSessionClusterEntrypoint.java | 4 ++--
.../mesos/runtime/clusterframework/MesosResourceManager.java | 12 +++++++++++-
.../runtime/clusterframework/MesosResourceManagerTest.java | 3 ++-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
index cf661cb..a1eea57 100755
---
a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
+++
b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosJobClusterEntrypoint.java
@@ -148,8 +148,8 @@ public class MesosJobClusterEntrypoint extends
JobClusterEntrypoint {
mesosServices,
schedulerConfiguration,
taskManagerParameters,
- taskManagerContainerSpec
- );
+ taskManagerContainerSpec,
+ webInterfaceUrl);
}
@Override
diff --git
a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
index 5dea936..88047a3 100755
---
a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
+++
b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosSessionClusterEntrypoint.java
@@ -138,8 +138,8 @@ public class MesosSessionClusterEntrypoint extends
SessionClusterEntrypoint {
mesosServices,
mesosConfig,
taskManagerParameters,
- taskManagerContainerSpec
- );
+ taskManagerContainerSpec,
+ webInterfaceUrl);
}
@Override
diff --git
a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
index 776f016..67aabeb 100644
---
a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
+++
b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManager.java
@@ -121,6 +121,10 @@ public class MesosResourceManager extends
ResourceManager<RegisteredMesosWorkerN
/** A local actor system for using the helper actors. */
private final ActorSystem actorSystem;
+ /** Web url to show in mesos page. */
+ @Nullable
+ private final String webUiUrl;
+
/** Mesos scheduler driver. */
private SchedulerDriver schedulerDriver;
@@ -160,7 +164,8 @@ public class MesosResourceManager extends
ResourceManager<RegisteredMesosWorkerN
MesosServices mesosServices,
MesosConfiguration mesosConfig,
MesosTaskManagerParameters taskManagerParameters,
- ContainerSpecification taskManagerContainerSpec) {
+ ContainerSpecification taskManagerContainerSpec,
+ @Nullable String webUiUrl) {
super(
rpcService,
resourceManagerEndpointId,
@@ -184,6 +189,7 @@ public class MesosResourceManager extends
ResourceManager<RegisteredMesosWorkerN
this.taskManagerParameters =
Preconditions.checkNotNull(taskManagerParameters);
this.taskManagerContainerSpec =
Preconditions.checkNotNull(taskManagerContainerSpec);
+ this.webUiUrl = webUiUrl;
this.workersInNew = new HashMap<>(8);
this.workersInLaunch = new HashMap<>(8);
@@ -240,6 +246,10 @@ public class MesosResourceManager extends
ResourceManager<RegisteredMesosWorkerN
Protos.FrameworkInfo.Builder frameworkInfo =
mesosConfig.frameworkInfo()
.clone()
.setCheckpoint(true);
+ if (webUiUrl != null) {
+ frameworkInfo.setWebuiUrl(webUiUrl);
+ }
+
try {
Option<Protos.FrameworkID> frameworkID =
workerStore.getFrameworkID();
if (frameworkID.isEmpty()) {
diff --git
a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
index 9f4fc26..5575137 100644
---
a/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
+++
b/flink-mesos/src/test/java/org/apache/flink/mesos/runtime/clusterframework/MesosResourceManagerTest.java
@@ -191,7 +191,8 @@ public class MesosResourceManagerTest extends TestLogger {
mesosServices,
mesosConfig,
taskManagerParameters,
- taskManagerContainerSpec);
+ taskManagerContainerSpec,
+ null);
}
@Override
