You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/09/19 07:34:54 UTC
[dolphinscheduler] 01/05: [Improvement-#11768][Monitor] Support monitor h2 database in monitor page (#11813)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch 3.1.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit c11ec05d61326afd686eb5e9bf7e53882dd53a98
Author: Yann Ann <29...@qq.com>
AuthorDate: Fri Sep 9 09:43:56 2022 +0800
[Improvement-#11768][Monitor] Support monitor h2 database in monitor page (#11813)
---
.../apache/dolphinscheduler/dao/MonitorDBDao.java | 3 ++
...stgreSQLPerformance.java => H2Performance.java} | 44 +++++++---------------
.../dao/utils/MySQLPerformance.java | 31 +++++----------
.../dao/utils/PostgreSQLPerformance.java | 14 +------
4 files changed, 28 insertions(+), 64 deletions(-)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
index f71e1b6266..dcdb1f8015 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.dao;
import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
+import org.apache.dolphinscheduler.dao.utils.H2Performance;
import org.apache.dolphinscheduler.dao.utils.MySQLPerformance;
import org.apache.dolphinscheduler.dao.utils.PostgreSQLPerformance;
import org.apache.dolphinscheduler.spi.enums.DbType;
@@ -51,6 +52,8 @@ public class MonitorDBDao {
return new MySQLPerformance().getMonitorRecord(conn);
} else if (driverClassName.contains(DbType.POSTGRESQL.toString().toLowerCase())) {
return new PostgreSQLPerformance().getMonitorRecord(conn);
+ } else if (driverClassName.contains(DbType.H2.toString().toLowerCase())) {
+ return new H2Performance().getMonitorRecord(conn);
}
} catch (Exception e) {
logger.error("SQLException: {}", e.getMessage(), e);
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/H2Performance.java
similarity index 61%
copy from dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java
copy to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/H2Performance.java
index 0b4fa7579f..f32c9cb357 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/H2Performance.java
@@ -30,11 +30,15 @@ import java.util.Date;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PostgreSQLPerformance extends BaseDBPerformance {
- private static final Logger logger = LoggerFactory.getLogger(PostgreSQLPerformance.class);
+/**
+ * H2 MEMORY DB Performance Monitor
+ */
+public class H2Performance extends BaseDBPerformance {
+
+ private static final Logger logger = LoggerFactory.getLogger(H2Performance.class);
/**
- * get monitor record
+ * return the current database performance
*
* @param conn connection
* @return MonitorRecord
@@ -43,40 +47,20 @@ public class PostgreSQLPerformance extends BaseDBPerformance {
public MonitorRecord getMonitorRecord(Connection conn) {
MonitorRecord monitorRecord = new MonitorRecord();
monitorRecord.setDate(new Date());
+ monitorRecord.setDbType(DbType.H2);
monitorRecord.setState(Flag.YES);
- monitorRecord.setDbType(DbType.POSTGRESQL);
- Statement pstmt = null;
- try {
- pstmt = conn.createStatement();
- try (ResultSet rs1 = pstmt.executeQuery("select count(*) from pg_stat_activity;")) {
+ try (Statement pstmt = conn.createStatement()) {
+ try (
+ ResultSet rs1 = pstmt
+ .executeQuery("select count(1) as total from information_schema.sessions;")) {
if (rs1.next()) {
- monitorRecord.setThreadsConnections(rs1.getInt("count"));
- }
- }
-
- try (ResultSet rs2 = pstmt.executeQuery("show max_connections")) {
- if (rs2.next()) {
- monitorRecord.setMaxConnections(rs2.getInt("max_connections"));
+ monitorRecord.setThreadsConnections(rs1.getInt("total"));
}
}
-
- try (ResultSet rs3 = pstmt.executeQuery("select count(*) from pg_stat_activity pg where pg.state = 'active';")) {
- if (rs3.next()) {
- monitorRecord.setThreadsRunningConnections(rs3.getInt("count"));
- }
- }
- } catch (Exception e) {
+ } catch (SQLException e) {
monitorRecord.setState(Flag.NO);
logger.error("SQLException ", e);
- } finally {
- try {
- if (pstmt != null) {
- pstmt.close();
- }
- } catch (SQLException e) {
- logger.error("SQLException ", e);
- }
}
return monitorRecord;
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MySQLPerformance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MySQLPerformance.java
index 17b24b2e4f..e8591364d0 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MySQLPerformance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MySQLPerformance.java
@@ -25,7 +25,6 @@ import org.apache.dolphinscheduler.spi.enums.DbType;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
@@ -39,7 +38,6 @@ public class MySQLPerformance extends BaseDBPerformance {
private static Logger logger = LoggerFactory.getLogger(MySQLPerformance.class);
-
/**
* get monitor record
* @param conn connection
@@ -51,43 +49,32 @@ public class MySQLPerformance extends BaseDBPerformance {
monitorRecord.setDate(new Date());
monitorRecord.setDbType(DbType.MYSQL);
monitorRecord.setState(Flag.YES);
- Statement pstmt= null;
- try{
- pstmt = conn.createStatement();
+ try (Statement pstmt = conn.createStatement()) {
try (ResultSet rs1 = pstmt.executeQuery("show global variables")) {
- while(rs1.next()){
- if("MAX_CONNECTIONS".equalsIgnoreCase(rs1.getString(VARIABLE_NAME))){
- monitorRecord.setMaxConnections( Long.parseLong(rs1.getString("value")));
+ while (rs1.next()) {
+ if ("MAX_CONNECTIONS".equalsIgnoreCase(rs1.getString(VARIABLE_NAME))) {
+ monitorRecord.setMaxConnections(Long.parseLong(rs1.getString("value")));
}
}
}
try (ResultSet rs2 = pstmt.executeQuery("show global status")) {
- while(rs2.next()){
- if("MAX_USED_CONNECTIONS".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))){
+ while (rs2.next()) {
+ if ("MAX_USED_CONNECTIONS".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))) {
monitorRecord.setMaxUsedConnections(Long.parseLong(rs2.getString("value")));
- }else if("THREADS_CONNECTED".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))){
+ } else if ("THREADS_CONNECTED".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))) {
monitorRecord.setThreadsConnections(Long.parseLong(rs2.getString("value")));
- }else if("THREADS_RUNNING".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))){
+ } else if ("THREADS_RUNNING".equalsIgnoreCase(rs2.getString(VARIABLE_NAME))) {
monitorRecord.setThreadsRunningConnections(Long.parseLong(rs2.getString("value")));
}
}
}
- }catch (Exception e) {
+ } catch (Exception e) {
monitorRecord.setState(Flag.NO);
logger.error("SQLException ", e);
- }finally {
- try {
- if (pstmt != null) {
- pstmt.close();
- }
- }catch (SQLException e) {
- logger.error("SQLException ", e);
- }
}
return monitorRecord;
}
-
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java
index 0b4fa7579f..928575b984 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgreSQLPerformance.java
@@ -23,7 +23,6 @@ import org.apache.dolphinscheduler.spi.enums.DbType;
import java.sql.Connection;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
@@ -31,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PostgreSQLPerformance extends BaseDBPerformance {
+
private static final Logger logger = LoggerFactory.getLogger(PostgreSQLPerformance.class);
/**
@@ -45,10 +45,8 @@ public class PostgreSQLPerformance extends BaseDBPerformance {
monitorRecord.setDate(new Date());
monitorRecord.setState(Flag.YES);
monitorRecord.setDbType(DbType.POSTGRESQL);
- Statement pstmt = null;
- try {
- pstmt = conn.createStatement();
+ try (Statement pstmt = conn.createStatement()) {
try (ResultSet rs1 = pstmt.executeQuery("select count(*) from pg_stat_activity;")) {
if (rs1.next()) {
monitorRecord.setThreadsConnections(rs1.getInt("count"));
@@ -69,14 +67,6 @@ public class PostgreSQLPerformance extends BaseDBPerformance {
} catch (Exception e) {
monitorRecord.setState(Flag.NO);
logger.error("SQLException ", e);
- } finally {
- try {
- if (pstmt != null) {
- pstmt.close();
- }
- } catch (SQLException e) {
- logger.error("SQLException ", e);
- }
}
return monitorRecord;
}