diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java index 3017f51..6cc04c9 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/YarnClusterService.java @@ -60,6 +60,10 @@ public class YarnClusterService { return servicesMap.valuesView().toList().toImmutable(); } + public ImmutableList services(ImmutableSet clusters) { + return clusters.toList().collect(this::service).toImmutable(); + } + public ImmutableMap servicesMap() { return servicesMap; } diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java index 71ce288..223dddf 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/YarnController.java @@ -109,7 +109,7 @@ public class YarnController extends BaseController { public AmisResponse queueList(@RequestParam("clusters") List clusters, @RequestParam(value = "names", defaultValue = "") String names) { boolean isFilterNames = StrUtil.isNotBlank(names); ImmutableList filterNames = Lists.immutable.of(names.split(",")); - ImmutableList results = yarnClusterService.services() + ImmutableList results = yarnClusterService.services(Sets.immutable.ofAll(clusters)) .asParallel(EXECUTOR, 1) .collect(yarnService -> { YarnRootQueue cluster = yarnService.cluster();