opendev/gerrit
Code Issues Proposed changes

Merge "Improve 'internal error' message caused by 'receive.timeout'"

Browse Source
This commit is contained in:
David Pursehouse
2013-01-28 10:18:29 +00:00
committed by Gerrit Code Review
parent 3d47fa39c3 845689833e
commit 9ed504391c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
View File

@@ -165,7 +165,7 @@ public class AsyncReceiveCommits implements PreReceiveHook {
timeoutMillis, TimeUnit.MILLISECONDS); timeoutMillis, TimeUnit.MILLISECONDS);
} catch (ExecutionException e) { } catch (ExecutionException e) {
log.warn("Error in ReceiveCommits", e); log.warn("Error in ReceiveCommits", e);
rc.addError("internal error while processing changes"); rc.addError("internal error while processing changes " + e.getMessage());
// ReceiveCommits has tried its best to catch errors, so anything at this // ReceiveCommits has tried its best to catch errors, so anything at this
// point is very bad. // point is very bad.
for (final ReceiveCommand c : commands) { for (final ReceiveCommand c : commands) {

14
gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
View File

@@ -183,6 +183,7 @@ public class MultiProgressMonitor {
final TimeUnit timeoutUnit) throws ExecutionException { final TimeUnit timeoutUnit) throws ExecutionException {
long overallStart = System.nanoTime(); long overallStart = System.nanoTime();
long deadline; long deadline;
String detailMessage = "";
if (timeoutTime > 0) { if (timeoutTime > 0) {
deadline = overallStart + NANOSECONDS.convert(timeoutTime, timeoutUnit); deadline = overallStart + NANOSECONDS.convert(timeoutTime, timeoutUnit);
} else { } else {
@@ -204,10 +205,15 @@ public class MultiProgressMonitor {
long now = System.nanoTime(); long now = System.nanoTime();
if (deadline > 0 && now > deadline) { if (deadline > 0 && now > deadline) {
log.warn(String.format(
"MultiProgressMonitor worker killed after %sms",
TimeUnit.MILLISECONDS.convert(now - overallStart, NANOSECONDS)));
workerFuture.cancel(true); workerFuture.cancel(true);
if (workerFuture.isCancelled()) {
detailMessage = String.format(
"(timeout %sms, cancelled)",
TimeUnit.MILLISECONDS.convert(now - deadline, NANOSECONDS));
log.warn(String.format(
"MultiProgressMonitor worker killed after %sms" + detailMessage, //
TimeUnit.MILLISECONDS.convert(now - overallStart, NANOSECONDS)));
}
break; break;
} }
@@ -235,7 +241,7 @@ public class MultiProgressMonitor {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new ExecutionException(e); throw new ExecutionException(e);
} catch (CancellationException e) { } catch (CancellationException e) {
throw new ExecutionException(e); throw new ExecutionException(detailMessage, e);
} catch (TimeoutException e) { } catch (TimeoutException e) {
workerFuture.cancel(true); workerFuture.cancel(true);
throw new ExecutionException(e); throw new ExecutionException(e);