This is an automated email from the ASF dual-hosted git repository.
lizhimins pushed a commit to branch rocketmq-studio
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/rocketmq-studio by this push:
new 833e4c2e9 fix(ai): harden CLI provider lifecycle (#2850)
833e4c2e9 is described below
commit 833e4c2e91775cc017dc800a998569d8416dadac
Author: shown <[email protected]>
AuthorDate: Wed Sep 2 15:36:38 2026 +0800
fix(ai): harden CLI provider lifecycle (#2850)
* [ISSUE #2712] fix(ai): terminate stalled CLI availability probes
Signed-off-by: yuluo-yx <[email protected]>
* [ISSUE #2708] fix(ai): honor the configured Qoder model
Signed-off-by: yuluo-yx <[email protected]>
---------
Signed-off-by: yuluo-yx <[email protected]>
---
.../rocketmq/studio/ops/ai/CliAgentProvider.java | 13 +++++-
.../rocketmq/studio/ops/ai/QoderAgentProvider.java | 7 ++-
.../studio/ops/ai/CliAgentProviderTest.java | 46 ++++++++++++++++++-
.../studio/ops/ai/QoderAgentProviderTest.java | 52 ++++++++++++++++++++++
4 files changed, 114 insertions(+), 4 deletions(-)
diff --git
a/server/src/main/java/org/apache/rocketmq/studio/ops/ai/CliAgentProvider.java
b/server/src/main/java/org/apache/rocketmq/studio/ops/ai/CliAgentProvider.java
index 7e937d720..152450cb9 100644
---
a/server/src/main/java/org/apache/rocketmq/studio/ops/ai/CliAgentProvider.java
+++
b/server/src/main/java/org/apache/rocketmq/studio/ops/ai/CliAgentProvider.java
@@ -61,13 +61,20 @@ public abstract class CliAgentProvider implements
AgentProvider {
@Override
public boolean available() {
+ Process process = null;
try {
ProcessBuilder builder = new ProcessBuilder("sh", "-c", "command
-v " + binaryName());
processEnvironment.apply(builder, Map.of());
- Process process = builder.redirectErrorStream(true).start();
+ process =
startAvailabilityProcess(builder.redirectErrorStream(true));
boolean finished = process.waitFor(5, TimeUnit.SECONDS);
+ if (!finished) {
+ process.destroyForcibly();
+ }
return finished && process.exitValue() == 0;
} catch (IOException | InterruptedException exception) {
+ if (process != null) {
+ process.destroyForcibly();
+ }
if (exception instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
@@ -75,6 +82,10 @@ public abstract class CliAgentProvider implements
AgentProvider {
}
}
+ protected Process startAvailabilityProcess(ProcessBuilder builder) throws
IOException {
+ return builder.start();
+ }
+
@Override
public String complete(LlmConfigVO config, String prompt, String
modelOverride) {
String effectiveModel = StringUtils.hasText(modelOverride)
diff --git
a/server/src/main/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProvider.java
b/server/src/main/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProvider.java
index 0b01dbeb5..b9dc7eb8c 100644
---
a/server/src/main/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProvider.java
+++
b/server/src/main/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProvider.java
@@ -50,9 +50,12 @@ public class QoderAgentProvider extends CliAgentProvider {
@Override
protected List<String> buildCommand(LlmConfigVO config, String prompt,
String modelOverride) {
List<String> command = new ArrayList<>(List.of("qodercli", "-p",
prompt == null ? "" : prompt));
- if (StringUtils.hasText(modelOverride)) {
+ String model = StringUtils.hasText(modelOverride)
+ ? modelOverride.trim()
+ : config == null ? null : config.getModel();
+ if (StringUtils.hasText(model)) {
command.add("-m");
- command.add(modelOverride.trim());
+ command.add(model.trim());
}
return command;
}
diff --git
a/server/src/test/java/org/apache/rocketmq/studio/ops/ai/CliAgentProviderTest.java
b/server/src/test/java/org/apache/rocketmq/studio/ops/ai/CliAgentProviderTest.java
index 12f97eff4..3626eb9fa 100644
---
a/server/src/test/java/org/apache/rocketmq/studio/ops/ai/CliAgentProviderTest.java
+++
b/server/src/test/java/org/apache/rocketmq/studio/ops/ai/CliAgentProviderTest.java
@@ -18,10 +18,15 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
class CliAgentProviderTest {
- private static final class FakeCli extends CliAgentProvider {
+ private static class FakeCli extends CliAgentProvider {
private final String script;
private final int outputLimitBytes;
private final Map<String, String> environment;
@@ -89,6 +94,20 @@ class CliAgentProviderTest {
}
}
+ private static final class AvailabilityCli extends FakeCli {
+ private final Process process;
+
+ AvailabilityCli(Process process) {
+ super("echo unused");
+ this.process = process;
+ }
+
+ @Override
+ protected Process startAvailabilityProcess(ProcessBuilder builder) {
+ return process;
+ }
+ }
+
@Test
void completeSurvivesLargeStderrOutput() {
// Write well over the 64 KiB pipe buffer to stderr, then print the
completion on stdout.
@@ -153,4 +172,29 @@ class CliAgentProviderTest {
assertThat(processEnvironment.childEnvironments.get(1))
.containsEntry("PROVIDER_TOKEN", "request-token");
}
+
+ @Test
+ void availabilityDestroysProbeWhenItTimesOut() throws Exception {
+ Process process = mock(Process.class);
+ when(process.waitFor(anyLong(),
eq(java.util.concurrent.TimeUnit.SECONDS))).thenReturn(false);
+
+ assertThat(new AvailabilityCli(process).available()).isFalse();
+
+ verify(process).destroyForcibly();
+ }
+
+ @Test
+ void availabilityDestroysProbeAndPreservesInterrupt() throws Exception {
+ Process process = mock(Process.class);
+ when(process.waitFor(anyLong(),
eq(java.util.concurrent.TimeUnit.SECONDS)))
+ .thenThrow(new InterruptedException("test interrupt"));
+
+ try {
+ assertThat(new AvailabilityCli(process).available()).isFalse();
+ assertThat(Thread.currentThread().isInterrupted()).isTrue();
+ verify(process).destroyForcibly();
+ } finally {
+ Thread.interrupted();
+ }
+ }
}
diff --git
a/server/src/test/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProviderTest.java
b/server/src/test/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProviderTest.java
new file mode 100644
index 000000000..a6bca6291
--- /dev/null
+++
b/server/src/test/java/org/apache/rocketmq/studio/ops/ai/QoderAgentProviderTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.rocketmq.studio.ops.ai;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class QoderAgentProviderTest {
+
+ private final QoderAgentProvider provider = new QoderAgentProvider(new
CliProcessEnvironment(List.of()));
+
+ @Test
+ void buildCommandUsesConfiguredModelWhenRequestDoesNotOverrideIt() {
+ LlmConfigVO config = LlmConfigVO.builder().model(" qoder-configured
").build();
+
+ assertThat(provider.buildCommand(config, "prompt", null))
+ .containsExactly("qodercli", "-p", "prompt", "-m",
"qoder-configured");
+ }
+
+ @Test
+ void buildCommandPrefersRequestModelOverride() {
+ LlmConfigVO config =
LlmConfigVO.builder().model("qoder-configured").build();
+
+ assertThat(provider.buildCommand(config, "prompt", " qoder-request "))
+ .containsExactly("qodercli", "-p", "prompt", "-m",
"qoder-request");
+ }
+
+ @Test
+ void buildCommandOmitsBlankModel() {
+ LlmConfigVO config = LlmConfigVO.builder().model(" ").build();
+
+ assertThat(provider.buildCommand(config, null, null))
+ .containsExactly("qodercli", "-p", "");
+ }
+}
