opendev/gerrit
Code Issues Proposed changes

Add "aggressive" option to REST call "Run GC"

Browse Source 
When triggering a garbage collection through REST it can be specified
whether to run an aggressive garbage collection or not.

Change-Id: If7472805331ea07e2d83f13d513c06a2203a1b94
This commit is contained in:
Christian Halstrick 2015-03-11 15:13:31 +01:00
parent 7ed32ecde5
commit 2f94e2e562
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/rest-api-projects.txt
View File

@ -2116,6 +2116,8 @@ collection.
|Field Name ||Description
|`show_progress` |`false` if not set|
Whether progress information should be shown.
|`aggressive` |`false` if not set|
Whether an aggressive garbage collection should be done.
|=============================
[[head-input]]

11
gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
View File

@ -63,6 +63,11 @@ public class GarbageCollection {
public GarbageCollectionResult run(List<Project.NameKey> projectNames,
PrintWriter writer) {
return run(projectNames, false, writer);
}
public GarbageCollectionResult run(List<Project.NameKey> projectNames,
boolean aggressive, PrintWriter writer) {
GarbageCollectionResult result = new GarbageCollectionResult();
Set<Project.NameKey> projectsToGc = gcQueue.addAll(projectNames);
for (Project.NameKey projectName : Sets.difference(
@ -74,9 +79,10 @@ public class GarbageCollection {
Repository repo = null;
try {
repo = repoManager.openRepository(p);
logGcConfiguration(p, repo);
logGcConfiguration(p, repo, aggressive);
print(writer, "collecting garbage for \"" + p + "\":\n");
GarbageCollectCommand gc = Git.wrap(repo).gc();
gc.setAggressive(aggressive);
logGcInfo(p, "before:", gc.getStatistics());
gc.setProgressMonitor(writer != null ? new TextProgressMonitor(writer)
: NullProgressMonitor.INSTANCE);
@ -123,9 +129,10 @@ public class GarbageCollection {
}
private static void logGcConfiguration(Project.NameKey projectName,
Repository repo) {
Repository repo, boolean aggressive) {
StringBuilder b = new StringBuilder();
Config cfg = repo.getConfig();
b.append("gc.aggressive=").append(aggressive).append("; ");
b.append(formatConfigValues(cfg, ConfigConstants.CONFIG_GC_SECTION, null));
for (String subsection : cfg.getSubsections(ConfigConstants.CONFIG_GC_SECTION)) {
b.append(formatConfigValues(cfg, ConfigConstants.CONFIG_GC_SECTION,

7
gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java
View File

@ -41,6 +41,7 @@ public class GarbageCollect implements RestModifyView<ProjectResource, Input>,
UiAction<ProjectResource> {
public static class Input {
public boolean showProgress;
public boolean aggressive;
}
private final boolean canGC;
@ -68,8 +69,10 @@ public class GarbageCollect implements RestModifyView<ProjectResource, Input>,
}
};
try {
GarbageCollectionResult result = garbageCollectionFactory.create().run(
Collections.singletonList(rsrc.getNameKey()), input.showProgress ? writer : null);
GarbageCollectionResult result =
garbageCollectionFactory.create().run(
Collections.singletonList(rsrc.getNameKey()), input.aggressive,
input.showProgress ? writer : null);
String msg = "Garbage collection completed successfully.";
if (result.hasErrors()) {
for (GarbageCollectionResult.Error e : result.getErrors()) {