opendev/gerrit
Code Issues Proposed changes

ConfigNotesMigration: Remove config sanity check

Browse Source 
Everywhere else in Gerrit, we don't bother trying to check configs for
typos, we just depend on admins to set the right value. In this case,
somehow I forgot to add a new config option to the checkConfig method,
despite adding a warning after I had already made that mistake twice.
This check is clearly not buying us anything, so ditch it.

Change-Id: I7201856b6b2651ffc71f26c5409ef7255bdda331
This commit is contained in:
Dave Borowitz
2017-04-25 16:17:31 -04:00
parent ae46baef39
commit 74f6261f5e
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ConfigNotesMigration.java
View File

@@ -17,13 +17,11 @@ package com.google.gerrit.server.notedb;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.gerrit.server.notedb.NoteDbTable.CHANGES;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Set;
import org.eclipse.jgit.lib.Config;
/**
@@ -46,7 +44,6 @@ public class ConfigNotesMigration extends NotesMigration {
public static final String SECTION_NOTE_DB = "noteDb";
// All of these names must be reflected in the allowed set in checkConfig.
private static final String DISABLE_REVIEW_DB = "disableReviewDb";
private static final String FUSE_UPDATES = "fuseUpdates";
private static final String PRIMARY_STORAGE = "primaryStorage";
@@ -54,23 +51,6 @@ public class ConfigNotesMigration extends NotesMigration {
private static final String SEQUENCE = "sequence";
private static final String WRITE = "write";
private static void checkConfig(Config cfg) {
Set<String> keys = ImmutableSet.of(CHANGES.key());
Set<String> allowed =
ImmutableSet.of(
DISABLE_REVIEW_DB.toLowerCase(),
PRIMARY_STORAGE.toLowerCase(),
READ.toLowerCase(),
WRITE.toLowerCase(),
SEQUENCE.toLowerCase());
for (String t : cfg.getSubsections(SECTION_NOTE_DB)) {
checkArgument(keys.contains(t.toLowerCase()), "invalid NoteDb table: %s", t);
for (String key : cfg.getNames(SECTION_NOTE_DB, t)) {
checkArgument(allowed.contains(key.toLowerCase()), "invalid NoteDb key: %s.%s", t, key);
}
}
}
public static Config allEnabledConfig() {
Config cfg = new Config();
cfg.setBoolean(SECTION_NOTE_DB, CHANGES.key(), WRITE, true);
@@ -92,8 +72,6 @@ public class ConfigNotesMigration extends NotesMigration {
@Inject
public ConfigNotesMigration(@GerritServerConfig Config cfg) {
checkConfig(cfg);
writeChanges = cfg.getBoolean(SECTION_NOTE_DB, CHANGES.key(), WRITE, false);
readChanges = cfg.getBoolean(SECTION_NOTE_DB, CHANGES.key(), READ, false);