From a14f554e0085b6a179375a8ca04665434b73c7bd Mon Sep 17 00:00:00 2001 From: tjq Date: Tue, 19 May 2020 08:46:53 +0800 Subject: [PATCH] [dev] finished all container web interface --- .../common/model/DeployedContainerInfo.java | 27 ++++++++++++++ .../request/ServerDeployContainerRequest.java | 4 +++ .../oms/common/request/WorkerHeartbeat.java | 5 +++ .../oms/server/akka/actors/ServerActor.java | 1 + .../common/config/ThreadPoolConfig.java | 3 ++ .../utils/ContainerTemplateGenerator.java | 3 +- .../oms/server/common/utils/OmsFileUtils.java | 14 ++++++-- .../oms/server/service/ContainerService.java | 6 ++-- .../service/ha/ClusterStatusHolder.java | 33 +++++++++++++++-- .../service/ha/WorkerManagerService.java | 15 ++++++++ .../server/service/timing/CleanService.java | 3 ++ .../web/controller/ContainerController.java | 35 +++++++++++++++---- .../background/WorkerHealthReporter.java | 4 +++ .../oms/worker/container/OmsContainer.java | 2 ++ .../worker/container/OmsContainerFactory.java | 15 +++++++- .../oms/worker/container/OmsJarContainer.java | 14 +++++++- 16 files changed, 164 insertions(+), 20 deletions(-) create mode 100644 oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java new file mode 100644 index 00000000..ca2073d0 --- /dev/null +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/DeployedContainerInfo.java @@ -0,0 +1,27 @@ +package com.github.kfcfans.oms.common.model; + +import com.github.kfcfans.oms.common.OmsSerializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 已部署的容器信息 + * + * @author tjq + * @since 2020/5/18 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DeployedContainerInfo implements OmsSerializable { + + // 容器ID + private Long containerId; + // 版本 + private String version; + // 部署时间 + private long deployedTime; + // 机器地址（无需上报） + private String workerAddress; +} diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java index 3a607b14..b1c91324 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/ServerDeployContainerRequest.java @@ -16,6 +16,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class ServerDeployContainerRequest implements OmsSerializable { + /** + * 容器ID + */ + private Long containerId; /** * 容器名称 */ diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java index a8bdb371..bcd253f1 100644 --- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java +++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/request/WorkerHeartbeat.java @@ -1,9 +1,12 @@ package com.github.kfcfans.oms.common.request; import com.github.kfcfans.oms.common.OmsSerializable; +import com.github.kfcfans.oms.common.model.DeployedContainerInfo; import com.github.kfcfans.oms.common.model.SystemMetrics; import lombok.Data; +import java.util.List; + /** * Worker 上报健康信息（worker定时发送的heartbeat） @@ -22,6 +25,8 @@ public class WorkerHeartbeat implements OmsSerializable { private Long appId; // 当前时间 private long heartbeatTime; + // 当前加载的容器（容器名称 -> 容器版本） + private List containerInfos; private SystemMetrics systemMetrics; } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java index 0dc40b76..4e446b62 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/akka/actors/ServerActor.java @@ -96,6 +96,7 @@ public class ServerActor extends AbstractActor { ServerDeployContainerRequest dpReq = new ServerDeployContainerRequest(); BeanUtils.copyProperties(containerInfo, dpReq); + dpReq.setContainerId(containerInfo.getId()); String downloadURL = String.format("http://%s:%s/container/downloadJar?version=%s", NetUtils.getLocalHost(), port, containerInfo.getVersion()); dpReq.setDownloadURL(downloadURL); diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java index 5d047c37..31bacc3f 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/config/ThreadPoolConfig.java @@ -13,6 +13,9 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 公用线程池配置 + * omsTimingPool：用于执行定时任务的线程池 + * omsCommonPool：用于执行普通任务的线程池 + * taskScheduler：用于定时调度的线程池 * * @author tjq * @since 2020/4/28 diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java index 3edef09a..4819cbdf 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/ContainerTemplateGenerator.java @@ -6,7 +6,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import java.io.*; -import java.net.URL; import java.util.Objects; /** @@ -31,7 +30,7 @@ public class ContainerTemplateGenerator { */ public static File generate(String group, String artifact, String name, String packageName, Integer javaVersion) throws IOException { - String workerDir = OmsFileUtils.genTemporaryPath(); + String workerDir = OmsFileUtils.genTemporaryWorkePath(); File originJar = new File(workerDir + "tmp.jar"); String tmpPath = workerDir + "/unzip/"; diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java index 729f1ca7..d2f72859 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/common/utils/OmsFileUtils.java @@ -37,12 +37,20 @@ public class OmsFileUtils { } /** - * 获取临时目录，用完记得删除 - * @return 临时目录 + * 获取临时目录（固定目录） + * @return 目录 */ public static String genTemporaryPath() { + return COMMON_PATH + "temporary/"; + } + + /** + * 获取临时目录（随机目录，不会重复），用完记得删除 + * @return 临时目录 + */ + public static String genTemporaryWorkePath() { String uuid = StringUtils.replace(UUID.randomUUID().toString(), "-", ""); - return COMMON_PATH + "temporary/" + uuid + "/"; + return genTemporaryPath() + uuid + "/"; } /** diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java index baed9dd2..9e5dbe44 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ContainerService.java @@ -130,7 +130,7 @@ public class ContainerService { */ public String uploadContainerJarFile(MultipartFile file) throws IOException { - String workerDirStr = OmsFileUtils.genTemporaryPath(); + String workerDirStr = OmsFileUtils.genTemporaryWorkePath(); String tmpFileStr = workerDirStr + "tmp.jar"; File workerDir = new File(workerDirStr); @@ -238,7 +238,7 @@ public class ContainerService { String port = environment.getProperty("local.server.port"); String downloadURL = String.format("http://%s:%s/container/downloadJar?version=%s", NetUtils.getLocalHost(), port, container.getVersion()); - ServerDeployContainerRequest req = new ServerDeployContainerRequest(containerName, container.getVersion(), downloadURL); + ServerDeployContainerRequest req = new ServerDeployContainerRequest(container.getId(), containerName, container.getVersion(), downloadURL); long sleepTime = calculateSleepTime(jarFile.length()); AtomicInteger count = new AtomicInteger(); @@ -267,7 +267,7 @@ public class ContainerService { ContainerSourceType sourceType = ContainerSourceType.of(container.getSourceType()); if (sourceType == ContainerSourceType.Git) { - String workerDirStr = OmsFileUtils.genTemporaryPath(); + String workerDirStr = OmsFileUtils.genTemporaryWorkePath(); File workerDir = new File(workerDirStr); FileUtils.forceMkdir(workerDir); diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java index 6a58020f..426921d1 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/ClusterStatusHolder.java @@ -1,10 +1,12 @@ package com.github.kfcfans.oms.server.service.ha; +import com.github.kfcfans.oms.common.model.DeployedContainerInfo; import com.github.kfcfans.oms.common.model.SystemMetrics; import com.github.kfcfans.oms.common.request.WorkerHeartbeat; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; @@ -22,6 +24,8 @@ public class ClusterStatusHolder { private String appName; // 集群中所有机器的健康状态 private Map address2Metrics; + // 集群中所有机器的容器部署状态 + private Map> containerId2Infos; // 集群中所有机器的最后心跳时间 private Map address2ActiveTime; @@ -31,6 +35,7 @@ public class ClusterStatusHolder { this.appName = appName; address2Metrics = Maps.newConcurrentMap(); address2ActiveTime = Maps.newConcurrentMap(); + containerId2Infos = Maps.newConcurrentMap(); } /** @@ -41,10 +46,23 @@ public class ClusterStatusHolder { String workerAddress = heartbeat.getWorkerAddress(); long heartbeatTime = heartbeat.getHeartbeatTime(); - address2Metrics.put(workerAddress, heartbeat.getSystemMetrics()); Long oldTime = address2ActiveTime.getOrDefault(workerAddress, -1L); - if (heartbeatTime > oldTime) { - address2ActiveTime.put(workerAddress, heartbeatTime); + if (heartbeatTime < oldTime) { + log.warn("[ClusterStatusHolder] receive the old heartbeat: {}.", heartbeat); + return; + } + + address2ActiveTime.put(workerAddress, heartbeatTime); + address2Metrics.put(workerAddress, heartbeat.getSystemMetrics()); + + List containerInfos = heartbeat.getContainerInfos(); + if (!CollectionUtils.isEmpty(containerInfos)) { + containerInfos.forEach(containerInfo -> { + List infos = containerId2Infos.computeIfAbsent(containerInfo.getContainerId(), ignore -> Lists.newLinkedList()); + // 设置机器地址 + containerInfo.setWorkerAddress(heartbeat.getWorkerAddress()); + infos.add(containerInfo); + }); } } @@ -97,6 +115,15 @@ public class ClusterStatusHolder { return res; } + /** + * 获取当前该Worker集群容器的部署情况 + * @param containerId 容器ID + * @return 该容器的部署情况 + */ + public List getDeployedContainerInfos(Long containerId) { + return containerId2Infos.getOrDefault(containerId, Lists.newLinkedList()); + } + private boolean timeout(String address) { // 排除超时机器 Long lastActiveTime = address2ActiveTime.getOrDefault(address, -1L); diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java index 914bc0bf..72e81185 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/ha/WorkerManagerService.java @@ -1,5 +1,6 @@ package com.github.kfcfans.oms.server.service.ha; +import com.github.kfcfans.oms.common.model.DeployedContainerInfo; import com.github.kfcfans.oms.common.model.SystemMetrics; import com.github.kfcfans.oms.common.request.WorkerHeartbeat; import com.google.common.collect.Maps; @@ -77,5 +78,19 @@ public class WorkerManagerService { } return clusterStatusHolder.getActiveWorkerInfo(); } + + /** + * 获取某个应用容器的部署情况 + * @param appId 应用ID + * @param containerId 容器ID + * @return 部署情况 + */ + public static List getDeployedContainerInfos(Long appId, Long containerId) { + ClusterStatusHolder clusterStatusHolder = appId2ClusterStatus.get(appId); + if (clusterStatusHolder == null) { + return Collections.emptyList(); + } + return clusterStatusHolder.getDeployedContainerInfos(containerId); + } } diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java index 91e8d67c..bc1a46d5 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/timing/CleanService.java @@ -35,6 +35,8 @@ public class CleanService { @Value("${oms.container.retention.remote}") private int remoteContainerRetentionDay; + private static final int TEMPORARY_RETENTION_DAY = 3; + // 每天凌晨3点定时清理 private static final String CLEAN_TIME_EXPRESSION = "0 0 3 * * ?"; @@ -44,6 +46,7 @@ public class CleanService { public void timingClean() { cleanLocal(OmsFileUtils.genLogDirPath(), localLogRetentionDay); cleanLocal(OmsFileUtils.genContainerJarPath(), localContainerRetentionDay); + cleanLocal(OmsFileUtils.genTemporaryPath(), TEMPORARY_RETENTION_DAY); cleanRemote(GridFsManager.LOG_BUCKET, remoteLogRetentionDay); cleanRemote(GridFsManager.CONTAINER_BUCKET, remoteContainerRetentionDay); diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java index dc5816b6..940d92fd 100644 --- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java +++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/ContainerController.java @@ -1,17 +1,22 @@ package com.github.kfcfans.oms.server.web.controller; +import com.github.kfcfans.oms.common.model.DeployedContainerInfo; import com.github.kfcfans.oms.common.response.ResultDTO; +import com.github.kfcfans.oms.server.akka.OhMyServer; import com.github.kfcfans.oms.server.common.utils.ContainerTemplateGenerator; import com.github.kfcfans.oms.server.common.utils.OmsFileUtils; +import com.github.kfcfans.oms.server.persistence.core.model.AppInfoDO; import com.github.kfcfans.oms.server.persistence.core.model.ContainerInfoDO; +import com.github.kfcfans.oms.server.persistence.core.repository.AppInfoRepository; import com.github.kfcfans.oms.server.persistence.core.repository.ContainerInfoRepository; import com.github.kfcfans.oms.server.service.ContainerService; +import com.github.kfcfans.oms.server.service.ha.WorkerManagerService; import com.github.kfcfans.oms.server.web.request.GenerateContainerTemplateRequest; import com.github.kfcfans.oms.server.web.request.SaveContainerInfoRequest; import com.github.kfcfans.oms.server.web.response.ContainerInfoVO; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -32,11 +37,15 @@ import java.util.stream.Collectors; @RequestMapping("/container") public class ContainerController { - @Resource - private ContainerInfoRepository containerInfoRepository; + @Value("${server.port}") + private int port; @Resource private ContainerService containerService; + @Resource + private AppInfoRepository appInfoRepository; + @Resource + private ContainerInfoRepository containerInfoRepository; @GetMapping("/downloadJar") public void downloadJar(String version, HttpServletResponse response) throws IOException { @@ -79,10 +88,22 @@ public class ContainerController { } @GetMapping("/listDeployedWorker") - public ResultDTO> listDeployedWorker(Long appId, Long containerId) { - // TODO：本地 ContainerManager 直接返回 - List mock = Lists.newArrayList("192.168.1.1:9900", "192.168.1.1:9901"); - return ResultDTO.success(mock); + public ResultDTO> listDeployedWorker(Long appId, Long containerId, HttpServletResponse response) { + AppInfoDO appInfoDO = appInfoRepository.findById(appId).orElseThrow(() -> new IllegalArgumentException("can't find app by id:" + appId)); + String targetServer = appInfoDO.getCurrentServer(); + + // 转发 HTTP 请求 + if (!OhMyServer.getActorSystemAddress().equals(targetServer)) { + String targetIp = targetServer.split(":")[0]; + String url = String.format("http://%s:%d/container/listDeployedWorker?appId=%d&containerId=%d", targetIp, port, appId, containerId); + try { + response.sendRedirect(url); + return ResultDTO.success(null); + }catch (Exception e) { + return ResultDTO.failed(e); + } + } + return ResultDTO.success(WorkerManagerService.getDeployedContainerInfos(appId, containerId)); } private static ContainerInfoVO convert(ContainerInfoDO containerInfoDO) { diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java index 4d609634..60498a01 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/background/WorkerHealthReporter.java @@ -7,6 +7,7 @@ import com.github.kfcfans.oms.common.request.WorkerHeartbeat; import com.github.kfcfans.oms.worker.OhMyWorker; import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; import com.github.kfcfans.oms.worker.common.utils.SystemInfoUtils; +import com.github.kfcfans.oms.worker.container.OmsContainerFactory; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; @@ -39,6 +40,9 @@ public class WorkerHealthReporter implements Runnable { heartbeat.setAppId(OhMyWorker.getAppId()); heartbeat.setHeartbeatTime(System.currentTimeMillis()); + // 获取当前加载的容器列表 + heartbeat.setContainerInfos(OmsContainerFactory.getDeployedContainerInfos()); + // 发送请求 String serverPath = AkkaUtils.getAkkaServerPath(RemoteConstant.SERVER_ACTOR_NAME); if (StringUtils.isEmpty(serverPath)) { diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java index d09311b3..052ddd67 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainer.java @@ -17,6 +17,8 @@ public interface OmsContainer extends LifeCycle { */ BasicProcessor getProcessor(String className); + Long getContainerId(); + Long getDeployedTime(); String getName(); String getVersion(); diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java index cf0791c1..75873a3e 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsContainerFactory.java @@ -3,12 +3,14 @@ package com.github.kfcfans.oms.worker.container; import akka.actor.ActorSelection; import akka.pattern.Patterns; import com.github.kfcfans.oms.common.RemoteConstant; +import com.github.kfcfans.oms.common.model.DeployedContainerInfo; import com.github.kfcfans.oms.common.request.ServerDeployContainerRequest; import com.github.kfcfans.oms.common.request.http.WorkerNeedDeployContainerRequest; import com.github.kfcfans.oms.common.response.AskResponse; import com.github.kfcfans.oms.worker.OhMyWorker; import com.github.kfcfans.oms.worker.common.utils.AkkaUtils; import com.github.kfcfans.oms.worker.common.utils.OmsWorkerFileUtils; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; @@ -17,6 +19,7 @@ import org.springframework.util.StringUtils; import java.io.File; import java.net.URL; import java.time.Duration; +import java.util.List; import java.util.Map; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; @@ -96,7 +99,7 @@ public class OmsContainerFactory { } // 创建新容器 - OmsContainer newContainer = new OmsJarContainer(containerName, version, jarFile); + OmsContainer newContainer = new OmsJarContainer(request.getContainerId(), containerName, version, jarFile); newContainer.init(); // 替换容器 @@ -112,4 +115,14 @@ public class OmsContainerFactory { log.error("[OmsContainerFactory] deploy container(name={},version={}) failed.", containerName, version, e); } } + + /** + * 获取该Worker已部署容器的信息 + * @return 已部署容器信息 + */ + public static List getDeployedContainerInfos() { + List info = Lists.newLinkedList(); + CARGO.forEach((name, container) -> info.add(new DeployedContainerInfo(container.getContainerId(), container.getVersion(), container.getDeployedTime(), null))); + return info; + } } diff --git a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java index de6a2899..59c242c0 100644 --- a/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java +++ b/oh-my-scheduler-worker/src/main/java/com/github/kfcfans/oms/worker/container/OmsJarContainer.java @@ -26,9 +26,11 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j public class OmsJarContainer implements OmsContainer { + private final Long containerId; private final String name; private final String version; private final File localJarFile; + private final Long deployedTime; // 引用计数器 private final AtomicInteger referenceCount = new AtomicInteger(0); @@ -38,10 +40,12 @@ public class OmsJarContainer implements OmsContainer { private Map processorCache = Maps.newConcurrentMap(); - public OmsJarContainer(String name, String version, File localJarFile) { + public OmsJarContainer(Long containerId, String name, String version, File localJarFile) { + this.containerId = containerId; this.name = name; this.version = version; this.localJarFile = localJarFile; + this.deployedTime = System.currentTimeMillis(); } @Override @@ -168,6 +172,14 @@ public class OmsJarContainer implements OmsContainer { public String getVersion() { return version; } + @Override + public Long getContainerId() { + return containerId; + } + @Override + public Long getDeployedTime() { + return deployedTime; + } @Override public void tryRelease() {