Skip to content

fix: serialize parsing for shared command CLIs #3243

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

Closed
patrick-andstar wants to merge 1 commit into from
+79 −4
Closed

fix: serialize parsing for shared command CLIs #3243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions core/src/main/java/com/taobao/arthas/core/shell/system/impl/ProcessImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.taobao.arthas.core.shell.system.Process;
import com.taobao.arthas.core.shell.system.ProcessAware;
import com.taobao.arthas.core.shell.term.Tty;
import com.taobao.middleware.cli.CLI;
import com.taobao.middleware.cli.CLIException;
import com.taobao.middleware.cli.CommandLine;
import io.termd.core.function.Function;
Expand Down Expand Up @@ -346,15 +347,24 @@ public synchronized void run(boolean fg) {
}

CommandLine cl = null;
ResultModel helpResult = null;
try {
if (commandContext.cli() != null) {
if (commandContext.cli().parse(args2, false).isAskingForHelp()) {
appendResult(new HelpCommand().createHelpDetailModel(commandContext));
CLI cli = commandContext.cli();
if (cli != null) {
synchronized (cli) {
if (cli.parse(args2, false).isAskingForHelp()) {
helpResult = new HelpCommand().createHelpDetailModel(commandContext);
} else {
cl = cli.parse(args2);
}
}

if (helpResult != null) {
appendResult(helpResult);
terminate();
return;
}

cl = commandContext.cli().parse(args2);
process.setArgs2(args2);
process.setCommandLine(cl);
}
Expand Down
65 changes: 65 additions & 0 deletions core/src/test/java/com/taobao/arthas/core/shell/system/impl/ProcessImplConcurrencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package com.taobao.arthas.core.shell.system.impl;

import com.taobao.arthas.core.command.monitor200.MonitorCommand;
import com.taobao.arthas.core.command.model.MessageModel;
import com.taobao.arthas.core.command.model.ResultModel;
import com.taobao.arthas.core.command.view.ResultView;
import com.taobao.arthas.core.command.view.ResultViewResolver;
import com.taobao.arthas.core.distribution.ResultDistributor;
import com.taobao.arthas.core.distribution.impl.TermResultDistributorImpl;
import com.taobao.arthas.core.shell.cli.CliTokens;
import com.taobao.arthas.core.shell.command.Command;
import com.taobao.arthas.core.shell.command.CommandProcess;
import com.taobao.arthas.core.shell.handlers.Handler;
import com.taobao.arthas.core.shell.handlers.NoOpHandler;
import com.taobao.arthas.core.shell.term.Tty;
import com.taobao.arthas.core.shell.system.ExecStatus;
import com.taobao.arthas.core.shell.system.Process;
Expand All @@ -16,13 +21,73 @@

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

public class ProcessImplConcurrencyTest {

private static final ResultDistributor DISCARD_RESULT_DISTRIBUTOR = new ResultDistributor() {
@Override
public void appendResult(ResultModel result) {
}

@Override
public void close() {
}
};

@Test
public void testRunShouldSerializeSharedCliParsing() throws Exception {
final Command sharedCommand = Command.create(MonitorCommand.class);
final int workerCount = 8;
final int iterations = 1000;
final CountDownLatch start = new CountDownLatch(1);
ExecutorService executor = Executors.newFixedThreadPool(workerCount);
List<Future<?>> workers = new ArrayList<Future<?>>(workerCount);

try {
for (int worker = 0; worker < workerCount; worker++) {
workers.add(executor.submit(new Runnable() {
@Override
public void run() {
try {
start.await();
for (int iteration = 0; iteration < iterations; iteration++) {
Tty tty = new MockTty();
ProcessImpl process = new ProcessImpl(sharedCommand,
Collections.singletonList(CliTokens.createText("-h")),
new NoOpHandler<CommandProcess>(),
new ProcessImpl.ProcessOutput(Collections.<Function<String, String>>emptyList(), null, tty),
DISCARD_RESULT_DISTRIBUTOR);
process.setTty(tty);
process.run(false);
Assert.assertEquals(ExecStatus.TERMINATED, process.status());
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new AssertionError(e);
}
}
}));
}

start.countDown();
for (Future<?> worker : workers) {
worker.get(10, TimeUnit.SECONDS);
}
} finally {
executor.shutdownNow();
Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
}
}

@Test
public void testAppendResultShouldNotDeadlockWithProcessMonitor() throws Exception {
ProcessImpl processImpl = new ProcessImpl(null, Collections.emptyList(), null,
Expand Down