status
stringclasses 1
value | repo_name
stringclasses 31
values | repo_url
stringclasses 31
values | issue_id
int64 1
104k
| title
stringlengths 4
233
| body
stringlengths 0
186k
⌀ | issue_url
stringlengths 38
56
| pull_url
stringlengths 37
54
| before_fix_sha
stringlengths 40
40
| after_fix_sha
stringlengths 40
40
| report_datetime
timestamp[us, tz=UTC] | language
stringclasses 5
values | commit_datetime
timestamp[us, tz=UTC] | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
|
List<K8sNamespace> resultList = new ArrayList<>();
Set<K8sNamespace> namespaceSet;
if (namespaceList != null && !namespaceList.isEmpty()) {
namespaceSet = new HashSet<>(namespaceList);
List<K8sNamespace> authedProjectList = k8sNamespaceMapper.queryAuthedNamespaceListByUserId(userId);
resultList = getUnauthorizedNamespaces(namespaceSet, authedProjectList);
}
result.put(Constants.DATA_LIST, resultList);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query authorized namespace
*
* @param loginUser login user
* @param userId user id
* @return namespaces which the user have permission to see
*/
@Override
public Map<String, Object> queryAuthorizedNamespace(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
if (loginUser.getId() != userId && isNotAdmin(loginUser, result)) {
return result;
}
List<K8sNamespace> namespaces = k8sNamespaceMapper.queryAuthedNamespaceListByUserId(userId);
result.put(Constants.DATA_LIST, namespaces);
putMsg(result, Status.SUCCESS);
return result;
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
|
* query namespace can use
*
* @param loginUser login user
* @return namespace list
*/
@Override
public List<K8sNamespace> queryNamespaceAvailable(User loginUser) {
List<K8sNamespace> k8sNamespaces;
if (isAdmin(loginUser)) {
k8sNamespaces = k8sNamespaceMapper.selectList(null);
} else {
k8sNamespaces = k8sNamespaceMapper.queryNamespaceAvailable(loginUser.getId());
}
setClusterName(k8sNamespaces);
return k8sNamespaces;
}
/**
* set cluster_name
* @param k8sNamespaces source data
*/
private void setClusterName(List<K8sNamespace> k8sNamespaces) {
if (CollectionUtils.isNotEmpty(k8sNamespaces)) {
List<Cluster> clusters = clusterMapper.queryAllClusterList();
if (CollectionUtils.isNotEmpty(clusters)) {
Map<Long, String> codeNameMap = clusters.stream()
.collect(Collectors.toMap(Cluster::getCode, Cluster::getName, (a, b) -> a));
for (K8sNamespace k8sNamespace : k8sNamespaces) {
String clusterName = codeNameMap.get(k8sNamespace.getClusterCode());
k8sNamespace.setClusterName(clusterName);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
|
}
}
}
/**
* get unauthorized namespace
*
* @param namespaceSet namespace set
* @param authedNamespaceList authed namespace list
* @return namespace list that authorization
*/
private List<K8sNamespace> getUnauthorizedNamespaces(Set<K8sNamespace> namespaceSet,
List<K8sNamespace> authedNamespaceList) {
List<K8sNamespace> resultList = new ArrayList<>();
for (K8sNamespace k8sNamespace : namespaceSet) {
boolean existAuth = false;
if (authedNamespaceList != null && !authedNamespaceList.isEmpty()) {
for (K8sNamespace k8sNamespaceAuth : authedNamespaceList) {
if (k8sNamespace.equals(k8sNamespaceAuth)) {
existAuth = true;
}
}
}
if (!existAuth) {
resultList.add(k8sNamespace);
}
}
return resultList;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/K8sNamespaceMapper.java
|
/*
* 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.dao.mapper;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* namespace interface
*/
public interface K8sNamespaceMapper extends BaseMapper<K8sNamespace> {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/K8sNamespaceMapper.java
|
/**
* k8s namespace page
*
* @param page page
* @param searchVal searchVal
* @return k8s namespace IPage
*/
IPage<K8sNamespace> queryK8sNamespacePaging(IPage<K8sNamespace> page,
@Param("searchVal") String searchVal);
/**
* check the target namespace exist
*
* @param namespace namespace
* @param clusterCode clusterCode
* @return true if exist else return null
*/
Boolean existNamespace(@Param("namespace") String namespace, @Param("clusterCode") Long clusterCode);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,377 |
[Bug] [api-service] Tenant user run Workflow WorkerGroups can't find admin add other Worker Group list
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
version :3.1.0
admin add new Workflow
tenant user hadoop run Workflow
### What you expected to happen
i can Read the The source code find use this api
`dolphinscheduler/worker-groups/all`
WorkerGroupServiceImpl.queryAllGroup
ResourceAcquisitionAndPermissionCheck.userOwnedResourceIdsAcquisition
if use tenant user only return ` Collections.emptySet();` why ??? i can find subsequent worker-groups add ZOOKEEPER `/dolphinscheduler/nodes/worker/`
### How to reproduce
I used to use version 2.0 Tenant user can find admin add new WorkerGroups
How can I discover newly added WorkerGroups
### Anything else
_No response_
### Version
3.1.x
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12377
|
https://github.com/apache/dolphinscheduler/pull/12411
|
651588c98dbaae2261a2e34044afdbae99d23b60
|
1436ad65fc1e6be5f049a534251a0a4516100109
| 2022-10-14T05:20:24Z |
java
| 2022-10-21T05:54:28Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/K8sNamespaceMapper.java
|
/**
* query namespace except userId
*
* @param userId userId
* @return namespace list
*/
List<K8sNamespace> queryNamespaceExceptUserId(@Param("userId") int userId);
/**
* query authed namespace list by userId
*
* @param userId userId
* @return namespace list
*/
List<K8sNamespace> queryAuthedNamespaceListByUserId(@Param("userId") int userId);
/**
* query namespace can use
*
* @param userId userId
* @return namespace list
*/
List<K8sNamespace> queryNamespaceAvailable(@Param("userId") Integer userId);
/**
* check the target namespace
*
* @param namespaceCode namespaceCode
* @return true if exist else return null
*/
K8sNamespace queryByNamespaceCode(@Param("clusterCode") Long namespaceCode);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
/*
* 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
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
*
* 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.api.service.impl;
import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_CREATE;
import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_DELETE;
import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_UPDATE;
import static org.apache.dolphinscheduler.common.Constants.TENANT_FULL_NAME_MAX_LENGTH;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.QueueService;
import org.apache.dolphinscheduler.api.service.TenantService;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.RegexUtils;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.utils.PropertyUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.Queue;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.service.storage.StorageOperate;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* tenant service impl
*/
@Service
public class TenantServiceImpl extends BaseServiceImpl implements TenantService {
private static final Logger logger = LoggerFactory.getLogger(TenantServiceImpl.class);
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private ProcessDefinitionMapper processDefinitionMapper;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
@Autowired
private UserMapper userMapper;
@Autowired
private QueueService queueService;
@Autowired(required = false)
private StorageOperate storageOperate;
/**
* Check the tenant new object valid or not
*
* @param tenant The tenant object want to create
*/
private void createTenantValid(Tenant tenant) throws ServiceException {
if (StringUtils.isEmpty(tenant.getTenantCode())) {
throw new ServiceException(Status.REQUEST_PARAMS_NOT_VALID_ERROR, tenant.getTenantCode());
} else if (StringUtils.length(tenant.getTenantCode()) > TENANT_FULL_NAME_MAX_LENGTH) {
throw new ServiceException(Status.TENANT_FULL_NAME_TOO_LONG_ERROR);
} else if (!RegexUtils.isValidLinuxUserName(tenant.getTenantCode())) {
throw new ServiceException(Status.CHECK_OS_TENANT_CODE_ERROR);
} else if (checkTenantExists(tenant.getTenantCode())) {
throw new ServiceException(Status.OS_TENANT_CODE_EXIST, tenant.getTenantCode());
}
}
/**
* Check tenant update object valid or not
*
* @param existsTenant The exists queue object
* @param updateTenant The queue object want to update
*/
private void updateTenantValid(Tenant existsTenant, Tenant updateTenant) throws ServiceException {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
if (Objects.isNull(existsTenant)) {
logger.error("Tenant does not exist.");
throw new ServiceException(Status.TENANT_NOT_EXIST);
}
else if (StringUtils.isEmpty(updateTenant.getTenantCode())) {
throw new ServiceException(Status.REQUEST_PARAMS_NOT_VALID_ERROR, updateTenant.getTenantCode());
} else if (StringUtils.length(updateTenant.getTenantCode()) > TENANT_FULL_NAME_MAX_LENGTH) {
throw new ServiceException(Status.TENANT_FULL_NAME_TOO_LONG_ERROR);
} else if (!RegexUtils.isValidLinuxUserName(updateTenant.getTenantCode())) {
throw new ServiceException(Status.CHECK_OS_TENANT_CODE_ERROR);
} else if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode())
&& checkTenantExists(updateTenant.getTenantCode())) {
throw new ServiceException(Status.OS_TENANT_CODE_EXIST, updateTenant.getTenantCode());
}
}
/**
* create tenant
*
* @param loginUser login user
* @param tenantCode tenant code
* @param queueId queue id
* @param desc description
* @return create result code
* @throws Exception exception
*/
@Override
@Transactional
public Map<String, Object> createTenant(User loginUser,
String tenantCode,
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
int queueId,
String desc) throws Exception {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_CREATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}
Tenant tenant = new Tenant(tenantCode, desc, queueId);
createTenantValid(tenant);
tenantMapper.insert(tenant);
if (PropertyUtils.getResUploadStartupState()) {
storageOperate.createTenantDirIfNotExists(tenantCode);
}
permissionPostHandle(AuthorizationType.TENANT, loginUser.getId(), Collections.singletonList(tenant.getId()),
logger);
result.put(Constants.DATA_LIST, tenant);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query tenant list paging
*
* @param loginUser login user
* @param searchVal search value
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
* @param pageNo page number
* @param pageSize page size
* @return tenant list page
*/
@Override
public Result<Object> queryTenantList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
Result<Object> result = new Result<>();
PageInfo<Tenant> pageInfo = new PageInfo<>(pageNo, pageSize);
Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT,
loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
return result;
}
Page<Tenant> page = new Page<>(pageNo, pageSize);
IPage<Tenant> tenantPage = tenantMapper.queryTenantPaging(page, new ArrayList<>(ids), searchVal);
pageInfo.setTotal((int) tenantPage.getTotal());
pageInfo.setTotalList(tenantPage.getRecords());
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* updateProcessInstance tenant
*
* @param loginUser login user
* @param id tenant id
* @param tenantCode tenant code
* @param queueId queue id
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
* @param desc description
* @return update result code
* @throws Exception exception
*/
@Override
public Map<String, Object> updateTenant(User loginUser, int id, String tenantCode, int queueId,
String desc) throws Exception {
Map<String, Object> result = new HashMap<>();
if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_UPDATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}
Tenant updateTenant = new Tenant(id, tenantCode, desc, queueId);
Tenant existsTenant = tenantMapper.queryById(id);
updateTenantValid(existsTenant, updateTenant);
/**
* if the tenant code is modified, the original resource needs to be copied to the new tenant.
*/
if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode())
&& PropertyUtils.getResUploadStartupState()) {
storageOperate.createTenantDirIfNotExists(tenantCode);
}
int update = tenantMapper.updateById(updateTenant);
if (update > 0) {
logger.info("Tenant is updated and id is {}.", updateTenant.getId());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
putMsg(result, Status.SUCCESS);
} else {
logger.error("Tenant update error, id:{}.", updateTenant.getId());
putMsg(result, Status.UPDATE_TENANT_ERROR);
}
return result;
}
/**
* delete tenant
*
* @param loginUser login user
* @param id tenant id
* @return delete result code
* @throws Exception exception
*/
@Override
@Transactional
public Map<String, Object> deleteTenantById(User loginUser, int id) throws Exception {
Map<String, Object> result = new HashMap<>();
if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_DELETE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
Tenant tenant = tenantMapper.queryById(id);
if (Objects.isNull(tenant)) {
logger.error("Tenant does not exist, userId:{}.", id);
throw new ServiceException(Status.TENANT_NOT_EXIST);
}
List<ProcessInstance> processInstances = getProcessInstancesByTenant(tenant);
if (CollectionUtils.isNotEmpty(processInstances)) {
logger.warn("Delete tenant failed, because there are {} executing process instances using it.",
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
processInstances.size());
throw new ServiceException(Status.DELETE_TENANT_BY_ID_FAIL, processInstances.size());
}
List<ProcessDefinition> processDefinitions =
processDefinitionMapper.queryDefinitionListByTenant(tenant.getId());
if (CollectionUtils.isNotEmpty(processDefinitions)) {
logger.warn("Delete tenant failed, because there are {} process definitions using it.",
processDefinitions.size());
throw new ServiceException(Status.DELETE_TENANT_BY_ID_FAIL_DEFINES, processDefinitions.size());
}
List<User> userList = userMapper.queryUserListByTenant(tenant.getId());
if (CollectionUtils.isNotEmpty(userList)) {
logger.warn("Delete tenant failed, because there are {} users using it.", userList.size());
throw new ServiceException(Status.DELETE_TENANT_BY_ID_FAIL_USERS, userList.size());
}
if (PropertyUtils.getResUploadStartupState()) {
storageOperate.deleteTenant(tenant.getTenantCode());
}
int delete = tenantMapper.deleteById(id);
if (delete > 0) {
processInstanceMapper.updateProcessInstanceByTenantId(id, -1);
logger.info("Tenant is deleted and id is {}.", id);
putMsg(result, Status.SUCCESS);
} else {
logger.error("Tenant delete failed, tenantId:{}.", id);
putMsg(result, Status.DELETE_TENANT_BY_ID_ERROR);
}
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
private List<ProcessInstance> getProcessInstancesByTenant(Tenant tenant) {
return processInstanceMapper.queryByTenantIdAndStatus(tenant.getId(),
org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
}
/**
* query tenant list
*
* @param loginUser login user
* @return tenant list
*/
@Override
public Map<String, Object> queryTenantList(User loginUser) {
Map<String, Object> result = new HashMap<>();
Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT,
loginUser.getId(), logger);
if (ids.isEmpty()) {
result.put(Constants.DATA_LIST, Collections.emptyList());
putMsg(result, Status.SUCCESS);
return result;
}
List<Tenant> resourceList = tenantMapper.selectBatchIds(ids);
result.put(Constants.DATA_LIST, resourceList);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* verify tenant code
*
* @param tenantCode tenant code
* @return true if tenant code can use, otherwise return false
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
*/
@Override
public Result<Object> verifyTenantCode(String tenantCode) {
Result<Object> result = new Result<>();
if (checkTenantExists(tenantCode)) {
throw new ServiceException(Status.OS_TENANT_CODE_EXIST, tenantCode);
}
putMsg(result, Status.SUCCESS);
return result;
}
/**
* check tenant exists
*
* @param tenantCode tenant code
* @return ture if the tenant code exists, otherwise return false
*/
private boolean checkTenantExists(String tenantCode) {
Boolean existTenant = tenantMapper.existTenant(tenantCode);
return Boolean.TRUE.equals(existTenant);
}
/**
* query tenant by tenant code
*
* @param tenantCode tenant code
* @return tenant detail information
*/
@Override
public Map<String, Object> queryByTenantCode(String tenantCode) {
Map<String, Object> result = new HashMap<>();
Tenant tenant = tenantMapper.queryByTenantCode(tenantCode);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,425 |
[Bug] [API] If Storge exception, ds can create tenant, but show cannot.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When we create a new tenant, but storge has some exception such as connect refuse. The UI alert will show create tenant failed, but it will be created in DB and can show in UI. And then use cannot delete this wrong tenant, because cannot delete it in storge.
But due to my PC env, i cannot show the screenshot. But we can check the source code.
**_Create:_**
**_Delete:_**
### What you expected to happen
If db or storge has exception, ds cannot create a tenant.
### How to reproduce
1. Config the `resource.storage.type=HDFS`
2. Create a new tenant
3. Delete this new tenant.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12425
|
https://github.com/apache/dolphinscheduler/pull/12445
|
b5193ee4e50e5d0b7464eab3ee331a858151540c
|
1384d8f4fa90c9edfbbbd57ae914b7b6840d2b43
| 2022-10-18T14:09:29Z |
java
| 2022-10-22T03:33:17Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
|
if (tenant != null) {
result.put(Constants.DATA_LIST, tenant);
putMsg(result, Status.SUCCESS);
}
return result;
}
/**
* Make sure tenant with given name exists, and create the tenant if not exists
*
* ONLY for python gateway server, and should not use this in web ui function
*
* @param tenantCode tenant code
* @param desc The description of tenant object
* @param queue The value of queue which current tenant belong
* @param queueName The name of queue which current tenant belong
* @return Tenant object
*/
@Override
public Tenant createTenantIfNotExists(String tenantCode, String desc, String queue, String queueName) {
if (checkTenantExists(tenantCode)) {
return tenantMapper.queryByTenantCode(tenantCode);
}
Queue queueObj = queueService.createQueueIfNotExists(queue, queueName);
Tenant tenant = new Tenant(tenantCode, desc, queueObj.getId());
createTenantValid(tenant);
tenantMapper.insert(tenant);
return tenant;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
|
/*
* 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.api.k8s;
import org.apache.dolphinscheduler.api.utils.ClusterConfUtils;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
import java.util.Hashtable;
import java.util.Map;
import org.slf4j.Logger;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
|
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
/**
* use multiple environment feature
*/
@Component
public class K8sManager {
private static final Logger logger = LoggerFactory.getLogger(K8sManager.class);
/**
* cache k8s client
*/
private static Map<Long, KubernetesClient> clientMap = new Hashtable<>();
@Autowired
private ClusterMapper clusterMapper;
/**
* get k8s client for api use
*
* @param clusterCode
* @return
*/
public synchronized KubernetesClient getK8sClient(Long clusterCode) throws RemotingException {
if (null == clusterCode) {
return null;
}
return getAndUpdateK8sClient(clusterCode, false);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
|
/**
* @param clusterCode
* @return new client if need updated
*/
public synchronized KubernetesClient getAndUpdateK8sClient(Long clusterCode,
boolean update) throws RemotingException {
if (null == clusterCode) {
return null;
}
if (update) {
deleteK8sClientInner(clusterCode);
}
if (clientMap.containsKey(clusterCode)) {
return clientMap.get(clusterCode);
} else {
createK8sClientInner(clusterCode);
}
return clientMap.get(clusterCode);
}
private void deleteK8sClientInner(Long clusterCode) {
if (clusterCode == null) {
return;
}
Cluster cluster = clusterMapper.queryByClusterCode(clusterCode);
if (cluster == null) {
return;
}
KubernetesClient client = clientMap.get(clusterCode);
if (client != null) {
client.close();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
|
}
}
private void createK8sClientInner(Long clusterCode) throws RemotingException {
Cluster cluster = clusterMapper.queryByClusterCode(clusterCode);
if (cluster == null) {
return;
}
String k8sConfig = ClusterConfUtils.getK8sConfig(cluster.getConfig());
if (k8sConfig != null) {
DefaultKubernetesClient client = null;
try {
client = getClient(k8sConfig);
clientMap.put(clusterCode, client);
} catch (RemotingException e) {
logger.error("cluster code ={},fail to get k8s ApiClient: {}", clusterCode, e.getMessage());
throw new RemotingException("fail to get k8s ApiClient:" + e.getMessage());
}
}
}
private DefaultKubernetesClient getClient(String configYaml) throws RemotingException {
try {
Config config = Config.fromKubeconfig(configYaml);
return new DefaultKubernetesClient(config);
} catch (Exception e) {
logger.error("Fail to get k8s ApiClient", e);
throw new RemotingException("fail to get k8s ApiClient:" + e.getMessage());
}
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
/*
* 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
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
* 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.api.service.impl;
import org.apache.dolphinscheduler.api.dto.ClusterDto;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.k8s.K8sManager;
import org.apache.dolphinscheduler.api.service.ClusterService;
import org.apache.dolphinscheduler.api.utils.ClusterConfUtils;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* cluster definition service impl
*/
@Service
public class ClusterServiceImpl extends BaseServiceImpl implements ClusterService {
private static final Logger logger = LoggerFactory.getLogger(ClusterServiceImpl.class);
@Autowired
private ClusterMapper clusterMapper;
@Autowired
private K8sManager k8sManager;
@Autowired
private K8sNamespaceMapper k8sNamespaceMapper;
/**
* create cluster
*
* @param loginUser login user
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
* @param name cluster name
* @param config cluster config
* @param desc cluster desc
*/
@Transactional
@Override
public Map<String, Object> createCluster(User loginUser, String name, String config, String desc) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
logger.warn("Only admin can create cluster, current login user name:{}.", loginUser.getUserName());
return result;
}
Map<String, Object> checkResult = checkParams(name, config);
if (checkResult.get(Constants.STATUS) != Status.SUCCESS) {
return checkResult;
}
Cluster clusterExistByName = clusterMapper.queryByClusterName(name);
if (clusterExistByName != null) {
logger.warn("Cluster with the same name already exists, clusterName:{}.", clusterExistByName.getName());
putMsg(result, Status.CLUSTER_NAME_EXISTS, name);
return result;
}
Cluster cluster = new Cluster();
cluster.setName(name);
cluster.setConfig(config);
cluster.setDescription(desc);
cluster.setOperator(loginUser.getId());
cluster.setCreateTime(new Date());
cluster.setUpdateTime(new Date());
long code = 0L;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
try {
code = CodeGenerateUtils.getInstance().genCode();
cluster.setCode(code);
} catch (CodeGenerateException e) {
logger.error("Generate cluster code error.", e);
}
if (code == 0L) {
putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS, "Error generating cluster code");
return result;
}
if (clusterMapper.insert(cluster) > 0) {
logger.info("Cluster create complete, clusterName:{}.", cluster.getName());
result.put(Constants.DATA_LIST, cluster.getCode());
putMsg(result, Status.SUCCESS);
} else {
logger.error("Cluster create error, clusterName:{}.", cluster.getName());
putMsg(result, Status.CREATE_CLUSTER_ERROR);
}
return result;
}
/**
* query cluster paging
*
* @param pageNo page number
* @param searchVal search value
* @param pageSize page size
* @return cluster list page
*/
@Override
public Result queryClusterListPaging(Integer pageNo, Integer pageSize, String searchVal) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
Result result = new Result();
Page<Cluster> page = new Page<>(pageNo, pageSize);
IPage<Cluster> clusterIPage = clusterMapper.queryClusterListPaging(page, searchVal);
PageInfo<ClusterDto> pageInfo = new PageInfo<>(pageNo, pageSize);
pageInfo.setTotal((int) clusterIPage.getTotal());
if (CollectionUtils.isNotEmpty(clusterIPage.getRecords())) {
List<ClusterDto> dtoList = clusterIPage.getRecords().stream().map(cluster -> {
ClusterDto dto = new ClusterDto();
BeanUtils.copyProperties(cluster, dto);
return dto;
}).collect(Collectors.toList());
pageInfo.setTotalList(dtoList);
} else {
pageInfo.setTotalList(new ArrayList<>());
}
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query all cluster
*
* @return all cluster list
*/
@Override
public Map<String, Object> queryAllClusterList() {
Map<String, Object> result = new HashMap<>();
List<Cluster> clusterList = clusterMapper.queryAllClusterList();
if (CollectionUtils.isNotEmpty(clusterList)) {
List<ClusterDto> dtoList = clusterList.stream().map(cluster -> {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
ClusterDto dto = new ClusterDto();
BeanUtils.copyProperties(cluster, dto);
return dto;
}).collect(Collectors.toList());
result.put(Constants.DATA_LIST, dtoList);
} else {
result.put(Constants.DATA_LIST, new ArrayList<>());
}
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query cluster
*
* @param code cluster code
*/
@Override
public Map<String, Object> queryClusterByCode(Long code) {
Map<String, Object> result = new HashMap<>();
Cluster cluster = clusterMapper.queryByClusterCode(code);
if (cluster == null) {
putMsg(result, Status.QUERY_CLUSTER_BY_CODE_ERROR, code);
} else {
ClusterDto dto = new ClusterDto();
BeanUtils.copyProperties(cluster, dto);
result.put(Constants.DATA_LIST, dto);
putMsg(result, Status.SUCCESS);
}
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
/**
* query cluster
*
* @param name cluster name
*/
@Override
public Map<String, Object> queryClusterByName(String name) {
Map<String, Object> result = new HashMap<>();
Cluster cluster = clusterMapper.queryByClusterName(name);
if (cluster == null) {
logger.warn("Cluster does not exist, name:{}.", name);
putMsg(result, Status.QUERY_CLUSTER_BY_NAME_ERROR, name);
} else {
ClusterDto dto = new ClusterDto();
BeanUtils.copyProperties(cluster, dto);
result.put(Constants.DATA_LIST, dto);
putMsg(result, Status.SUCCESS);
}
return result;
}
/**
* delete cluster
*
* @param loginUser login user
* @param code cluster code
*/
@Transactional
@Override
public Map<String, Object> deleteClusterByCode(User loginUser, Long code) {
Map<String, Object> result = new HashMap<>();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
if (isNotAdmin(loginUser, result)) {
logger.warn("Only admin can delete cluster, current login user name:{}.", loginUser.getUserName());
return result;
}
Long relatedNamespaceNumber = k8sNamespaceMapper
.selectCount(new QueryWrapper<K8sNamespace>().lambda().eq(K8sNamespace::getClusterCode, code));
if (relatedNamespaceNumber > 0) {
logger.warn("Delete cluster failed because {} namespace(s) is(are) using it, clusterCode:{}.",
relatedNamespaceNumber, code);
putMsg(result, Status.DELETE_CLUSTER_RELATED_NAMESPACE_EXISTS);
return result;
}
int delete = clusterMapper.deleteByCode(code);
if (delete > 0) {
logger.info("Delete cluster complete, clusterCode:{}.", code);
putMsg(result, Status.SUCCESS);
} else {
logger.error("Delete cluster error, clusterCode:{}.", code);
putMsg(result, Status.DELETE_CLUSTER_ERROR);
}
return result;
}
/**
* update cluster
*
* @param loginUser login user
* @param code cluster code
* @param name cluster name
* @param config cluster config
* @param desc cluster desc
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
*/
@Transactional
@Override
public Map<String, Object> updateClusterByCode(User loginUser, Long code, String name, String config, String desc) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
logger.warn("Only admin can update cluster, current login user name:{}.", loginUser.getUserName());
return result;
}
if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}
Map<String, Object> checkResult = checkParams(name, config);
if (checkResult.get(Constants.STATUS) != Status.SUCCESS) {
return checkResult;
}
Cluster clusterExistByName = clusterMapper.queryByClusterName(name);
if (clusterExistByName != null && !clusterExistByName.getCode().equals(code)) {
logger.warn("Cluster with the same name already exists, name:{}.", clusterExistByName.getName());
putMsg(result, Status.CLUSTER_NAME_EXISTS, name);
return result;
}
Cluster clusterExist = clusterMapper.queryByClusterCode(code);
if (clusterExist == null) {
logger.error("Cluster does not exist, code:{}.", code);
putMsg(result, Status.CLUSTER_NOT_EXISTS, name);
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
if (!Constants.K8S_LOCAL_TEST_CLUSTER_CODE.equals(clusterExist.getCode())
&& !config.equals(ClusterConfUtils.getK8sConfig(clusterExist.getConfig()))) {
try {
k8sManager.getAndUpdateK8sClient(code, true);
} catch (RemotingException e) {
logger.error("Update K8s error.", e);
putMsg(result, Status.K8S_CLIENT_OPS_ERROR, name);
return result;
}
}
clusterExist.setConfig(config);
clusterExist.setName(name);
clusterExist.setDescription(desc);
clusterMapper.updateById(clusterExist);
logger.info("Cluster update complete, clusterId:{}.", clusterExist.getId());
putMsg(result, Status.SUCCESS);
return result;
}
/**
* verify cluster name
*
* @param clusterName cluster name
* @return true if the cluster name not exists, otherwise return false
*/
@Override
public Map<String, Object> verifyCluster(String clusterName) {
Map<String, Object> result = new HashMap<>();
if (StringUtils.isEmpty(clusterName)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
|
logger.warn("Parameter cluster name is empty.");
putMsg(result, Status.CLUSTER_NAME_IS_NULL);
return result;
}
Cluster cluster = clusterMapper.queryByClusterName(clusterName);
if (cluster != null) {
logger.warn("Cluster with the same name already exists, name:{}.", cluster.getName());
putMsg(result, Status.CLUSTER_NAME_EXISTS, clusterName);
return result;
}
result.put(Constants.STATUS, Status.SUCCESS);
return result;
}
public Map<String, Object> checkParams(String name, String config) {
Map<String, Object> result = new HashMap<>();
if (StringUtils.isEmpty(name)) {
logger.warn("Parameter cluster name is empty.");
putMsg(result, Status.CLUSTER_NAME_IS_NULL);
return result;
}
if (StringUtils.isEmpty(config)) {
logger.warn("Parameter cluster config is empty.");
putMsg(result, Status.CLUSTER_CONFIG_IS_NULL);
return result;
}
result.put(Constants.STATUS, Status.SUCCESS);
return result;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
/*
* 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.
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*/
package org.apache.dolphinscheduler.service.process;
import static java.util.stream.Collectors.toSet;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_EMPTY_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.constants.Constants.LOCAL_PARAMS;
import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR;
import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN;
import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConstants.TASK_INSTANCE_ID;
import org.apache.dolphinscheduler.common.constants.CommandKeyConstants;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.DagData;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.DqComparisonType;
import org.apache.dolphinscheduler.dao.entity.DqExecuteResult;
import org.apache.dolphinscheduler.dao.entity.DqRule;
import org.apache.dolphinscheduler.dao.entity.DqRuleExecuteSql;
import org.apache.dolphinscheduler.dao.entity.DqRuleInputEntry;
import org.apache.dolphinscheduler.dao.entity.DqTaskStatisticsValue;
import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.DqComparisonTypeMapper;
import org.apache.dolphinscheduler.dao.mapper.DqExecuteResultMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleExecuteSqlMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleInputEntryMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper;
import org.apache.dolphinscheduler.dao.mapper.DqTaskStatisticsValueMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.mapper.WorkFlowLineageMapper;
import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
import org.apache.dolphinscheduler.dao.utils.DqRuleUtils;
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState;
import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SubProcessParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter;
import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand;
import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.command.CommandService;
import org.apache.dolphinscheduler.service.cron.CronUtils;
import org.apache.dolphinscheduler.service.exceptions.CronParseException;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.expand.CuringParamsService;
import org.apache.dolphinscheduler.service.log.LogClient;
import org.apache.dolphinscheduler.service.model.TaskNode;
import org.apache.dolphinscheduler.service.task.TaskPluginManager;
import org.apache.dolphinscheduler.service.utils.DagHelper;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.collections.CollectionUtils;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.commons.collections.MapUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
/**
* process relative dao that some mappers in this.
*/
@Component
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
public class ProcessServiceImpl implements ProcessService {
private final Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private UserMapper userMapper;
@Autowired
private ProcessDefinitionMapper processDefineMapper;
@Autowired
private ProcessDefinitionLogMapper processDefineLogMapper;
@Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private ProcessInstanceDao processInstanceDao;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper;
@Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private DqExecuteResultMapper dqExecuteResultMapper;
@Autowired
private DqRuleMapper dqRuleMapper;
@Autowired
private DqRuleInputEntryMapper dqRuleInputEntryMapper;
@Autowired
private DqRuleExecuteSqlMapper dqRuleExecuteSqlMapper;
@Autowired
private DqComparisonTypeMapper dqComparisonTypeMapper;
@Autowired
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
private DqTaskStatisticsValueMapper dqTaskStatisticsValueMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
private ProcessTaskRelationMapper processTaskRelationMapper;
@Autowired
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
StateEventCallbackService stateEventCallbackService;
@Autowired
private EnvironmentMapper environmentMapper;
@Autowired
private TaskGroupQueueMapper taskGroupQueueMapper;
@Autowired
private TaskGroupMapper taskGroupMapper;
@Autowired
private WorkFlowLineageMapper workFlowLineageMapper;
@Autowired
private TaskPluginManager taskPluginManager;
@Autowired
private ClusterMapper clusterMapper;
@Autowired
private CuringParamsService curingGlobalParamsService;
@Autowired
private LogClient logClient;
@Autowired
private CommandService commandService;
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param host host
* @param command found command
* @return process instance
*/
@Override
@Transactional
public ProcessInstance handleCommand(String host,
Command command) throws CronParseException, CodeGenerateException {
ProcessInstance processInstance = constructProcessInstance(command, host);
if (processInstance == null) {
logger.error("scan command, command parameter is error: {}", command);
commandService.moveToErrorCommand(command, "process instance is null");
return null;
}
processInstance.setCommandType(command.getCommandType());
processInstance.addHistoryCmd(command.getCommandType());
processInstance.setTestFlag(command.getTestFlag());
ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (processDefinition.getExecutionType().typeIsSerial()) {
saveSerialProcess(processInstance, processDefinition);
if (processInstance.getState() != WorkflowExecutionStatus.SUBMITTED_SUCCESS) {
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return null;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
} else {
processInstanceDao.upsertProcessInstance(processInstance);
}
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return processInstance;
}
protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.SERIAL_WAIT, "wait by serial_wait strategy");
processInstanceDao.upsertProcessInstance(processInstance);
if (processDefinition.getExecutionType().typeIsSerialWait()) {
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.SUBMITTED_SUCCESS,
"submit from serial_wait strategy");
processInstanceDao.upsertProcessInstance(processInstance);
}
} else if (processDefinition.getExecutionType().typeIsSerialDiscard()) {
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.getId());
if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.STOP, "stop by serial_discard strategy");
processInstanceDao.upsertProcessInstance(processInstance);
return;
}
processInstance.setStateWithDesc(WorkflowExecutionStatus.SUBMITTED_SUCCESS,
"submit from serial_discard strategy");
processInstanceDao.upsertProcessInstance(processInstance);
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
processInstance.getId());
for (ProcessInstance info : runningProcessInstances) {
info.setCommandType(CommandType.STOP);
info.addHistoryCmd(CommandType.STOP);
info.setStateWithDesc(WorkflowExecutionStatus.READY_STOP, "ready stop by serial_priority strategy");
int update = processInstanceDao.updateProcessInstance(info);
if (update > 0) {
WorkflowStateEventChangeCommand workflowStateEventChangeCommand =
new WorkflowStateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0);
try {
Host host = new Host(info.getHost());
stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command());
} catch (Exception e) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
logger.error("sendResultError", e);
}
}
}
processInstance.setStateWithDesc(WorkflowExecutionStatus.SUBMITTED_SUCCESS,
"submit by serial_priority strategy");
processInstanceDao.upsertProcessInstance(processInstance);
}
}
/**
* find process instance detail by id
*
* @param processId processId
* @return process instance
*/
@Override
public Optional<ProcessInstance> findProcessInstanceDetailById(int processId) {
return Optional.ofNullable(processInstanceMapper.queryDetailById(processId));
}
/**
* get task node list by definitionId
*/
@Override
public List<TaskDefinition> getTaskNodeListByDefinition(long defineCode) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(defineCode);
if (processDefinition == null) {
logger.error("process define not exists");
return Lists.newArrayList();
}
List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(),
processTaskRelation.getPostTaskVersion()));
}
}
if (taskDefinitionSet.isEmpty()) {
return Lists.newArrayList();
}
List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
return Lists.newArrayList(taskDefinitionLogs);
}
/**
* find process instance by id
*
* @param processId processId
* @return process instance
*/
@Override
public ProcessInstance findProcessInstanceById(int processId) {
return processInstanceMapper.selectById(processId);
}
/**
* find process define by id.
*
* @param processDefinitionId processDefinitionId
* @return process definition
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Override
public ProcessDefinition findProcessDefineById(int processDefinitionId) {
return processDefineMapper.selectById(processDefinitionId);
}
/**
* find process define by code and version.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
@Override
public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || processDefinition.getVersion() != version) {
processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version);
if (processDefinition != null) {
processDefinition.setId(0);
}
}
return processDefinition;
}
/**
* find process define by code.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
@Override
public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) {
return processDefineMapper.queryByCode(processDefinitionCode);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
/**
* delete work process instance by id
*
* @param processInstanceId processInstanceId
* @return delete process instance result
*/
@Override
public int deleteWorkProcessInstanceById(int processInstanceId) {
return processInstanceMapper.deleteById(processInstanceId);
}
/**
* delete all sub process by parent instance id
*
* @param processInstanceId processInstanceId
* @return delete all sub process instance result
*/
@Override
public int deleteAllSubWorkProcessByParentId(int processInstanceId) {
List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId);
for (Integer subId : subProcessIdList) {
deleteAllSubWorkProcessByParentId(subId);
deleteWorkProcessMapByParentId(subId);
removeTaskLogFile(subId);
deleteWorkProcessInstanceById(subId);
}
return 1;
}
/**
* remove task log file
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*
* @param processInstanceId processInstanceId
*/
@Override
public void removeTaskLogFile(Integer processInstanceId) {
ProcessInstance processInstance = processInstanceMapper.selectById(processInstanceId);
List<TaskInstance> taskInstanceList =
findValidTaskListByProcessId(processInstanceId, processInstance.getTestFlag());
if (CollectionUtils.isEmpty(taskInstanceList)) {
return;
}
for (TaskInstance taskInstance : taskInstanceList) {
String taskLogPath = taskInstance.getLogPath();
if (Strings.isNullOrEmpty(taskInstance.getHost())) {
continue;
}
Host host = Host.of(taskInstance.getHost());
logClient.removeTaskLog(host.getIp(), host.getPort(), taskLogPath);
}
}
/**
* recursive delete all task instance by process instance id
*/
@Override
public void deleteWorkTaskInstanceByProcessInstanceId(int processInstanceId) {
ProcessInstance processInstance = processInstanceMapper.selectById(processInstanceId);
List<TaskInstance> taskInstanceList =
findValidTaskListByProcessId(processInstanceId, processInstance.getTestFlag());
if (CollectionUtils.isEmpty(taskInstanceList)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return;
}
List<Integer> taskInstanceIdList = new ArrayList<>();
for (TaskInstance taskInstance : taskInstanceList) {
taskInstanceIdList.add(taskInstance.getId());
}
taskInstanceMapper.deleteBatchIds(taskInstanceIdList);
}
/**
* recursive query sub process definition id by parent id.
*
* @param parentCode parentCode
* @param ids ids
*/
@Override
public void recurseFindSubProcess(long parentCode, List<Long> ids) {
List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinition(parentCode);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionCode());
recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids);
}
}
}
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map
* @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) throws CronParseException {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMD_PARAM_COMPLEMENT_DATA_START_DATE)) {
Date start = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> schedules =
queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules);
if (CollectionUtils.isNotEmpty(complementDateList)) {
scheduleTime = complementDateList.get(0);
} else {
logger.error("set scheduler time error: complement date list is empty, command: {}",
command.toString());
}
}
return scheduleTime;
}
/**
* generate a new work process instance from command.
*
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command,
Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION, "init running");
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRestartTime(null);
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam());
processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
processInstance.setWarningGroupId(warningGroupId);
processInstance.setDryRun(command.getDryRun());
processInstance.setTestFlag(command.getTestFlag());
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setCommandStartTime(command.getStartTime());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.setLocations(processDefinition.getLocations());
setGlobalParamIfCommanded(processDefinition, cmdParam);
Map<String, String> commandParamMap = JSONUtils.toMap(command.getCommandParam());
String timezoneId = null;
if (commandParamMap != null) {
timezoneId = commandParamMap.get(Constants.SCHEDULE_TIMEZONE);
}
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
getCommandTypeIfComplement(processInstance, command),
processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
String workerGroup = Strings.isNullOrEmpty(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP
: command.getWorkerGroup();
processInstance.setWorkerGroup(workerGroup);
processInstance
.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode());
processInstance.setTimeout(processDefinition.getTimeout());
processInstance.setTenantId(processDefinition.getTenantId());
return processInstance;
}
private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
Map<String, String> startParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_START_PARAMS)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
String startParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtils.toMap(startParamJson);
}
Map<String, String> fatherParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS)) {
String fatherParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtils.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
Map<String, String> globalMap = processDefinition.getGlobalParamMap();
List<Property> globalParamList = processDefinition.getGlobalParamList();
if (MapUtils.isNotEmpty(startParamMap) && globalMap != null) {
for (Map.Entry<String, String> param : globalMap.entrySet()) {
String val = startParamMap.get(param.getKey());
if (val != null) {
param.setValue(val);
}
}
for (Entry<String, String> startParam : startParamMap.entrySet()) {
if (!globalMap.containsKey(startParam.getKey())) {
globalMap.put(startParam.getKey(), startParam.getValue());
globalParamList.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue()));
}
}
}
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* get process tenant
* there is tenant id in definition, use the tenant of the definition.
* if there is not tenant id in the definiton or the tenant not exist
* use definition creator's tenant.
*
* @param tenantId tenantId
* @param userId userId
* @return tenant
*/
@Override
public Tenant getTenantForProcess(int tenantId, int userId) {
Tenant tenant = null;
if (tenantId >= 0) {
tenant = tenantMapper.queryById(tenantId);
}
if (userId == 0) {
return null;
}
if (tenant == null) {
User user = userMapper.selectById(userId);
tenant = tenantMapper.queryById(user.getTenantId());
}
return tenant;
}
/**
* get an environment
* use the code of the environment to find a environment.
*
* @param environmentCode environmentCode
* @return Environment
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*/
@Override
public Environment findEnvironmentByCode(Long environmentCode) {
Environment environment = null;
if (environmentCode >= 0) {
environment = environmentMapper.queryByEnvironmentCode(environmentCode);
}
return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid
*/
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY
|| command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_START_NODES)
|| cmdParam.get(CommandKeyConstants.CMD_PARAM_START_NODES).isEmpty()) {
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
return true;
}
/**
* construct process instance according to one command.
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*
* @param command command
* @param host host
* @return process instance
*/
protected @Nullable ProcessInstance constructProcessInstance(Command command,
String host) throws CronParseException, CodeGenerateException {
ProcessInstance processInstance;
ProcessDefinition processDefinition;
CommandType commandType = command.getCommandType();
processDefinition =
this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinition == null) {
logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode());
throw new IllegalArgumentException("Cannot find the process definition for this workflowInstance");
}
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
if (cmdParam == null) {
cmdParam = new HashMap<>();
}
int processInstanceId = command.getProcessInstanceId();
if (processInstanceId == 0) {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
} else {
processInstance = this.findProcessInstanceDetailById(processInstanceId).orElse(null);
if (processInstance == null) {
return null;
}
}
CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) {
setGlobalParamIfCommanded(processDefinition, cmdParam);
}
String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
commandTypeIfComplement,
processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
processInstance.setProcessDefinition(processDefinition);
if (processInstance.getCommandParam() != null) {
Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam());
Map<String, String> finalCmdParam = cmdParam;
processCmdParam.forEach((key, value) -> {
if (!finalCmdParam.containsKey(key)) {
finalCmdParam.put(key, value);
}
});
}
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_SUB_PROCESS)) {
processInstance.setCommandParam(command.getCommandParam());
}
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
logger.error("command parameter check failed!");
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return null;
}
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setHost(host);
processInstance.setRestartTime(new Date());
WorkflowExecutionStatus runStatus = WorkflowExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType) {
case START_PROCESS:
break;
case START_FAILURE_TASK_PROCESS:
List<Integer> failedList =
this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.FAILURE);
List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(),
TaskExecutionStatus.NEED_FAULT_TOLERANCE);
List<Integer> killedList =
this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.KILL);
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
failedList.addAll(killedList);
failedList.addAll(toleranceList);
for (Integer taskId : failedList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(failedList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
break;
case START_CURRENT_TASK_PROCESS:
break;
case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
TaskExecutionStatus.KILL);
for (Integer taskId : stopNodeList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(stopNodeList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
processInstance.setRecovery(Flag.YES);
processInstance.setRunTimes(runTime + 1);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA:
if (processInstance.getId() != null) {
List<TaskInstance> taskInstanceList =
this.findValidTaskListByProcessId(processInstance.getId(), processInstance.getTestFlag());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
for (TaskInstance taskInstance : taskInstanceList) {
taskInstance.setFlag(Flag.NO);
this.updateTaskInstance(taskInstance);
}
}
break;
case REPEAT_RUNNING:
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
}
List<TaskInstance> validTaskList =
findValidTaskListByProcessId(processInstance.getId(), processInstance.getTestFlag());
for (TaskInstance taskInstance : validTaskList) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
}
processInstance.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
default:
break;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.setStateWithDesc(runStatus, commandType.getDescp());
return processInstance;
}
/**
* get process definition by command
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance
* Otherwise, get the latest version of ProcessDefinition
*
* @return ProcessDefinition
*/
private @Nullable ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode,
Map<String, String> cmdParam) {
if (cmdParam != null) {
int processInstanceId = 0;
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
processInstanceId =
Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING));
} else if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_SUB_PROCESS)) {
processInstanceId = Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_SUB_PROCESS));
} else if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
processInstanceId =
Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_RECOVERY_WAITING_THREAD));
}
if (processInstanceId != 0) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId).orElse(null);
if (processInstance == null) {
return null;
}
return processDefineLogMapper.queryByDefinitionCodeAndVersion(
processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
}
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* return complement data if the process start with complement data
*
* @param processInstance processInstance
* @param command command
* @return command type
*/
private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) {
return CommandType.COMPLEMENT_DATA;
} else {
return command.getCommandType();
}
}
/**
* initialize complement data parameters
*
* @param processDefinition processDefinition
* @param processInstance processInstance
* @param cmdParam cmdParam
*/
private void initComplementDataParam(ProcessDefinition processDefinition,
ProcessInstance processInstance,
Map<String, String> cmdParam) throws CronParseException {
if (!processInstance.isComplementData()) {
return;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
Date start = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
List<Date> complementDate = Lists.newLinkedList();
if (start != null && end != null) {
List<Schedule> listSchedules =
queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode());
complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules);
}
if (cmdParam.containsKey(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) {
complementDate = CronUtils.getSelfScheduleDateList(cmdParam);
}
if (CollectionUtils.isNotEmpty(complementDate) && Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(complementDate.get(0));
}
String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
}
/**
* set sub work process parameters.
* handle sub work process instance, update relation table and command parameters
* set sub work process flag, extends parent work process command parameters
*
* @param subProcessInstance subProcessInstance
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Override
public void setSubProcessParam(ProcessInstance subProcessInstance) {
String cmdParam = subProcessInstance.getCommandParam();
if (Strings.isNullOrEmpty(cmdParam)) {
return;
}
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
paramMap.remove(CMD_PARAM_SUB_PROCESS);
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
subProcessInstance.setIsSubProcess(Flag.YES);
processInstanceDao.upsertProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (!Strings.isNullOrEmpty(parentInstanceId)) {
ProcessInstance parentInstance =
findProcessInstanceDetailById(Integer.parseInt(parentInstanceId)).orElse(null);
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
subProcessInstance
.setVarPool(joinVarPool(parentInstance.getVarPool(), subProcessInstance.getVarPool()));
processInstanceDao.upsertProcessInstance(subProcessInstance);
} else {
logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class);
if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) {
return;
}
processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
this.updateWorkProcessInstanceMap(processInstanceMap);
}
/**
* join parent global params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentGlobalParams parentGlobalParams
* @param subGlobalParams subGlobalParams
* @return global params join
*/
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentParams = Lists.newArrayList(JSONUtils.toList(parentGlobalParams, Property.class));
List<Property> subParams = JSONUtils.toList(subGlobalParams, Property.class);
Set<String> parentParamKeys = parentParams.stream().map(Property::getProp).collect(toSet());
List<Property> extraSubParams = subParams.stream()
.filter(subProp -> !parentParamKeys.contains(subProp.getProp())).collect(Collectors.toList());
parentParams.addAll(extraSubParams);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return JSONUtils.toJsonString(parentParams);
}
/**
* join parent var pool params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentValPool
* @param subValPool
* @return
*/
private String joinVarPool(String parentValPool, String subValPool) {
List<Property> parentValPools = Lists.newArrayList(JSONUtils.toList(parentValPool, Property.class));
parentValPools = parentValPools.stream().filter(valPool -> valPool.getDirect() == Direct.OUT)
.collect(Collectors.toList());
List<Property> subValPools = Lists.newArrayList(JSONUtils.toList(subValPool, Property.class));
Set<String> parentValPoolKeys = parentValPools.stream().map(Property::getProp).collect(toSet());
List<Property> extraSubValPools = subValPools.stream().filter(sub -> !parentValPoolKeys.contains(sub.getProp()))
.collect(Collectors.toList());
parentValPools.addAll(extraSubValPools);
return JSONUtils.toJsonString(parentValPools);
}
/**
* initialize task instance
*
* @param taskInstance taskInstance
*/
private void initTaskInstance(TaskInstance taskInstance) {
if (!taskInstance.isSubProcess()
&& (taskInstance.getState().isKill() || taskInstance.getState().isFailure())) {
taskInstance.setFlag(Flag.NO);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
updateTaskInstance(taskInstance);
return;
}
taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS);
updateTaskInstance(taskInstance);
}
/**
* retry submit task to db
*/
@Override
public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance,
int commitRetryTimes, long commitInterval) {
int retryTimes = 1;
TaskInstance task = null;
while (retryTimes <= commitRetryTimes) {
try {
task = submitTask(processInstance, taskInstance);
if (task != null && task.getId() != null) {
break;
}
logger.error(
"task commit to db failed , taskCode: {} has already retry {} times, please check the database",
taskInstance.getTaskCode(),
retryTimes);
Thread.sleep(commitInterval);
} catch (Exception e) {
logger.error("task commit to db failed", e);
} finally {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
retryTimes += 1;
}
}
return task;
}
/**
* // todo: This method need to refactor, we find when the db down, but the taskInstanceId is not 0. It's better to change to void, rather than return TaskInstance
* submit task to db
* submit sub process to command
*
* @param processInstance processInstance
* @param taskInstance taskInstance
* @return task instance
*/
@Override
@Transactional
public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) {
logger.info("Start save taskInstance to database : {}, processInstance id:{}, state: {}",
taskInstance.getName(),
taskInstance.getProcessInstanceId(),
processInstance.getState());
TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
if (task == null) {
logger.error("Save taskInstance to db error, task name:{}, process id:{} state: {} ",
taskInstance.getName(),
taskInstance.getProcessInstance().getId(),
processInstance.getState());
return null;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (!task.getState().isFinished()) {
createSubWorkProcess(processInstance, task);
}
logger.info(
"End save taskInstance to db successfully:{}, taskInstanceName: {}, taskInstance state:{}, processInstanceId:{}, processInstanceState: {}",
task.getId(),
task.getName(),
task.getState(),
processInstance.getId(),
processInstance.getState());
return task;
}
/**
* set work process instance map
* consider o
* repeat running does not generate new sub process instance
* set map {parent instance id, task instance id, 0(child instance id)}
*
* @param parentInstance parentInstance
* @param parentTask parentTask
* @param processMap processMap
* @return process instance map
*/
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask,
ProcessInstanceMap processMap) {
if (processMap != null) {
return processMap;
}
if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processMap = findPreviousTaskProcessMap(parentInstance, parentTask);
if (processMap != null) {
processMap.setParentTaskInstanceId(parentTask.getId());
updateWorkProcessInstanceMap(processMap);
return processMap;
}
}
processMap = new ProcessInstanceMap();
processMap.setParentProcessInstanceId(parentInstance.getId());
processMap.setParentTaskInstanceId(parentTask.getId());
createWorkProcessInstanceMap(processMap);
return processMap;
}
/**
* find previous task work process map.
*
* @param parentProcessInstance parentProcessInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
TaskInstance parentTask) {
Integer preTaskId = 0;
List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId());
for (TaskInstance task : preTaskList) {
if (task.getName().equals(parentTask.getName())) {
preTaskId = task.getId();
ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId);
if (map != null) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return map;
}
}
}
logger.info("sub process instance is not found,parent task:{},parent instance:{}",
parentTask.getId(), parentProcessInstance.getId());
return null;
}
/**
* create sub work process command
*
* @param parentProcessInstance parentProcessInstance
* @param task task
*/
@Override
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) {
if (!task.isSubProcess()) {
return;
}
ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId());
if (null != instanceMap
&& CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) {
return;
}
instanceMap = setProcessInstanceMap(parentProcessInstance, task, instanceMap);
ProcessInstance childInstance = null;
if (instanceMap.getProcessInstanceId() != 0) {
childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
if (childInstance != null && childInstance.getState() == WorkflowExecutionStatus.SUCCESS
&& CommandType.START_FAILURE_TASK_PROCESS == parentProcessInstance.getCommandType()) {
logger.info("sub process instance {} status is success, so skip creating command", childInstance.getId());
return;
}
Command subProcessCommand =
commandService.createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task);
if (subProcessCommand == null) {
logger.error("create sub process command failed, so skip creating command");
return;
}
updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode());
initSubInstanceState(childInstance);
commandService.createCommand(subProcessCommand);
logger.info("sub process command created: {} ", subProcessCommand);
}
/**
* initialize sub work flow state
* child instance state would be initialized when 'recovery from pause/stop/failure'
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
childInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION, "init sub workflow instance");
processInstanceDao.updateProcessInstance(childInstance);
}
}
/**
* get sub work flow command type
* child instance exist: child command = fatherCommand
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* child instance not exists: child command = fatherCommand[0]
*/
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
CommandType commandType = parentProcessInstance.getCommandType();
if (childInstance == null) {
String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]);
}
return commandType;
}
/**
* update sub process definition
*
* @param parentProcessInstance parentProcessInstance
* @param childDefinitionCode childDefinitionId
*/
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) {
ProcessDefinition fatherDefinition =
this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(),
parentProcessInstance.getProcessDefinitionVersion());
ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode);
if (childDefinition != null && fatherDefinition != null) {
childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId());
processDefineMapper.updateById(childDefinition);
}
}
/**
* submit task to mysql
*
* @param taskInstance taskInstance
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param processInstance processInstance
* @return task instance
*/
@Override
public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) {
WorkflowExecutionStatus processInstanceState = processInstance.getState();
if (processInstanceState.isFinished() || processInstanceState == WorkflowExecutionStatus.READY_STOP) {
logger.warn("processInstance: {} state was: {}, skip submit this task, taskCode: {}",
processInstance.getId(),
processInstanceState,
taskInstance.getTaskCode());
return null;
}
if (processInstanceState == WorkflowExecutionStatus.READY_PAUSE) {
taskInstance.setState(TaskExecutionStatus.PAUSE);
}
taskInstance.setExecutorId(processInstance.getExecutorId());
taskInstance.setState(getSubmitTaskState(taskInstance, processInstance));
if (taskInstance.getSubmitTime() == null) {
taskInstance.setSubmitTime(new Date());
}
if (taskInstance.getFirstSubmitTime() == null) {
taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime());
}
boolean saveResult = saveTaskInstance(taskInstance);
if (!saveResult) {
return null;
}
return taskInstance;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
/**
* get submit task instance state by the work process state
* cannot modify the task state when running/kill/submit success, or this
* task instance is already exists in task queue .
* return pause if work process state is ready pause
* return stop if work process state is ready stop
* if all of above are not satisfied, return submit success
*
* @param taskInstance taskInstance
* @param processInstance processInstance
* @return process instance state
*/
@Override
public TaskExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) {
TaskExecutionStatus state = taskInstance.getState();
if (state == TaskExecutionStatus.RUNNING_EXECUTION
|| state == TaskExecutionStatus.DELAY_EXECUTION
|| state == TaskExecutionStatus.KILL
|| state == TaskExecutionStatus.DISPATCH) {
return state;
}
if (processInstance.getState() == WorkflowExecutionStatus.READY_PAUSE) {
state = TaskExecutionStatus.PAUSE;
} else if (processInstance.getState() == WorkflowExecutionStatus.READY_STOP
|| !checkProcessStrategy(taskInstance, processInstance)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
state = TaskExecutionStatus.KILL;
} else {
state = TaskExecutionStatus.SUBMITTED_SUCCESS;
}
return state;
}
/**
* check process instance strategy
*
* @param taskInstance taskInstance
* @return check strategy result
*/
private boolean checkProcessStrategy(TaskInstance taskInstance, ProcessInstance processInstance) {
FailureStrategy failureStrategy = processInstance.getFailureStrategy();
if (failureStrategy == FailureStrategy.CONTINUE) {
return true;
}
List<TaskInstance> taskInstances =
this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId(), taskInstance.getTestFlag());
for (TaskInstance task : taskInstances) {
if (task.getState() == TaskExecutionStatus.FAILURE
&& task.getRetryTimes() >= task.getMaxRetryTimes()) {
return false;
}
}
return true;
}
/**
* insert or update task instance
*
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param taskInstance taskInstance
* @return save task instance result
*/
@Override
public boolean saveTaskInstance(TaskInstance taskInstance) {
if (taskInstance.getId() != null) {
return updateTaskInstance(taskInstance);
} else {
return createTaskInstance(taskInstance);
}
}
/**
* insert task instance
*
* @param taskInstance taskInstance
* @return create task instance result
*/
@Override
public boolean createTaskInstance(TaskInstance taskInstance) {
int count = taskInstanceMapper.insert(taskInstance);
return count > 0;
}
/**
* update task instance
*
* @param taskInstance taskInstance
* @return update task instance result
*/
@Override
public boolean updateTaskInstance(TaskInstance taskInstance) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
int count = taskInstanceMapper.updateById(taskInstance);
return count > 0;
}
/**
* find task instance by id
*
* @param taskId task id
* @return task instance
*/
@Override
public TaskInstance findTaskInstanceById(Integer taskId) {
return taskInstanceMapper.selectById(taskId);
}
/**
* find task instance list by id list
*
* @param idList task id list
* @return task instance list
*/
@Override
public List<TaskInstance> findTaskInstanceByIdList(List<Integer> idList) {
if (CollectionUtils.isEmpty(idList)) {
return new ArrayList<>();
}
return taskInstanceMapper.selectBatchIds(idList);
}
/**
* package task instance
*/
@Override
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
public void packageTaskInstance(TaskInstance taskInstance, ProcessInstance processInstance) {
taskInstance.setProcessInstance(processInstance);
taskInstance.setProcessDefine(processInstance.getProcessDefinition());
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority());
TaskDefinition taskDefinition = this.findTaskDefinition(
taskInstance.getTaskCode(),
taskInstance.getTaskDefinitionVersion());
this.updateTaskDefinitionResources(taskDefinition);
taskInstance.setTaskDefine(taskDefinition);
taskInstance.setTestFlag(processInstance.getTestFlag());
}
/**
* Update {@link ResourceInfo} information in {@link TaskDefinition}
*
* @param taskDefinition the given {@link TaskDefinition}
*/
@Override
public void updateTaskDefinitionResources(TaskDefinition taskDefinition) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskDefinition.getTaskParams(),
new TypeReference<Map<String, Object>>() {
});
if (taskParameters != null) {
if (taskParameters.containsKey("mainJar")) {
Object mainJarObj = taskParameters.get("mainJar");
ResourceInfo mainJar = JSONUtils.parseObject(
JSONUtils.toJsonString(mainJarObj),
ResourceInfo.class);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
ResourceInfo resourceInfo = updateResourceInfo(mainJar);
if (resourceInfo != null) {
taskParameters.put("mainJar", resourceInfo);
}
}
if (taskParameters.containsKey("resourceList")) {
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList"));
List<ResourceInfo> resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class);
List<ResourceInfo> updatedResourceInfos = resourceInfos
.stream()
.map(this::updateResourceInfo)
.filter(Objects::nonNull)
.collect(Collectors.toList());
taskParameters.put("resourceList", updatedResourceInfos);
}
taskDefinition.setTaskParams(JSONUtils.toJsonString(taskParameters));
}
}
/**
* update {@link ResourceInfo} by given original ResourceInfo
*
* @param res origin resource info
* @return {@link ResourceInfo}
*/
protected ResourceInfo updateResourceInfo(ResourceInfo res) {
ResourceInfo resourceInfo = null;
if (res != null) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
Integer resourceId = res.getId();
if (resourceId == null) {
logger.error("invalid resourceId, {}", resourceId);
return null;
}
resourceInfo = new ResourceInfo();
Resource resource = getResourceById(resourceId);
resourceInfo.setId(resourceId);
resourceInfo.setRes(resource.getFileName());
resourceInfo.setResourceName(resource.getFullName());
if (logger.isInfoEnabled()) {
logger.info("updated resource info {}",
JSONUtils.toJsonString(resourceInfo));
}
}
return resourceInfo;
}
/**
* get id list by task state
*
* @param instanceId instanceId
* @param state state
* @return task instance states
*/
@Override
public List<Integer> findTaskIdByInstanceState(int instanceId, TaskExecutionStatus state) {
return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.getCode());
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* find valid task list by process definition id
*
* @param processInstanceId processInstanceId
* @param testFlag testFlag
* @return task instance list
*/
@Override
public List<TaskInstance> findValidTaskListByProcessId(Integer processInstanceId, int testFlag) {
return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.YES, testFlag);
}
/**
* find previous task list by work process id
*
* @param processInstanceId processInstanceId
* @return task instance list
*/
@Override
public List<TaskInstance> findPreviousTaskListByWorkProcessId(Integer processInstanceId) {
ProcessInstance processInstance = processInstanceMapper.selectById(processInstanceId);
return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.NO,
processInstance.getTestFlag());
}
/**
* update work process instance map
*
* @param processInstanceMap processInstanceMap
* @return update process instance result
*/
@Override
public int updateWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return processInstanceMapMapper.updateById(processInstanceMap);
}
/**
* create work process instance map
*
* @param processInstanceMap processInstanceMap
* @return create process instance result
*/
@Override
public int createWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) {
int count = 0;
if (processInstanceMap != null) {
return processInstanceMapMapper.insert(processInstanceMap);
}
return count;
}
/**
* find work process map by parent process id and parent task id.
*
* @param parentWorkProcessId parentWorkProcessId
* @param parentTaskId parentTaskId
* @return process instance map
*/
@Override
public ProcessInstanceMap findWorkProcessMapByParent(Integer parentWorkProcessId, Integer parentTaskId) {
return processInstanceMapMapper.queryByParentId(parentWorkProcessId, parentTaskId);
}
/**
* delete work process map by parent process id
*
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param parentWorkProcessId parentWorkProcessId
* @return delete process map result
*/
@Override
public int deleteWorkProcessMapByParentId(int parentWorkProcessId) {
return processInstanceMapMapper.deleteByParentProcessId(parentWorkProcessId);
}
/**
* find sub process instance
*
* @param parentProcessId parentProcessId
* @param parentTaskId parentTaskId
* @return process instance
*/
@Override
public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) {
ProcessInstance processInstance = null;
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryByParentId(parentProcessId, parentTaskId);
if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) {
return processInstance;
}
processInstance = findProcessInstanceById(processInstanceMap.getProcessInstanceId());
return processInstance;
}
/**
* find parent process instance
*
* @param subProcessId subProcessId
* @return process instance
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Override
public ProcessInstance findParentProcessInstance(Integer subProcessId) {
ProcessInstance processInstance = null;
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(subProcessId);
if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) {
return processInstance;
}
processInstance = findProcessInstanceById(processInstanceMap.getParentProcessInstanceId());
return processInstance;
}
/**
* for show in page of taskInstance
*/
@Override
public void changeOutParam(TaskInstance taskInstance) {
if (Strings.isNullOrEmpty(taskInstance.getVarPool())) {
return;
}
List<Property> properties = JSONUtils.toList(taskInstance.getVarPool(), Property.class);
if (CollectionUtils.isEmpty(properties)) {
return;
}
Map<String, Object> taskParams =
JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference<Map<String, Object>>() {
});
Object localParams = taskParams.get(LOCAL_PARAMS);
if (localParams == null) {
return;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
Map<String, String> outProperty = new HashMap<>();
for (Property info : properties) {
if (info.getDirect() == Direct.OUT) {
outProperty.put(info.getProp(), info.getValue());
}
}
for (Property info : allParam) {
if (info.getDirect() == Direct.OUT) {
String paramName = info.getProp();
info.setValue(outProperty.get(paramName));
}
}
taskParams.put(LOCAL_PARAMS, allParam);
taskInstance.setTaskParams(JSONUtils.toJsonString(taskParams));
}
/**
* convert integer list to string list
*
* @param intList intList
* @return string list
*/
private List<String> convertIntListToString(List<Integer> intList) {
if (intList == null) {
return new ArrayList<>();
}
List<String> result = new ArrayList<>(intList.size());
for (Integer intVar : intList) {
result.add(String.valueOf(intVar));
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return result;
}
/**
* query schedule by id
*
* @param id id
* @return schedule
*/
@Override
public Schedule querySchedule(int id) {
return scheduleMapper.selectById(id);
}
/**
* query Schedule by processDefinitionCode
*
* @param processDefinitionCode processDefinitionCode
* @see Schedule
*/
@Override
public List<Schedule> queryReleaseSchedulerListByProcessDefinitionCode(long processDefinitionCode) {
return scheduleMapper.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode);
}
/**
* query Schedule by processDefinitionCode
*
* @param processDefinitionCodeList processDefinitionCodeList
* @see Schedule
*/
@Override
public Map<Long, String> queryWorkerGroupByProcessDefinitionCodes(List<Long> processDefinitionCodeList) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
List<Schedule> processDefinitionScheduleList =
scheduleMapper.querySchedulesByProcessDefinitionCodes(processDefinitionCodeList);
return processDefinitionScheduleList.stream().collect(Collectors.toMap(Schedule::getProcessDefinitionCode,
Schedule::getWorkerGroup));
}
/**
* query dependent process definition by process definition code
*
* @param processDefinitionCode processDefinitionCode
* @see DependentProcessDefinition
*/
@Override
public List<DependentProcessDefinition> queryDependentProcessDefinitionByProcessDefinitionCode(long processDefinitionCode) {
return workFlowLineageMapper.queryDependentProcessDefinitionByProcessDefinitionCode(processDefinitionCode);
}
/**
* query need failover process instance
*
* @param host host
* @return process instance list
*/
@Override
public List<ProcessInstance> queryNeedFailoverProcessInstances(String host) {
return processInstanceMapper.queryByHostAndStatus(host,
WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
@Override
public List<String> queryNeedFailoverProcessInstanceHost() {
return processInstanceMapper
.queryNeedFailoverProcessInstanceHost(WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
/**
* process need failover process instance
*
* @param processInstance processInstance
*/
@Override
@Transactional
public void processNeedFailoverProcessInstances(ProcessInstance processInstance) {
processInstance.setHost(Constants.NULL);
processInstanceMapper.updateById(processInstance);
ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
Command cmd = new Command();
cmd.setProcessDefinitionCode(processDefinition.getCode());
cmd.setProcessDefinitionVersion(processDefinition.getVersion());
cmd.setProcessInstanceId(processInstance.getId());
cmd.setCommandParam(
String.format("{\"%s\":%d}", CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId()));
cmd.setExecutorId(processInstance.getExecutorId());
cmd.setCommandType(CommandType.RECOVER_TOLERANCE_FAULT_PROCESS);
cmd.setProcessInstancePriority(processInstance.getProcessInstancePriority());
cmd.setTestFlag(processInstance.getTestFlag());
commandService.createCommand(cmd);
}
/**
* query all need failover task instances by host
*
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param host host
* @return task instance list
*/
@Override
public List<TaskInstance> queryNeedFailoverTaskInstances(String host) {
return taskInstanceMapper.queryByHostAndStatus(host,
TaskExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
/**
* find data source by id
*
* @param id id
* @return datasource
*/
@Override
public DataSource findDataSourceById(int id) {
return dataSourceMapper.selectById(id);
}
/**
* find process instance by the task id
*
* @param taskId taskId
* @return process instance
*/
@Override
public ProcessInstance findProcessInstanceByTaskId(int taskId) {
TaskInstance taskInstance = taskInstanceMapper.selectById(taskId);
if (taskInstance != null) {
return processInstanceMapper.selectById(taskInstance.getProcessInstanceId());
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return null;
}
/**
* find udf function list by id list string
*
* @param ids ids
* @return udf function list
*/
@Override
public List<UdfFunc> queryUdfFunListByIds(Integer[] ids) {
return udfFuncMapper.queryUdfByIdStr(ids, null);
}
/**
* find tenant code by resource name
*
* @param resName resource name
* @param resourceType resource type
* @return tenant code
*/
@Override
public String queryTenantCodeByResName(String resName, ResourceType resourceType) {
String fullName = resName.startsWith("/") ? resName : String.format("/%s", resName);
List<Resource> resourceList = resourceMapper.queryResource(fullName, resourceType.ordinal());
if (CollectionUtils.isEmpty(resourceList)) {
return "";
}
int userId = resourceList.get(0).getUserId();
User user = userMapper.selectById(userId);
if (Objects.isNull(user)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return "";
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (Objects.isNull(tenant)) {
return "";
}
return tenant.getTenantCode();
}
/**
* find schedule list by process define codes.
*
* @param codes codes
* @return schedule list
*/
@Override
public List<Schedule> selectAllByProcessDefineCode(long[] codes) {
return scheduleMapper.selectAllByProcessDefineArray(codes);
}
/**
* find last scheduler process instance in the date interval
*
* @param definitionCode definitionCode
* @param dateInterval dateInterval
* @return process instance
*/
@Override
public ProcessInstance findLastSchedulerProcessInterval(Long definitionCode, DateInterval dateInterval,
int testFlag) {
return processInstanceMapper.queryLastSchedulerProcess(definitionCode,
dateInterval.getStartTime(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
dateInterval.getEndTime(),
testFlag);
}
/**
* find last manual process instance interval
*
* @param definitionCode process definition code
* @param dateInterval dateInterval
* @return process instance
*/
@Override
public ProcessInstance findLastManualProcessInterval(Long definitionCode, DateInterval dateInterval, int testFlag) {
return processInstanceMapper.queryLastManualProcess(definitionCode,
dateInterval.getStartTime(),
dateInterval.getEndTime(),
testFlag);
}
/**
* find last running process instance
*
* @param definitionCode process definition code
* @param startTime start time
* @param endTime end time
* @return process instance
*/
@Override
public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime, int testFlag) {
return processInstanceMapper.queryLastRunningProcess(definitionCode,
startTime,
endTime,
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
testFlag,
WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
/**
* query user queue by process instance
*
* @param processInstance processInstance
* @return queue
*/
@Override
public String queryUserQueueByProcessInstance(ProcessInstance processInstance) {
String queue = "";
if (processInstance == null) {
return queue;
}
User executor = userMapper.selectById(processInstance.getExecutorId());
if (executor != null) {
queue = executor.getQueue();
}
return queue;
}
/**
* query project name and user name by processInstanceId.
*
* @param processInstanceId processInstanceId
* @return projectName and userName
*/
@Override
public ProjectUser queryProjectWithUserByProcessInstanceId(int processInstanceId) {
return projectMapper.queryProjectWithUserByProcessInstanceId(processInstanceId);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
/**
* get task worker group
*
* @param taskInstance taskInstance
* @return workerGroupId
*/
@Override
public String getTaskWorkerGroup(TaskInstance taskInstance) {
String workerGroup = taskInstance.getWorkerGroup();
if (!Strings.isNullOrEmpty(workerGroup)) {
return workerGroup;
}
int processInstanceId = taskInstance.getProcessInstanceId();
ProcessInstance processInstance = findProcessInstanceById(processInstanceId);
if (processInstance != null) {
return processInstance.getWorkerGroup();
}
logger.info("task : {} will use default worker group", taskInstance.getId());
return Constants.DEFAULT_WORKER_GROUP;
}
/**
* get have perm project list
*
* @param userId userId
* @return project list
*/
@Override
public List<Project> getProjectListHavePerm(int userId) {
List<Project> createProjects = projectMapper.queryProjectCreatedByUser(userId);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 12,451 |
[Bug] [k8s] Read the incorrect kubeconfig
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Read the incorrect kubeconfig from `cluster.getConfig()`
And if the kubeconfig content is wrong, `DefaultKubernetesClient(config)` will automatically reade the kubeconfig from `~/.kube/config` instead.
### What you expected to happen
Read the correct kubeconfig
### How to reproduce
see the code
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/12451
|
https://github.com/apache/dolphinscheduler/pull/12452
|
fdac75137969d3e656e1aa898f7431f9657de50b
|
233bbdb09ebb6756a8b8578d4da7ec51820b2873
| 2022-10-19T15:28:50Z |
java
| 2022-10-25T03:25:30Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
List<Project> authedProjects = projectMapper.queryAuthedProjectListByUserId(userId);
if (createProjects == null) {
createProjects = new ArrayList<>();
}
if (authedProjects != null) {
createProjects.addAll(authedProjects);
}
return createProjects;
}
/**
* list unauthorized udf function
*
* @param userId user id
* @param needChecks data source id array
* @return unauthorized udf function list
*/
@Override
public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) {
List<T> resultList = new ArrayList<>();
if (Objects.nonNull(needChecks) && needChecks.length > 0) {
Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
switch (authorizationType) {
case RESOURCE_FILE_ID:
case UDF_FILE:
List<Resource> ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks);
addAuthorizedResources(ownUdfResources, userId);
Set<Integer> authorizedResourceFiles =
ownUdfResources.stream().map(Resource::getId).collect(toSet());
originResSet.removeAll(authorizedResourceFiles);
break;
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.