ruanwenjun commented on code in PR #11598:
URL: https://github.com/apache/dolphinscheduler/pull/11598#discussion_r969233157
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -306,13 +319,31 @@ private String executeUpdate(Connection connection,
List<SqlBinds> statementsBin
int result = 0;
for (SqlBinds sqlBind : statementsBinds) {
try (PreparedStatement statement =
prepareStatementAndBind(connection, sqlBind)) {
+
+ sqlLogListener(statement);
+
result = statement.executeUpdate();
logger.info("{} statement execute update result: {}, for sql:
{}", handlerType, result, sqlBind.getSql());
}
}
return String.valueOf(result);
}
+ /**
+ * sql log listener
+ *
+ * @param statement statement
+ * @throws SQLException sqlException
+ */
+ private void sqlLogListener(PreparedStatement statement) throws
SQLException {
+ if (DbType.HIVE == DbType.valueOf(sqlParameters.getType())) {
Review Comment:
```suggestion
if (DbType.HIVE.name() == sqlParameters.getType()) {
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/HiveSqlLogThread.java:
##########
@@ -0,0 +1,75 @@
+/*
+ * 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.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 {
+ super.setDaemon(true);
+ this.statement = statement.unwrap(HivePreparedStatement.class);
+ this.hiveMapReduceLogger = logger;
+ this.taskExecutionContext = taskExecutionContext;
+ }
+
+ @Override
+ public void run() {
+
+ Thread.currentThread().setName(taskExecutionContext.getTaskLogName());
+
+ if (statement == null) {
+ hiveMapReduceLogger.info("hive statement is null, end this log
query!");
+ return;
+ }
+ try {
+ while (!statement.isClosed() && statement.hasMoreLogs()) {
+ for (String log : statement.getQueryLog(true, 500)) {
+
+ hiveMapReduceLogger.info(log);
+
+ List<String> appIds = LogUtils.getAppIds(log,
hiveMapReduceLogger);
+ //get sql task yarn's application_id
+ if (!appIds.isEmpty()) {
+ hiveMapReduceLogger.info("yarn application_id is
{}",appIds);
+ taskExecutionContext.setAppIds(String.join(",",
appIds));
+ }
+ }
+ }
+ } catch (SQLException e) {
+ hiveMapReduceLogger.error("Failed to view hive
log,exception:[{}]", e.getMessage());
Review Comment:
```suggestion
hiveMapReduceLogger.error("Failed to view hive
log,exception:[{}]");
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -306,13 +319,31 @@ private String executeUpdate(Connection connection,
List<SqlBinds> statementsBin
int result = 0;
for (SqlBinds sqlBind : statementsBinds) {
try (PreparedStatement statement =
prepareStatementAndBind(connection, sqlBind)) {
+
+ sqlLogListener(statement);
+
result = statement.executeUpdate();
logger.info("{} statement execute update result: {}, for sql:
{}", handlerType, result, sqlBind.getSql());
}
}
return String.valueOf(result);
}
+ /**
+ * sql log listener
+ *
+ * @param statement statement
+ * @throws SQLException sqlException
+ */
+ private void sqlLogListener(PreparedStatement statement) throws
SQLException {
+ if (DbType.HIVE == DbType.valueOf(sqlParameters.getType())) {
+ logger.info("The current sql task type is [{}], will start a demon
thread to resolve the appIds", DbType.HIVE);
Review Comment:
```suggestion
logger.info("The current sql task type is HIVE, will start a
daemon thread to resolve the appIds");
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java:
##########
@@ -156,6 +158,14 @@ public void handle(TaskCallBack taskCallBack) throws
TaskException {
// execute sql task
executeFuncAndSql(mainStatementSqlBinds, preStatementSqlBinds,
postStatementSqlBinds, createFuncs);
+ // get appIds
+ Set<String> appIds =
LogUtils.getAppIdsFromLogFile(taskExecutionContext.getLogPath());
+ logger.info("Resolve appIds: [{}] from task log: [{}]", appIds,
taskExecutionContext.getLogPath());
+ if (!appIds.isEmpty()) {
+ taskExecutionContext.setAppIds(String.join(",", appIds));
+ setAppIds(String.join(",", appIds));
Review Comment:
```suggestion
String appIdString = String.join(",", appIds);
taskExecutionContext.setAppIds(appIdString);
setAppIds(appIdString);
```
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/HiveSqlLogThread.java:
##########
@@ -0,0 +1,75 @@
+/*
+ * 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.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 {
+ super.setDaemon(true);
+ this.statement = statement.unwrap(HivePreparedStatement.class);
+ this.hiveMapReduceLogger = logger;
+ this.taskExecutionContext = taskExecutionContext;
+ }
+
+ @Override
+ public void run() {
+
+ Thread.currentThread().setName(taskExecutionContext.getTaskLogName());
+
+ if (statement == null) {
+ hiveMapReduceLogger.info("hive statement is null, end this log
query!");
+ return;
+ }
+ try {
+ while (!statement.isClosed() && statement.hasMoreLogs()) {
+ for (String log : statement.getQueryLog(true, 500)) {
+
+ hiveMapReduceLogger.info(log);
+
+ List<String> appIds = LogUtils.getAppIds(log,
hiveMapReduceLogger);
+ //get sql task yarn's application_id
+ if (!appIds.isEmpty()) {
+ hiveMapReduceLogger.info("yarn application_id is
{}",appIds);
+ taskExecutionContext.setAppIds(String.join(",",
appIds));
Review Comment:
Why you don't stop this loop here? you want to rewrite the appId in next
loop?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
