diff --git a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/QueueService.java b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/QueueService.java index 666b5dc..6c9aad1 100644 --- a/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/QueueService.java +++ b/service-yarn-query/src/main/java/com/lanyuanxiaoyao/service/yarn/service/QueueService.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnQueue; +import java.util.LinkedList; +import java.util.Queue; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; @@ -23,10 +25,22 @@ public interface QueueService { default Function> flatChildren() { return queue -> { MutableList children = Lists.mutable.of(queue); - if (ObjectUtil.isNotNull(queue.getQueues())) { - queue.getQueues().getQueue() - .tap(child -> child.setQueueName(StrUtil.format("{}.{}", queue.getQueueName(), child.getQueueName()))) - .forEach(children::add); + Queue handleQueue = new LinkedList<>(); + handleQueue.add(queue); + + YarnQueue parent = handleQueue.poll(); + while (parent != null) { + try { + if (ObjectUtil.isNotNull(parent.getQueues())) { + for (YarnQueue child : queue.getQueues().getQueue()) { + child.setQueueName(StrUtil.format("{}.{}", parent.getQueueName(), child.getQueueName())); + children.add(child); + handleQueue.add(child); + } + } + } finally { + parent = handleQueue.poll(); + } } return children; };