Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: root.xxx适配 #678

Merged
merged 7 commits into from
Dec 13, 2024
Merged

feat: root.xxx适配 #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
50113f5
feat: kill reason && queue support root.xxx
taoran1250 Dec 3, 2024
0a45b84
Revert "feat: kill reason && queue support root.xxx"
taoran1250 Dec 3, 2024
04b3557
feat: queue support root.xxx
taoran1250 Dec 3, 2024
ea80104
feat: queue support root.xxx
taoran1250 Dec 10, 2024
aa9a1a8
feat: queue support root.xxx
taoran1250 Dec 10, 2024
34d2d39
Merge branch 'dev-1.10.0-webank-merge' of https://github.com/WeDataSp…
taoran1250 Dec 13, 2024
31eaa61
fix: deal conflicts
taoran1250 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...nager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.linkis.manager.rm.external.yarn;

import org.apache.linkis.engineplugin.server.conf.EngineConnPluginConfiguration;
import org.apache.linkis.manager.common.entity.resource.CommonNodeResource;
import org.apache.linkis.manager.common.entity.resource.NodeResource;
import org.apache.linkis.manager.common.entity.resource.ResourceType;
Expand Down Expand Up @@ -57,6 +58,7 @@ public class YarnResourceRequester implements ExternalResourceRequester {
private final String HASTATE_ACTIVE = "active";
private static final ObjectMapper objectMapper = new ObjectMapper();
private final Map<String, String> rmAddressMap = new ConcurrentHashMap<>();
private final String queuePrefix = EngineConnPluginConfiguration.QUEUE_PREFIX().getValue();

private static final HttpClient httpClient = HttpClients.createDefault();

Expand All @@ -74,7 +76,11 @@ public NodeResource requestResourceInfo(
logger.info("rmWebAddress: " + rmWebAddress);

String queueName = ((YarnResourceIdentifier) identifier).getQueueName();
String realQueueName = "root." + queueName;
if (queueName.startsWith(queuePrefix)) {
logger.info("Queue name {} starts with '{}', remove '{}'", queueName, queuePrefix, queuePrefix);
queueName = queueName.substring(queuePrefix.length());
}
String realQueueName = queuePrefix + queueName;

try {
YarnQueueInfo resources = getResources(rmWebAddress, realQueueName, queueName, provider);
Expand Down Expand Up @@ -301,7 +307,7 @@ public List<ExternalAppInfo> requestAppInfo(
String rmWebAddress = getAndUpdateActiveRmWebAddress(provider);

String queueName = ((YarnResourceIdentifier) identifier).getQueueName();
String realQueueName = "root." + queueName;
String realQueueName = queuePrefix + queueName;

JsonNode resp = getResponseByUrl("apps", rmWebAddress, provider).path("apps").path("app");
if (resp.isMissingNode()) {
Expand Down
3 changes: 3 additions & 0 deletions ...main/scala/org/apache/linkis/engineplugin/server/conf/EngineConnPluginConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ object EngineConnPluginConfiguration {
val EC_BML_VERSION_MAY_WITH_PREFIX_V: CommonVars[Boolean] =
CommonVars("linkis.engineconn.bml.version.may.with.prefix", true)

val QUEUE_PREFIX: CommonVars[String] =
CommonVars("wds.linkis.queue.prefix", "root.")

}
Loading