-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
mayang.ysj
authored and
mayang.ysj
committed
Sep 4, 2024
1 parent
fd7199b
commit b8e7c15
Showing
14 changed files
with
487 additions
and
297 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
server/odc-service/src/main/java/com/oceanbase/odc/service/config/LoggerProperty.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright (c) 2023 OceanBase. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.oceanbase.odc.service.config; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import cn.hutool.core.io.FileUtil; | ||
| import lombok.Getter; | ||
|
|
||
| @ConfigurationProperties(prefix = "odc.log") | ||
| @Component | ||
| @Getter | ||
| public class LoggerProperty { | ||
|
|
||
| // This is the directory path for storing temporary log files from scheduled tasks pods, defaulting | ||
| // to the classpath if not explicitly set. | ||
| private String tempScheduleTaskLogDir = | ||
| FileUtil.normalize(System.getProperty("user.dir") + File.separator + "log/running-job-temp-logs"); | ||
|
|
||
| private String directory = "./log"; | ||
|
|
||
| private Long maxLimitedCount = 10000L; | ||
|
|
||
| // unit：B | ||
| private Long maxSizeCount = 1024L * 1024; | ||
| } |
116 changes: 116 additions & 0 deletions
116
...c-service/src/main/java/com/oceanbase/odc/service/flow/FlowTaskInstanceLoggerService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| * Copyright (c) 2023 OceanBase. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.oceanbase.odc.service.flow; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Optional; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import com.fasterxml.jackson.core.type.TypeReference; | ||
| import com.oceanbase.odc.common.json.JsonUtils; | ||
| import com.oceanbase.odc.core.shared.constant.ErrorCodes; | ||
| import com.oceanbase.odc.core.shared.constant.TaskType; | ||
| import com.oceanbase.odc.core.shared.exception.NotFoundException; | ||
| import com.oceanbase.odc.metadb.task.TaskEntity; | ||
| import com.oceanbase.odc.service.common.response.SuccessResponse; | ||
| import com.oceanbase.odc.service.config.LoggerProperty; | ||
| import com.oceanbase.odc.service.dispatch.DispatchResponse; | ||
| import com.oceanbase.odc.service.dispatch.RequestDispatcher; | ||
| import com.oceanbase.odc.service.dispatch.TaskDispatchChecker; | ||
| import com.oceanbase.odc.service.task.TaskService; | ||
| import com.oceanbase.odc.service.task.executor.logger.LogUtils; | ||
| import com.oceanbase.odc.service.task.model.ExecutorInfo; | ||
| import com.oceanbase.odc.service.task.model.OdcTaskLogLevel; | ||
|
|
||
| import lombok.SneakyThrows; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| /** | ||
| * @author mayang | ||
| */ | ||
| @Service | ||
| @Slf4j | ||
| public class FlowTaskInstanceLoggerService { | ||
|
|
||
| private final FlowTaskInstanceService flowTaskInstanceService; | ||
| private final RequestDispatcher requestDispatcher; | ||
| private final TaskDispatchChecker dispatchChecker; | ||
| private final TaskService taskService; | ||
| @Autowired | ||
| private LoggerProperty loggerProperty; | ||
|
|
||
| public FlowTaskInstanceLoggerService(FlowTaskInstanceService flowTaskInstanceService, | ||
| RequestDispatcher requestDispatcher, | ||
| TaskDispatchChecker dispatchChecker, | ||
| TaskService taskService) { | ||
| this.flowTaskInstanceService = flowTaskInstanceService; | ||
| this.requestDispatcher = requestDispatcher; | ||
| this.dispatchChecker = dispatchChecker; | ||
| this.taskService = taskService; | ||
| } | ||
|
|
||
| @SneakyThrows | ||
| public String getLog(OdcTaskLogLevel level, Long flowInstanceId, boolean skipAuth) { | ||
| Optional<TaskEntity> taskEntityOptional = | ||
| flowTaskInstanceService.getLogDownloadableTaskEntity(flowInstanceId, skipAuth); | ||
| if (!taskEntityOptional.isPresent()) { | ||
| log.warn("get log failed, flowInstanceId: {}, skipAuth: {}", flowInstanceId, skipAuth); | ||
| return "get log failed"; | ||
| } | ||
| TaskEntity taskEntity = taskEntityOptional.get(); | ||
| if (!dispatchChecker.isTaskEntityOnThisMachine(taskEntity)) { | ||
| ExecutorInfo executorInfo = JsonUtils.fromJson(taskEntity.getExecutor(), ExecutorInfo.class); | ||
| DispatchResponse response = requestDispatcher.forward(executorInfo.getHost(), executorInfo.getPort()); | ||
| return response.getContentByType(new TypeReference<SuccessResponse<String>>() {}).getData(); | ||
| } | ||
| return getLog(taskEntity.getCreatorId(), taskEntity.getId() + "", taskEntity.getTaskType(), level); | ||
| } | ||
|
|
||
| @SneakyThrows | ||
| public File downloadLog(Long flowInstanceId, boolean skipAuth) { | ||
| Optional<TaskEntity> taskEntityOptional = | ||
| flowTaskInstanceService.getLogDownloadableTaskEntity(flowInstanceId, skipAuth); | ||
| if (!taskEntityOptional.isPresent()) { | ||
| throw new NotFoundException(ErrorCodes.NotFound, new Object[] {flowInstanceId}, | ||
| ErrorCodes.TaskLogNotFound.getLocalizedMessage(new Object[] {"Id", flowInstanceId})); | ||
| } | ||
| TaskEntity taskEntity = taskEntityOptional.get(); | ||
| if (!dispatchChecker.isTaskEntityOnThisMachine(taskEntity)) { | ||
| ExecutorInfo executorInfo = JsonUtils.fromJson(taskEntity.getExecutor(), ExecutorInfo.class); | ||
| DispatchResponse response = requestDispatcher.forward(executorInfo.getHost(), executorInfo.getPort()); | ||
| return response.getContentByType(new TypeReference<SuccessResponse<File>>() {}).getData(); | ||
| } | ||
| return getLogFile(taskEntity.getCreatorId(), taskEntity.getId() + "", taskEntity.getTaskType(), | ||
| OdcTaskLogLevel.ALL); | ||
| } | ||
|
|
||
| public File getLogFile(Long userId, String flowInstanceId, TaskType type, OdcTaskLogLevel logLevel) { | ||
| try { | ||
| return taskService.getLogFile(userId, flowInstanceId, type, logLevel); | ||
| } catch (NotFoundException ex) { | ||
| log.warn(ErrorCodes.TaskLogNotFound.getLocalizedMessage(new Object[] {"Id", flowInstanceId})); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| private String getLog(Long userId, String jobId, TaskType type, OdcTaskLogLevel logLevel) { | ||
| return LogUtils.getLatestLogContent(getLogFile(userId, jobId, type, logLevel), | ||
| loggerProperty.getMaxLimitedCount(), | ||
| loggerProperty.getMaxSizeCount()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.