This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch package in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 41b6541a68d09a2203966a00dbd4496b606dbdfa Merge: 2bf7e34b8 093a57dd5 Author: benjobs <[email protected]> AuthorDate: Mon Sep 25 08:42:51 2023 +0800 Merge branch 'dev' of github.com:apache/incubator-streampark into package dist-material/release-docs/LICENSE | 1 + streampark-common/pom.xml | 7 - ...elopmentMode.java => FlinkDevelopmentMode.java} | 12 +- ...{ExecutionMode.java => FlinkExecutionMode.java} | 32 ++-- .../{RestoreMode.java => FlinkRestoreMode.java} | 17 +- .../apache/streampark/common/enums/ApiType.scala | 2 +- .../streampark/common/enums/PlannerType.scala | 2 +- .../apache/streampark/common/enums/TableMode.scala | 2 +- .../apache/streampark/common/util/FileUtils.scala | 20 --- .../streampark-console-service/pom.xml | 7 + .../interceptor/UploadFileTypeInterceptor.java | 35 +++- .../streampark/console/base/util/GitUtils.java | 6 +- .../console/core/annotation/AppUpdated.java | 6 +- .../console/core/annotation/PermissionAction.java | 4 +- .../{StreamParkAspect.java => ConsoleAspect.java} | 14 +- .../console/core/bean/AlertProbeMsg.java | 4 +- .../console/core/bean/AlertTemplate.java | 20 +-- .../core/component/FlinkCheckpointProcessor.java | 22 +-- .../ApplicationBuildPipelineController.java | 8 +- .../core/controller/ApplicationController.java | 28 ++-- .../controller/ApplicationHistoryController.java | 4 +- .../console/core/controller/MessageController.java | 6 +- .../console/core/controller/ProjectController.java | 4 +- .../console/core/entity/AppBuildPipeline.java | 30 ++-- .../console/core/entity/Application.java | 68 ++++---- .../console/core/entity/ApplicationBackUp.java | 4 +- .../console/core/entity/ApplicationConfig.java | 4 +- .../streampark/console/core/entity/Effective.java | 6 +- .../console/core/entity/FlinkCluster.java | 8 +- .../streampark/console/core/entity/Message.java | 7 +- .../streampark/console/core/entity/Project.java | 12 +- .../streampark/console/core/entity/Resource.java | 8 +- ...ssTokenState.java => AccessTokenStateEnum.java} | 4 +- .../enums/{AlertType.java => AlertTypeEnum.java} | 26 +-- ...AppExistsState.java => AppExistsStateEnum.java} | 4 +- .../enums/{BuildState.java => BuildStateEnum.java} | 6 +- .../{CandidateType.java => CandidateTypeEnum.java} | 6 +- ...kPointStatus.java => CheckPointStatusEnum.java} | 6 +- ...CheckPointType.java => CheckPointTypeEnum.java} | 6 +- ...ConfigFileType.java => ConfigFileTypeEnum.java} | 6 +- .../{EffectiveType.java => EffectiveTypeEnum.java} | 4 +- .../enums/{EngineType.java => EngineTypeEnum.java} | 6 +- ...overStrategy.java => FailoverStrategyEnum.java} | 6 +- .../{FlinkAppState.java => FlinkAppStateEnum.java} | 46 +++--- ...rizedError.java => GitAuthorizedErrorEnum.java} | 8 +- .../{GitCredential.java => GitCredentialEnum.java} | 8 +- .../enums/{LoginType.java => LoginTypeEnum.java} | 8 +- .../enums/{NoticeType.java => NoticeTypeEnum.java} | 6 +- .../enums/{Operation.java => OperationEnum.java} | 6 +- .../{OptionState.java => OptionStateEnum.java} | 6 +- ...PermissionType.java => PermissionTypeEnum.java} | 6 +- ...aceholderType.java => PlaceholderTypeEnum.java} | 4 +- .../{ReleaseState.java => ReleaseStateEnum.java} | 6 +- .../{ResourceFrom.java => ResourceFromEnum.java} | 6 +- .../{ResourceType.java => ResourceTypeEnum.java} | 6 +- .../enums/{StopFrom.java => StopFromEnum.java} | 2 +- .../enums/{UserType.java => UserTypeEnum.java} | 6 +- .../console/core/metrics/flink/CheckPoints.java | 16 +- .../console/core/service/AppBuildPipeService.java | 4 +- .../console/core/service/EffectiveService.java | 8 +- .../console/core/service/FlinkClusterService.java | 4 +- .../console/core/service/FlinkSqlService.java | 6 +- .../console/core/service/MessageService.java | 4 +- .../console/core/service/YarnQueueService.java | 4 +- .../core/service/alert/impl/AlertServiceImpl.java | 12 +- .../application/ApplicationInfoService.java | 4 +- .../application/ApplicationManageService.java | 6 +- .../impl/ApplicationActionServiceImpl.java | 105 ++++++------ .../impl/ApplicationInfoServiceImpl.java | 48 +++--- .../impl/ApplicationManageServiceImpl.java | 92 ++++++----- .../core/service/impl/AppBuildPipeServiceImpl.java | 60 +++---- .../service/impl/ApplicationBackUpServiceImpl.java | 15 +- .../service/impl/ApplicationConfigServiceImpl.java | 12 +- .../core/service/impl/EffectiveServiceImpl.java | 12 +- .../core/service/impl/ExternalLinkServiceImpl.java | 8 +- .../core/service/impl/FlinkClusterServiceImpl.java | 45 +++--- .../core/service/impl/FlinkSqlServiceImpl.java | 26 +-- .../core/service/impl/MessageServiceImpl.java | 6 +- .../core/service/impl/ProjectServiceImpl.java | 26 +-- .../core/service/impl/ResourceServiceImpl.java | 10 +- .../core/service/impl/SavePointServiceImpl.java | 31 ++-- .../core/service/impl/SqlWorkBenchServiceImpl.java | 20 +-- .../core/service/impl/VariableServiceImpl.java | 4 +- .../core/service/impl/YarnQueueServiceImpl.java | 14 +- .../console/core/task/ProjectBuildTask.java | 22 +-- .../console/core/watcher/FlinkAppHttpWatcher.java | 177 +++++++++++---------- .../console/core/watcher/FlinkAppLostWatcher.java | 10 +- .../console/core/watcher/FlinkClusterWatcher.java | 12 +- .../core/watcher/FlinkK8sChangeEventListener.java | 32 ++-- .../core/watcher/FlinkK8sWatcherWrapper.java | 24 +-- .../system/controller/AccessTokenController.java | 10 +- .../system/controller/MemberController.java | 8 +- .../console/system/controller/SsoController.java | 4 +- .../console/system/controller/UserController.java | 8 +- .../streampark/console/system/entity/User.java | 8 +- .../system/security/impl/AuthenticatorImpl.java | 22 +-- .../system/service/impl/MenuServiceImpl.java | 6 +- .../system/service/impl/TeamServiceImpl.java | 4 +- .../system/service/impl/UserServiceImpl.java | 4 +- .../console/core/task/FlinkK8sObserverBroker.scala | 24 +-- .../core/utils/FlinkK8sDataTypeConverter.scala | 18 +-- .../streampark/console/SpringUnitTestBase.java | 8 +- .../console/core/entity/ProjectTest.java | 8 +- .../{AlertTypeTest.java => AlertTypeEnumTest.java} | 8 +- .../service/ApplicationManageServiceITest.java | 14 +- .../core/service/ApplicationManageServiceTest.java | 10 +- .../core/service/FlinkClusterServiceTest.java | 4 +- .../console/core/service/SavePointServiceTest.java | 20 +-- .../console/core/service/UserServiceTest.java | 20 +-- .../console/core/service/YarnQueueServiceTest.java | 12 +- .../core/service/alert/AlertServiceTest.java | 4 +- .../flink/client/bean/CancelRequest.scala | 4 +- .../flink/client/bean/DeployRequest.scala | 4 +- .../flink/client/bean/SavepointRequestTrait.scala | 4 +- .../flink/client/bean/ShutDownRequest.scala | 4 +- .../flink/client/bean/SubmitRequest.scala | 14 +- .../client/bean/TriggerSavepointRequest.scala | 4 +- .../flink/client/FlinkClientEndpoint.scala | 6 +- .../impl/KubernetesNativeApplicationClient.scala | 12 +- .../impl/KubernetesNativeSessionClient.scala | 18 ++- .../flink/client/impl/YarnApplicationClient.scala | 6 +- .../flink/client/trait/FlinkClientTrait.scala | 18 +-- .../client/trait/KubernetesClientV2Trait.scala | 32 ++-- .../client/trait/KubernetesNativeClientTrait.scala | 4 +- .../flink/kubernetes/DefaultFlinkK8sWatcher.scala | 8 +- .../flink/kubernetes/KubernetesRetriever.scala | 4 +- ...FlinkJobState.scala => FlinkJobStateEnum.scala} | 6 +- ...uteMode.scala => FlinkK8sExecuteModeEnum.scala} | 20 +-- .../kubernetes/event/FlinkJobStateEvent.scala | 4 +- .../flink/kubernetes/model/ClusterKey.scala | 4 +- .../flink/kubernetes/model/JobStatusCV.scala | 4 +- .../flink/kubernetes/model/TrackId.scala | 12 +- .../kubernetes/watcher/FlinkJobStatusWatcher.scala | 52 +++--- ...PipelineStatus.java => PipelineStatusEnum.java} | 8 +- ...StepStatus.java => PipelineStepStatusEnum.java} | 8 +- .../{PipelineType.java => PipelineTypeEnum.java} | 12 +- .../flink/packer/pipeline/BuildPipeline.scala | 32 ++-- .../flink/packer/pipeline/BuildRequest.scala | 22 +-- .../flink/packer/pipeline/PipeSnapshot.scala | 10 +- .../impl/FlinkK8sApplicationBuildPipeline.scala | 8 +- .../impl/FlinkK8sApplicationBuildPipelineV2.scala | 8 +- .../impl/FlinkK8sSessionBuildPipeline.scala | 2 +- .../pipeline/impl/FlinkRemoteBuildPipeline.scala | 10 +- .../impl/FlinkYarnApplicationBuildPipeline.scala | 8 +- .../flink/core/FlinkStreamingInitializer.scala | 8 +- .../flink/core/FlinkTableInitializer.scala | 24 +-- ...erationStatus.java => OperationStatusEnum.java} | 8 +- ...hOrientation.java => FetchOrientationEnum.java} | 2 +- .../streampark/gateway/results/OperationInfo.java | 8 +- .../{ResultKind.java => ResultKindEnum.java} | 2 +- .../gateway/results/ResultQueryCondition.java | 8 +- .../streampark/gateway/results/ResultSet.java | 16 +- .../streampark/gateway/results/TableInfo.java | 17 +- .../results/{TableKind.java => TableKindEnum.java} | 2 +- .../gateway/service/SqlGatewayService.java | 4 +- .../gateway/flink/FlinkSqlGatewayImpl.java | 14 +- 156 files changed, 1119 insertions(+), 1083 deletions(-) diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java index 22591bea1,19e83e2fa..e76ee5cfd --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/annotation/AppUpdated.java @@@ -17,7 -17,8 +17,8 @@@ package org.apache.streampark.console.core.annotation; + import org.apache.streampark.console.core.aspect.ConsoleAspect; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.aspectj.lang.ProceedingJoinPoint; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java index dc38b9784,87f85c143..15926c4af --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java @@@ -24,11 -24,11 +24,11 @@@ import org.apache.streampark.console.ba import org.apache.streampark.console.core.annotation.ApiAccess; import org.apache.streampark.console.core.annotation.PermissionAction; import org.apache.streampark.console.core.entity.Application; - import org.apache.streampark.console.core.enums.PermissionType; - import org.apache.streampark.console.core.enums.UserType; + import org.apache.streampark.console.core.enums.PermissionTypeEnum; + import org.apache.streampark.console.core.enums.UserTypeEnum; import org.apache.streampark.console.core.service.CommonService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.console.system.entity.AccessToken; import org.apache.streampark.console.system.entity.Member; import org.apache.streampark.console.system.entity.User; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java index 56223779d,104870327..ae142bd59 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/ApplicationManageServiceImpl.java @@@ -53,11 -53,11 +53,11 @@@ import org.apache.streampark.console.co import org.apache.streampark.console.core.service.SettingService; import org.apache.streampark.console.core.service.YarnQueueService; import org.apache.streampark.console.core.service.application.ApplicationManageService; -import org.apache.streampark.console.core.task.FlinkAppHttpWatcher; -import org.apache.streampark.console.core.task.FlinkK8sObserverStub; import org.apache.streampark.console.core.utils.FlinkK8sDataTypeConverterStub; +import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; +import org.apache.streampark.console.core.watcher.FlinkK8sObserverStub; import org.apache.streampark.flink.kubernetes.FlinkK8sWatcher; - import org.apache.streampark.flink.packer.pipeline.PipelineStatus; + import org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum; import org.apache.commons.lang3.StringUtils; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java index 5a5fcbffd,ecabb95ad..b3d44ebca --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java @@@ -21,8 -21,7 +21,8 @@@ import org.apache.streampark.common.uti import org.apache.streampark.common.util.Utils; import org.apache.streampark.console.base.util.GitUtils; import org.apache.streampark.console.core.entity.Project; - import org.apache.streampark.console.core.enums.BuildState; - import org.apache.streampark.console.core.enums.GitCredential; + import org.apache.streampark.console.core.enums.BuildStateEnum; ++import org.apache.streampark.console.core.enums.GitCredentialEnum; import ch.qos.logback.classic.Logger; import lombok.extern.slf4j.Slf4j; @@@ -105,24 -103,9 +105,24 @@@ public class ProjectBuildTask extends A git.close(); return true; } catch (Exception e) { + if (e instanceof InvalidRemoteException) { - GitCredential gitCredential = GitCredential.of(project.getGitCredential()); - if (gitCredential == GitCredential.HTTPS) { - project.setGitCredential(GitCredential.SSH.getValue()); ++ GitCredentialEnum gitCredential = GitCredentialEnum.of(project.getGitCredential()); ++ if (gitCredential == GitCredentialEnum.HTTPS) { ++ project.setGitCredential(GitCredentialEnum.SSH.getValue()); + String url = + project + .getUrl() + .replaceAll( + "(https://|http://)(.*?)/(.*?)/(.*?)(\\.git|)\\s*$", "git@$2:$3/$4.git"); + project.setUrl(url); + fileLogger.info( + "clone project by https(http) failed, Now try to clone project by ssh..."); + return cloneSourceCode(project); + } + } fileLogger.error( String.format( - "[StreamPark] project [%s] branch [%s] git clone failure, err: %s", + "[StreamPark] project [%s] branch [%s] git clone failed, err: %s", project.getName(), project.getBranches(), e)); fileLogger.error(String.format("project %s clone error ", project.getName()), e); return false; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java index 19853b6da,2e9098306..16bf1c0ae --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppHttpWatcher.java @@@ -15,21 -15,20 +15,21 @@@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; - import org.apache.streampark.common.enums.ExecutionMode; + import org.apache.streampark.common.enums.FlinkExecutionMode; import org.apache.streampark.common.util.HttpClientUtils; import org.apache.streampark.common.util.ThreadUtils; import org.apache.streampark.common.util.YarnUtils; import org.apache.streampark.console.base.util.JacksonUtils; import org.apache.streampark.console.core.bean.AlertTemplate; +import org.apache.streampark.console.core.component.FlinkCheckpointProcessor; import org.apache.streampark.console.core.entity.Application; import org.apache.streampark.console.core.entity.FlinkCluster; - import org.apache.streampark.console.core.enums.FlinkAppState; - import org.apache.streampark.console.core.enums.OptionState; - import org.apache.streampark.console.core.enums.ReleaseState; - import org.apache.streampark.console.core.enums.StopFrom; + import org.apache.streampark.console.core.enums.FlinkAppStateEnum; + import org.apache.streampark.console.core.enums.OptionStateEnum; + import org.apache.streampark.console.core.enums.ReleaseStateEnum; + import org.apache.streampark.console.core.enums.StopFromEnum; import org.apache.streampark.console.core.metrics.flink.CheckPoints; import org.apache.streampark.console.core.metrics.flink.JobsOverview; import org.apache.streampark.console.core.metrics.flink.Overview; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java index 1f91f239e,b0c0e29bb..30e196a3b --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkAppLostWatcher.java @@@ -39,9 -39,9 +39,9 @@@ import java.util.Set import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; - import static org.apache.streampark.console.core.enums.FlinkAppState.LOST; + import static org.apache.streampark.console.core.enums.FlinkAppStateEnum.LOST; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.Bridge.toTrackId; -import static org.apache.streampark.console.core.task.FlinkK8sWatcherWrapper.isKubernetesApp; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.Bridge.toTrackId; +import static org.apache.streampark.console.core.watcher.FlinkK8sWatcherWrapper.isKubernetesApp; /** This implementation is currently used for probe on yarn,remote,K8s mode */ @Slf4j diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java index 9bd08ed9c,0cd056a4b..9f017e5e0 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sChangeEventListener.java @@@ -15,15 -15,14 +15,15 @@@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; - import org.apache.streampark.common.enums.ExecutionMode; + import org.apache.streampark.common.enums.FlinkExecutionMode; import org.apache.streampark.common.util.ThreadUtils; import org.apache.streampark.console.core.bean.AlertTemplate; +import org.apache.streampark.console.core.component.FlinkCheckpointProcessor; import org.apache.streampark.console.core.entity.Application; - import org.apache.streampark.console.core.enums.FlinkAppState; - import org.apache.streampark.console.core.enums.OptionState; + import org.apache.streampark.console.core.enums.FlinkAppStateEnum; + import org.apache.streampark.console.core.enums.OptionStateEnum; import org.apache.streampark.console.core.metrics.flink.CheckPoints; import org.apache.streampark.console.core.service.alert.AlertService; import org.apache.streampark.console.core.service.application.ApplicationInfoService; diff --cc streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java index a60f8f6ec,5efa209b7..41bd5d049 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/watcher/FlinkK8sWatcherWrapper.java @@@ -15,12 -15,12 +15,12 @@@ * limitations under the License. */ -package org.apache.streampark.console.core.task; +package org.apache.streampark.console.core.watcher; import org.apache.streampark.common.conf.K8sFlinkConfig; - import org.apache.streampark.common.enums.ExecutionMode; + import org.apache.streampark.common.enums.FlinkExecutionMode; import org.apache.streampark.console.core.entity.Application; - import org.apache.streampark.console.core.enums.FlinkAppState; + import org.apache.streampark.console.core.enums.FlinkAppStateEnum; import org.apache.streampark.console.core.service.application.ApplicationManageService; import org.apache.streampark.flink.kubernetes.FlinkK8sWatcher; import org.apache.streampark.flink.kubernetes.FlinkK8sWatcherFactory;
