third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE when some app has on worker connected

Browse Source
This commit is contained in:
tjq 2021-04-05 12:49:37 +08:00
commit 9949e23bc4
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/worker/WorkerClusterQueryService.java
View File

@ -1,14 +1,14 @@
package tech.powerjob.server.remote.worker; package tech.powerjob.server.remote.worker;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tech.powerjob.common.model.DeployedContainerInfo; import tech.powerjob.common.model.DeployedContainerInfo;
import tech.powerjob.server.common.module.WorkerInfo; import tech.powerjob.server.common.module.WorkerInfo;
import tech.powerjob.server.extension.WorkerFilter; import tech.powerjob.server.extension.WorkerFilter;
import tech.powerjob.server.persistence.remote.model.JobInfoDO; import tech.powerjob.server.persistence.remote.model.JobInfoDO;
import tech.powerjob.server.remote.server.redirector.DesignateServer; import tech.powerjob.server.remote.server.redirector.DesignateServer;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -34,6 +34,7 @@ public class WorkerClusterQueryService {
/** /**
* get worker for job * get worker for job
*
* @param jobInfo job * @param jobInfo job
* @return worker cluster info, sorted by metrics desc * @return worker cluster info, sorted by metrics desc
*/ */
@ -62,6 +63,7 @@ public class WorkerClusterQueryService {
/** /**
* get all alive workers * get all alive workers
*
* @param appId appId * @param appId appId
* @return alive workers * @return alive workers
*/ */
@ -71,8 +73,22 @@ public class WorkerClusterQueryService {
return workers; return workers;
} }
/**
* Gets worker info by address.
*
* @param appId the app id
* @param address the address
* @return the worker info by address
*/
public Optional<WorkerInfo> getWorkerInfoByAddress(Long appId, String address) { public Optional<WorkerInfo> getWorkerInfoByAddress(Long appId, String address) {
return Optional.ofNullable(getWorkerInfosByAppId(appId).get(address)); // this may cause NPE while address value is null .
//return Optional.ofNullable(getWorkerInfosByAppId(appId).get(address));
final Map<String, WorkerInfo> workerInfosByAppId = getWorkerInfosByAppId(appId);
//add null check for both workerInfos Map and address
if (null != workerInfosByAppId && null != address) {
return Optional.ofNullable(workerInfosByAppId.get(address));
}
return Optional.empty();
} }
public Map<Long, ClusterStatusHolder> getAppId2ClusterStatus() { public Map<Long, ClusterStatusHolder> getAppId2ClusterStatus() {
@ -81,6 +97,7 @@ public class WorkerClusterQueryService {
/** /**
* 获取某个应用容器的部署情况 * 获取某个应用容器的部署情况
*
* @param appId 应用ID * @param appId 应用ID
* @param containerId 容器ID * @param containerId 容器ID
* @return 部署情况 * @return 部署情况
@ -104,6 +121,7 @@ public class WorkerClusterQueryService {
/** /**
* filter invalid worker for job * filter invalid worker for job
*
* @param workerInfo worker info * @param workerInfo worker info
* @param jobInfo job info * @param jobInfo job info
* @return filter this worker when return true * @return filter this worker when return true