opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  ReceiveCommits: Factor repeated "internal server error" text to a constant
  Update .mailmap

Change-Id: Ie9421d89af46bf8165296dfa6e121b9af8d70f66
This commit is contained in:
Marco Miller
2020-02-27 10:19:06 -05:00
parent c46e1f6078 26f7ee61bf
commit 1a8f045ea7
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.mailmap
View File

@@ -29,14 +29,17 @@ Edwin Kempin <ekempin@google.com>
Eryk Szymanski <eryksz@gmail.com> <eryksz@google.com> Eryk Szymanski <eryksz@gmail.com> <eryksz@google.com>
Fredrik Luthander <fredrik.luthander@sonymobile.com> <fredrik@gandaraj.com> Fredrik Luthander <fredrik.luthander@sonymobile.com> <fredrik@gandaraj.com>
Fredrik Luthander <fredrik.luthander@sonymobile.com> <fredrik.luthander@sonyericsson.com> Fredrik Luthander <fredrik.luthander@sonymobile.com> <fredrik.luthander@sonyericsson.com>
Gerrit Code Review <no-reply@gerritcodereview.com> <noreply-gerritcodereview@google.com>
Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@axis.com> Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@axis.com>
Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@sonyericsson.com> Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@sonyericsson.com>
Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@sonymobile.com> Gustaf Lundh <gustaflh@axis.com> <gustaf.lundh@sonymobile.com>
Han-Wen Nienhuys <hanwen@google.com> <hanwen@google.com>
Hector Oswaldo Caballero <hector.caballero@ericsson.com> <hector.caballero@ericsson.com> Hector Oswaldo Caballero <hector.caballero@ericsson.com> <hector.caballero@ericsson.com>
Hugo Arès <hugo.ares@ericsson.com> Hugo Ares <hugo.ares@ericsson.com> Hugo Arès <hugo.ares@ericsson.com> Hugo Ares <hugo.ares@ericsson.com>
Hugo Arès <hugo.ares@ericsson.com> <hugares@gmail.com> Hugo Arès <hugo.ares@ericsson.com> <hugares@gmail.com>
Jacek Centkowski <jcentkowski@collab.net> <gemincia.programs@gmail.com> Jacek Centkowski <jcentkowski@collab.net> <gemincia.programs@gmail.com>
Jacek Centkowski <jcentkowski@collab.net> <geminica.programs@gmail.com> Jacek Centkowski <jcentkowski@collab.net> <geminica.programs@gmail.com>
James E. Blair <jeblair@redhat.com> <jeblair@hp.com>
Jason Huntley <jhuntley@houghtonassociates.com> jhuntley <jhuntley@houghtonassociates.com> Jason Huntley <jhuntley@houghtonassociates.com> jhuntley <jhuntley@houghtonassociates.com>
Jiří Engelthaler <EngyCZ@gmail.com> <engycz@gmail.com> Jiří Engelthaler <EngyCZ@gmail.com> <engycz@gmail.com>
Joe Onorato <onoratoj@gmail.com> <joeo@android.com> Joe Onorato <onoratoj@gmail.com> <joeo@android.com>
@@ -54,11 +57,16 @@ Marco Miller <marco.miller@ericsson.com>
Mark Derricutt <mark.derricutt@smxemail.com> <mark@talios.com> Mark Derricutt <mark.derricutt@smxemail.com> <mark@talios.com>
Martin Fick <mfick@codeaurora.org> <mogulguy10@gmail.com> Martin Fick <mfick@codeaurora.org> <mogulguy10@gmail.com>
Martin Fick <mfick@codeaurora.org> <mogulguy@yahoo.com> Martin Fick <mfick@codeaurora.org> <mogulguy@yahoo.com>
Martin Wallgren <martinwa@axis.com> <martin.wallgren@axis.com>
Matthias Sohn <matthias.sohn@sap.com> <matthias.sohn@gmail.com>
Maxime Guerreiro <maximeg@google.com> <maximeg@google.com> Maxime Guerreiro <maximeg@google.com> <maximeg@google.com>
Michael Zhou <moz@google.com> <zhoumotongxue008@gmail.com> Michael Zhou <moz@google.com> <zhoumotongxue008@gmail.com>
Monty Taylor <mordred@inaugust.com> <monty.taylor@gmail.com>
Mônica Dionísio <monica.dionisio@sonyericsson.com> monica.dionisio <monica.dionisio@sonyericsson.com> Mônica Dionísio <monica.dionisio@sonyericsson.com> monica.dionisio <monica.dionisio@sonyericsson.com>
Nasser Grainawi <nasser@grainawi.org> <nasser@codeaurora.org> Nasser Grainawi <nasser@grainawi.org> <nasser@codeaurora.org>
Nasser Grainawi <nasser@grainawi.org> <nasserg@quicinc.com> Nasser Grainawi <nasser@grainawi.org> <nasserg@quicinc.com>
Orgad Shaneh <orgads@gmail.com> <orgad.shaneh@audiocodes.com>
Patrick Hiesel <hiesel@google.com> <hiesel@hiesel-macbookpro2.roam.corp.google.com>
Peter Jönsson <peter.joensson@gmail.com> Peter Jönsson <peter.joensson@gmail.com> Peter Jönsson <peter.joensson@gmail.com> Peter Jönsson <peter.joensson@gmail.com>
Rafael Rabelo Silva <rafael.rabelosilva@sonyericsson.com> rafael.rabelosilva <rafael.rabelosilva@sonyericsson.com> Rafael Rabelo Silva <rafael.rabelosilva@sonyericsson.com> rafael.rabelosilva <rafael.rabelosilva@sonyericsson.com>
Réda Housni Alaoui <reda.housnialaoui@gmail.com> <alaoui.rda@gmail.com> Réda Housni Alaoui <reda.housnialaoui@gmail.com> <alaoui.rda@gmail.com>
@@ -72,6 +80,7 @@ Shawn Pearce <sop@google.com>
Sixin Li <sixin210@gmail.com> sixin li <sixin210@gmail.com> Sixin Li <sixin210@gmail.com> sixin li <sixin210@gmail.com>
Sven Selberg <svense@axis.com> <sven.selberg@axis.com> Sven Selberg <svense@axis.com> <sven.selberg@axis.com>
Sven Selberg <svense@axis.com> <sven.selberg@sonymobile.com> Sven Selberg <svense@axis.com> <sven.selberg@sonymobile.com>
Thomas Dräbing <thomas.draebing@sap.com> <thomas.draebing@sap.com>
Tom Wang <twang10@gmail.com> Tom <twang10@gmail.com> Tom Wang <twang10@gmail.com> Tom <twang10@gmail.com>
Tomas Westling <thomas.westling@sonyericsson.com> thomas.westling <thomas.westling@sonyericsson.com> Tomas Westling <thomas.westling@sonyericsson.com> thomas.westling <thomas.westling@sonyericsson.com>
Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> <ulrik.sjolin@gmail.com> Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> <ulrik.sjolin@gmail.com>

