Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
e19833fc
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e19833fc
编写于
12月 02, 2019
作者:
T
Tboy
提交者:
qiaozhanwei
12月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
using spring context datasource (#1317)
上级
da319242
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
37 deletion
+20
-37
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
...g/apache/dolphinscheduler/api/service/MonitorService.java
+5
-1
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
...in/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
+15
-36
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
浏览文件 @
e19833fc
...
...
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.common.model.Server;
import
org.apache.dolphinscheduler.dao.entity.MonitorRecord
;
import
org.apache.dolphinscheduler.dao.entity.User
;
import
org.apache.dolphinscheduler.dao.entity.ZookeeperRecord
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
...
...
@@ -38,6 +39,9 @@ import java.util.Map;
@Service
public
class
MonitorService
extends
BaseService
{
@Autowired
private
MonitorDBDao
monitorDBDao
;
/**
* query database state
*
...
...
@@ -47,7 +51,7 @@ public class MonitorService extends BaseService{
public
Map
<
String
,
Object
>
queryDatabaseState
(
User
loginUser
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
List
<
MonitorRecord
>
monitorRecordList
=
M
onitorDBDao
.
queryDatabaseState
();
List
<
MonitorRecord
>
monitorRecordList
=
m
onitorDBDao
.
queryDatabaseState
();
result
.
put
(
Constants
.
DATA_LIST
,
monitorRecordList
);
putMsg
(
result
,
Status
.
SUCCESS
);
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java
浏览文件 @
e19833fc
...
...
@@ -17,65 +17,47 @@
package
org.apache.dolphinscheduler.dao
;
import
com.alibaba.druid.pool.DruidDataSource
;
import
org.apache.dolphinscheduler.common.Constants
;
import
java.sql.Connection
;
import
java.sql.SQLException
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.apache.dolphinscheduler.common.enums.DbType
;
import
org.apache.dolphinscheduler.dao.datasource.ConnectionFactory
;
import
org.apache.dolphinscheduler.dao.entity.MonitorRecord
;
import
org.apache.commons.configuration.Configuration
;
import
org.apache.commons.configuration.ConfigurationException
;
import
org.apache.commons.configuration.PropertiesConfiguration
;
import
org.apache.dolphinscheduler.dao.utils.MysqlPerformance
;
import
org.apache.dolphinscheduler.dao.utils.PostgrePerformance
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.sql.*
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
/**
* database state dao
*/
@Component
public
class
MonitorDBDao
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
MonitorDBDao
.
class
);
public
static
final
String
VARIABLE_NAME
=
"variable_name"
;
/**
* load conf
*/
private
static
Configuration
conf
;
@Autowired
private
DruidDataSource
dataSource
;
static
{
try
{
conf
=
new
PropertiesConfiguration
(
Constants
.
APPLICATION_PROPERTIES
);
}
catch
(
ConfigurationException
e
){
logger
.
error
(
"load configuration excetpion"
,
e
);
System
.
exit
(
1
);
}
}
/**
* get current db performance
* @return MonitorRecord
*/
public
static
MonitorRecord
getCurrentDbPerformance
(){
public
MonitorRecord
getCurrentDbPerformance
(){
MonitorRecord
monitorRecord
=
null
;
Connection
conn
=
null
;
DruidDataSource
dataSource
=
null
;
try
{
dataSource
=
ConnectionFactory
.
getDataSource
();
dataSource
.
setInitialSize
(
2
);
dataSource
.
setMinIdle
(
2
);
dataSource
.
setMaxActive
(
2
);
conn
=
dataSource
.
getConnection
();
if
(
conn
==
null
){
return
monitorRecord
;
}
if
(
conf
.
getString
(
Constants
.
SPRING_DATASOURCE_DRIVER_CLASS_NAME
).
contains
(
DbType
.
MYSQL
.
toString
().
toLowerCase
()))
{
String
driverClassName
=
dataSource
.
getDriverClassName
();
if
(
driverClassName
.
contains
(
DbType
.
MYSQL
.
toString
().
toLowerCase
())){
return
new
MysqlPerformance
().
getMonitorRecord
(
conn
);
}
else
if
(
conf
.
getString
(
Constants
.
SPRING_DATASOURCE_DRIVER_CLASS_NAME
)
.
contains
(
DbType
.
POSTGRESQL
.
toString
().
toLowerCase
())){
}
else
if
(
driverClassName
.
contains
(
DbType
.
POSTGRESQL
.
toString
().
toLowerCase
())){
return
new
PostgrePerformance
().
getMonitorRecord
(
conn
);
}
}
catch
(
Exception
e
)
{
...
...
@@ -85,9 +67,6 @@ public class MonitorDBDao {
if
(
conn
!=
null
)
{
conn
.
close
();
}
if
(
dataSource
!=
null
){
dataSource
.
close
();
}
}
catch
(
SQLException
e
)
{
logger
.
error
(
"SQLException "
,
e
);
}
...
...
@@ -99,7 +78,7 @@ public class MonitorDBDao {
* query database state
* @return MonitorRecord list
*/
public
static
List
<
MonitorRecord
>
queryDatabaseState
()
{
public
List
<
MonitorRecord
>
queryDatabaseState
()
{
List
<
MonitorRecord
>
list
=
new
ArrayList
<>(
1
);
MonitorRecord
monitorRecord
=
getCurrentDbPerformance
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录