asfgit closed pull request #6522: [FLINK-10101][mesos] Add web ui url for mesos.
URL: https://github.com/apache/flink/pull/6522
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 d9876ec270c..38b61d86679 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 @@ protected void initializeServices(Configuration config)
throws Exception {
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 3213f65be48..70369f61f2a 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 @@ protected void initializeServices(Configuration config)
throws Exception {
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 6fc5322ff6c..f18d0d8cfc7 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 @@
/** 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 MesosResourceManager(
MesosServices mesosServices,
MesosConfiguration mesosConfig,
MesosTaskManagerParameters taskManagerParameters,
- ContainerSpecification taskManagerContainerSpec) {
+ ContainerSpecification taskManagerContainerSpec,
+ @Nullable String webUiUrl) {
super(
rpcService,
resourceManagerEndpointId,
@@ -181,6 +186,7 @@ public MesosResourceManager(
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 @@ protected void initialize() throws
ResourceManagerException {
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 171e4087ddc..e21f0fc3374 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 TestingMesosResourceManager(
mesosServices,
mesosConfig,
taskManagerParameters,
- taskManagerContainerSpec);
+ taskManagerContainerSpec,
+ null);
}
@Override
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