17
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -229,6 +229,7 @@ class ReceiveCommits {
private static final String CANNOT_DELETE_CHANGES = "Cannot delete from '" + REFS_CHANGES + "'"; private static final String CANNOT_DELETE_CHANGES = "Cannot delete from '" + REFS_CHANGES + "'";
private static final String CANNOT_DELETE_CONFIG = private static final String CANNOT_DELETE_CONFIG =
"Cannot delete project configuration from '" + RefNames.REFS_CONFIG + "'"; "Cannot delete project configuration from '" + RefNames.REFS_CONFIG + "'";
private static final String INTERNAL_SERVER_ERROR = "internal server error";
interface Factory { interface Factory {
ReceiveCommits create( ReceiveCommits create(
@@ -511,7 +512,7 @@ class ReceiveCommits {
Task commandProgress = progress.beginSubTask("refs", UNKNOWN); Task commandProgress = progress.beginSubTask("refs", UNKNOWN);
commands = commands.stream().map(c -> wrapReceiveCommand(c, commandProgress)).collect(toList()); commands = commands.stream().map(c -> wrapReceiveCommand(c, commandProgress)).collect(toList());
processCommandsUnsafe(commands, progress); processCommandsUnsafe(commands, progress);
rejectRemaining(commands, "internal server error"); rejectRemaining(commands, INTERNAL_SERVER_ERROR);
// This sends error messages before the 'done' string of the progress monitor is sent. // This sends error messages before the 'done' string of the progress monitor is sent.
// Currently, the test framework relies on this ordering to understand if pushes completed // Currently, the test framework relies on this ordering to understand if pushes completed
@@ -656,7 +657,7 @@ class ReceiveCommits {
logger.atFine().log("Added %d additional ref updates", added); logger.atFine().log("Added %d additional ref updates", added);
bu.execute(); bu.execute();
} catch (UpdateException | RestApiException e) { } catch (UpdateException | RestApiException e) {
rejectRemaining(cmds, "internal server error"); rejectRemaining(cmds, INTERNAL_SERVER_ERROR);
logger.atFine().withCause(e).log("update failed:"); logger.atFine().withCause(e).log("update failed:");
} }
@@ -887,7 +888,7 @@ class ReceiveCommits {
reject(magicBranchCmd, e.getMessage()); reject(magicBranchCmd, e.getMessage());
} catch (RestApiException | IOException e) { } catch (RestApiException | IOException e) {
logger.atSevere().withCause(e).log("Can't insert change/patch set for %s", project.getName()); logger.atSevere().withCause(e).log("Can't insert change/patch set for %s", project.getName());
reject(magicBranchCmd, "internal server error: " + e.getMessage()); reject(magicBranchCmd, String.format("%s: %s", INTERNAL_SERVER_ERROR, e.getMessage()));
} }
if (magicBranch != null && magicBranch.submit) { if (magicBranch != null && magicBranch.submit) {
@@ -1809,7 +1810,7 @@ class ReceiveCommits {
} catch (IOException e) { } catch (IOException e) {
logger.atWarning().withCause(e).log( logger.atWarning().withCause(e).log(
"Project %s cannot read %s", project.getName(), id.name()); "Project %s cannot read %s", project.getName(), id.name());
reject(cmd, "internal server error"); reject(cmd, INTERNAL_SERVER_ERROR);
return; return;
} }
} }
@@ -1833,7 +1834,7 @@ class ReceiveCommits {
} catch (IOException ex) { } catch (IOException ex) {
logger.atWarning().withCause(ex).log( logger.atWarning().withCause(ex).log(
"Error walking to %s in project %s", destBranch, project.getName()); "Error walking to %s in project %s", destBranch, project.getName());
reject(cmd, "internal server error"); reject(cmd, INTERNAL_SERVER_ERROR);
return; return;
} }
@@ -2267,7 +2268,7 @@ class ReceiveCommits {
logger.atFine().log("Finished updating groups from GroupCollector"); logger.atFine().log("Finished updating groups from GroupCollector");
} catch (StorageException e) { } catch (StorageException e) {
logger.atSevere().withCause(e).log("Error collecting groups for changes"); logger.atSevere().withCause(e).log("Error collecting groups for changes");
reject(magicBranch.cmd, "internal server error"); reject(magicBranch.cmd, INTERNAL_SERVER_ERROR);
} }
return newChanges; return newChanges;
} }
@@ -2559,11 +2560,11 @@ class ReceiveCommits {
} catch (StorageException err) { } catch (StorageException err) {
logger.atSevere().withCause(err).log( logger.atSevere().withCause(err).log(
"Cannot read database before replacement for project %s", project.getName()); "Cannot read database before replacement for project %s", project.getName());
rejectRemainingRequests(replaceByChange.values(), "internal server error"); rejectRemainingRequests(replaceByChange.values(), INTERNAL_SERVER_ERROR);
} catch (IOException | PermissionBackendException err) { } catch (IOException | PermissionBackendException err) {
logger.atSevere().withCause(err).log( logger.atSevere().withCause(err).log(
"Cannot read repository before replacement for project %s", project.getName()); "Cannot read repository before replacement for project %s", project.getName());
rejectRemainingRequests(replaceByChange.values(), "internal server error"); rejectRemainingRequests(replaceByChange.values(), INTERNAL_SERVER_ERROR);
} }
logger.atFine().log("Read %d changes to replace", replaceByChange.size()); logger.atFine().log("Read %d changes to replace", replaceByChange.size());