Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement] Support SessionController and JobController obtaining cluster through deployment mode #484

Merged
merged 2 commits into from
Jul 9, 2024
Merged

[Improvement] Support SessionController and JobController obtaining cluster through deployment mode #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d90734e
commit.
Jul 9, 2024
b76b5d5
commit.
Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions paimon-web-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ under the License.
<properties>
<hadoop.version>2.8.5</hadoop.version>
<flink.version>1.18.1</flink.version>
<scala.version>2.12</scala.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -247,6 +248,13 @@ under the License.
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.version}</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions ...n-web-server/src/main/java/org/apache/paimon/web/server/controller/SessionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.paimon.web.server.controller;

import org.apache.paimon.web.gateway.enums.DeploymentMode;
import org.apache.paimon.web.server.data.dto.SessionDTO;
import org.apache.paimon.web.server.data.model.ClusterInfo;
import org.apache.paimon.web.server.data.result.R;
Expand Down Expand Up @@ -59,7 +60,7 @@ public R<Void> createSession() {
}
int uid = StpUtil.getLoginIdAsInt();
QueryWrapper<ClusterInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "Flink");
queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType());
List<ClusterInfo> clusterInfos = clusterService.list(queryWrapper);
for (ClusterInfo cluster : clusterInfos) {
SessionDTO sessionDTO = new SessionDTO();
Expand All @@ -85,7 +86,7 @@ public R<Void> dropSession() {
}
int uid = StpUtil.getLoginIdAsInt();
QueryWrapper<ClusterInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "Flink");
queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType());
List<ClusterInfo> clusterInfos = clusterService.list(queryWrapper);
for (ClusterInfo cluster : clusterInfos) {
SessionDTO sessionDTO = new SessionDTO();
Expand Down
5 changes: 3 additions & 2 deletions ...on-web-server/src/main/java/org/apache/paimon/web/server/service/impl/JobServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.paimon.web.engine.flink.common.status.JobStatus;
import org.apache.paimon.web.engine.flink.sql.gateway.model.SessionEntity;
import org.apache.paimon.web.gateway.config.ExecutionConfig;
import org.apache.paimon.web.gateway.enums.DeploymentMode;
import org.apache.paimon.web.gateway.enums.EngineType;
import org.apache.paimon.web.gateway.provider.ExecutorFactoryProvider;
import org.apache.paimon.web.server.context.LogContextHolder;
Expand Down Expand Up @@ -302,8 +303,8 @@ public void refreshJobStatus(String taskType) {

if (taskType.equals("Flink")) {
QueryWrapper<ClusterInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "Flink");
List<ClusterInfo> clusters = clusterService.list();
queryWrapper.eq("deployment_mode", DeploymentMode.FLINK_SQL_GATEWAY.getType());
List<ClusterInfo> clusters = clusterService.list(queryWrapper);
for (ClusterInfo cluster : clusters) {
try {
SessionEntity session =
Expand Down
1 change: 1 addition & 0 deletions ...n-web-server/src/test/java/org/apache/paimon/web/server/controller/JobControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public void before() throws Exception {
.port(port)
.enabled(true)
.type("Flink")
.deploymentMode("flink-sql-gateway")
.build();
boolean res = clusterService.save(cluster);
assertTrue(res);
Expand Down
1 change: 1 addition & 0 deletions ...b-server/src/test/java/org/apache/paimon/web/server/controller/SessionControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public void testCreateSession() throws Exception {
.port(port)
.enabled(true)
.type("Flink")
.deploymentMode("flink-sql-gateway")
.build();
boolean res = clusterService.save(cluster);
assertTrue(res);
Expand Down
Loading