You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/09/08 03:53:33 UTC
[GitHub] [dolphinscheduler] ruanwenjun commented on a diff in pull request #11598: [Improvement-#9680][task-plugin] #9680 add hive sql log listener, print MapReduce progress log and obtain application_id allows developers to better track tasks
ruanwenjun commented on code in PR #11598:
URL: https://github.com/apache/dolphinscheduler/pull/11598#discussion_r965475211
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -155,6 +156,14 @@ public void handle() throws TaskException {
// execute sql task
executeFuncAndSql(mainStatementSqlBinds, preStatementSqlBinds, postStatementSqlBinds, createFuncs);
+ // get appIds
+ List<String> appIds = LogUtils.getAppIdsFromLogFile(taskExecutionContext.getLogPath());
+ logger.info("task log path:[{}],yarn appIds:[{}]", taskExecutionContext.getLogPath(), appIds);
Review Comment:
```suggestion
logger.info("Resolve appIds from task log: [{}]", appIds, taskExecutionContext.getLogPath());
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml:
##########
@@ -55,5 +55,10 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-common</artifactId>
+ </dependency>
+
Review Comment:
Please don't add `dolphinscheduler-common` into task plugin module.
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -291,6 +300,12 @@ private void sendAttachment(int groupId, String title, String content) {
private String executeQuery(Connection connection, SqlBinds sqlBinds, String handlerType) throws Exception {
try (PreparedStatement statement = prepareStatementAndBind(connection, sqlBinds)) {
logger.info("{} statement execute query, for sql: {}", handlerType, sqlBinds.getSql());
+
+ if (DbType.HIVE == DbType.valueOf(sqlParameters.getType())) {
+ logger.info("execute sql type is [{}]",DbType.HIVE.getDescp());
Review Comment:
```suggestion
logger.info("The current sql task type is [{}], will start a demon thread to resolve the appIds", DbType.HIVE);
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -300,6 +315,13 @@ private String executeUpdate(Connection connection, List<SqlBinds> statementsBin
int result = 0;
for (SqlBinds sqlBind : statementsBinds) {
try (PreparedStatement statement = prepareStatementAndBind(connection, sqlBind)) {
+
+ if (DbType.HIVE == DbType.valueOf(sqlParameters.getType())) {
+ logger.info("execute sql type is [{}]",DbType.HIVE.getDescp());
+
+ HiveSqlLogThread queryThread = new HiveSqlLogThread(statement, logger,taskExecutionContext);
+ queryThread.start();
+ }
Review Comment:
Can we extract this into a private method?
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/HiveSqlLogThread.java:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.dolphinscheduler.plugin.task.sql;
+
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
+import org.apache.dolphinscheduler.plugin.task.api.utils.LogUtils;
+
+import org.apache.hive.jdbc.HivePreparedStatement;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.slf4j.Logger;
+
+
+public class HiveSqlLogThread extends Thread {
+
+ private final HivePreparedStatement statement;
+
+ private final Logger hiveMapReduceLogger;
+
+ private final TaskExecutionContext taskExecutionContext;
+
+ public HiveSqlLogThread(PreparedStatement statement, Logger logger, TaskExecutionContext taskExecutionContext) throws SQLException {
+ this.statement = statement.unwrap(HivePreparedStatement.class);
Review Comment:
super.setDeamon(true)
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/HiveSqlLogThread.java:
##########
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.dolphinscheduler.plugin.task.sql;
+
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
+import org.apache.dolphinscheduler.plugin.task.api.utils.LogUtils;
+
+import org.apache.hive.jdbc.HivePreparedStatement;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.slf4j.Logger;
+
+
+public class HiveSqlLogThread extends Thread {
+
+ private final HivePreparedStatement statement;
+
+ private final Logger hiveMapReduceLogger;
+
+ private final TaskExecutionContext taskExecutionContext;
+
+ public HiveSqlLogThread(PreparedStatement statement, Logger logger, TaskExecutionContext taskExecutionContext) throws SQLException {
+ this.statement = statement.unwrap(HivePreparedStatement.class);
+ this.hiveMapReduceLogger = logger;
+ this.taskExecutionContext = taskExecutionContext;
+ }
+
+ @Override
+ public void run() {
+ String taskLogName = LoggerUtils.buildTaskId(taskExecutionContext.getFirstSubmitTime(),
+ taskExecutionContext.getProcessDefineCode(),
+ taskExecutionContext.getProcessDefineVersion(),
+ taskExecutionContext.getProcessInstanceId(),
+ taskExecutionContext.getTaskInstanceId());
+ taskExecutionContext.setTaskLogName(taskLogName);
+
+ // set the name of the current thread
+ Thread.currentThread().setName(taskLogName);
Review Comment:
You can directly use the sql task's logger to print the log.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org