MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-760 git: do not freeze UI if git process cancellation has failed

Browse Source 
The observed freeze happened on 'OSProcessUtil - Cannot killProcessTree already terminated process',
that has left UI frozen for 2xTERMINATION_TIMEOUT_MS seconds.

GitOrigin-RevId: cf92928975ed869091264107849262c03267cfb8
This commit is contained in:
Aleksey Pivovarov
2024-03-25 15:31:07 +00:00
committed by intellij-monorepo-bot
parent fcb253ad49
commit ed7947f51c
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitTextHandler.java
+30 -10
View File
@@ -8,6 +8,7 @@ import com.intellij.execution.process.KillableProcessHandler;
import com.intellij.execution.process.OSProcessHandler;
import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
@@ -112,29 +113,48 @@ public abstract class GitTextHandler extends GitHandler {
ProgressManager.checkCanceled();
}
catch (ProcessCanceledException pce) {
ProgressManager.getInstance().executeNonCancelableSection(() -> {
if (!tryKill()) {
LOG.warn("Could not terminate [" + printableCommandLine() + "].");
}
});
tryKillProcess();
throw pce;
}
}
}
}
private boolean tryKill() {
myHandler.destroyProcess();
private void tryKillProcess() {
ProgressManager.getInstance().executeNonCancelableSection(() -> {
myHandler.destroyProcess();
});
// signal was sent, but we still need to wait for process to finish its dark deeds
if (ApplicationManager.getApplication().isReadAccessAllowed() ||
shouldSuppressReadLocks()) {
// Some Git operations are called while holding the global locks.
// Ex: access to the 'GitIndexVirtualFile' or 'GitDirectoryVirtualFile'.
// In this case, we should not delay the current thread cancellation.
ApplicationManager.getApplication().executeOnPooledThread(() -> {
waitAndHardKillProcess();
});
}
else {
ProgressManager.getInstance().executeNonCancelableSection(() -> {
waitAndHardKillProcess();
});
}
}
private void waitAndHardKillProcess() {
// The signal was sent, but we still need to wait for the process to finish its dark deeds
if (myHandler.waitFor(myTerminationTimeoutMs)) {
return true;
return;
}
LOG.warn("Soft-kill failed for [" + printableCommandLine() + "].");
ExecutionManagerImpl.stopProcess(myHandler);
return myHandler.waitFor(myTerminationTimeoutMs);
if (myHandler.waitFor(myTerminationTimeoutMs)) {
return;
}
LOG.warn("Could not terminate [" + printableCommandLine() + "].");
}
protected OSProcessHandler createProcess(@NotNull GeneralCommandLine commandLine) throws ExecutionException {