Skip to content

Commit d49d51a

Browse files
author
苏义超
committed
Add connectivity test validation
1 parent 3ccf059 commit d49d51a

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
9191
*
9292
* @param loginUser login user
9393
* @param datasourceParam datasource parameters
94-
* @return create result code
94+
* @return create datasource
9595
*/
9696
@Override
9797
public DataSource createDataSource(User loginUser, BaseDataSourceParamDTO datasourceParam) {
@@ -107,8 +107,12 @@ public DataSource createDataSource(User loginUser, BaseDataSourceParamDTO dataso
107107
if (checkDescriptionLength(datasourceParam.getNote())) {
108108
throw new ServiceException(Status.DESCRIPTION_TOO_LONG_ERROR);
109109
}
110+
110111
ConnectionParam connectionParam = DataSourceUtils.buildConnectionParams(datasourceParam);
111112

113+
// check connect
114+
checkConnection(datasourceParam.getType(), connectionParam);
115+
112116
// build datasource
113117
DataSource dataSource = new DataSource();
114118
Date now = new Date();
@@ -130,10 +134,10 @@ public DataSource createDataSource(User loginUser, BaseDataSourceParamDTO dataso
130134
}
131135

132136
/**
133-
* updateWorkflowInstance datasource
137+
* update datasource
134138
*
135139
* @param loginUser login user
136-
* @return update result code
140+
* @return update datasource
137141
*/
138142
@Override
139143
public DataSource updateDataSource(User loginUser, BaseDataSourceParamDTO dataSourceParam) {
@@ -167,6 +171,9 @@ public DataSource updateDataSource(User loginUser, BaseDataSourceParamDTO dataSo
167171
connectionParam.setPassword(oldParams.path(Constants.PASSWORD).asText());
168172
}
169173

174+
// check connect
175+
checkConnection(dataSource.getType(), connectionParam);
176+
170177
Date now = new Date();
171178

172179
dataSource.setName(dataSourceParam.getName().trim());
@@ -317,8 +324,7 @@ public void verifyDataSourceName(String name) {
317324
*
318325
* @param type data source type
319326
* @param connectionParam connectionParam
320-
* @return true if connect successfully, otherwise false
321-
* @return true if connect successfully, otherwise false
327+
* @throws ServiceException when connection test fails
322328
*/
323329
@Override
324330
public void checkConnection(DbType type, ConnectionParam connectionParam) {

0 commit comments

Comments
 (0)