This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 8ba2626 [FLINK-10101][mesos] Announce web UI url at Mesos master
8ba2626 is described below
commit 8ba26261158e690e2476d71e8b99ee0a0a5faafa
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 d9876ec..38b61d8 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
@@ -145,8 +145,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 3213f65..70369f6 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
@@ -135,8 +135,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 6fc5322..f18d0d8 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
@@ -120,6 +120,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;
@@ -158,7 +162,8 @@ public class MesosResourceManager extends
ResourceManager<RegisteredMesosWorkerN
MesosServices mesosServices,
MesosConfiguration mesosConfig,
MesosTaskManagerParameters taskManagerParameters,
- ContainerSpecification taskManagerContainerSpec) {
+ ContainerSpecification taskManagerContainerSpec,
+ @Nullable String webUiUrl) {
super(
rpcService,
resourceManagerEndpointId,
@@ -181,6 +186,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);
@@ -237,6 +243,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 171e408..e21f0fc 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
@@ -188,7 +188,8 @@ public class MesosResourceManagerTest extends TestLogger {
mesosServices,
mesosConfig,
taskManagerParameters,
- taskManagerContainerSpec);
+ taskManagerContainerSpec,
+ null);
}
@Override
