opendev/gerrit
Code Issues Proposed changes

Add config option to reindex all groups on slave startup

Browse Source 
If enabled the slave startup is blocked until all stale groups were
reindexed. Enabling this allows to prevent that slaves that were offline
for a longer period of time run with outdated group information until
the first scheduled indexing is done.

E.g. if a slave was offline for 3 weeks and groups are not reindexed on
startup the slave sees group information that is 3 weeks old until the
first scheduled indexing is done. This may be a security issue.

Change-Id: I57ac7ef5c823ec18beef8c19ef159e400b7ada71
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-02-16 17:18:31 +01:00
parent 0f0de8624d
commit a32d4436fc
4 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
View File

@@ -1262,14 +1262,15 @@ public class GroupsIT extends AbstractDaemonTest {
groups.getAllGroupReferences(db).map(GroupReference::getUUID).collect(toList());
assertThat(expectedGroups.size()).isAtLeast(2);
// Restart the server as slave, on startup of the slave all groups are indexed.
restartAsSlave();
GroupIndexedCounter groupIndexedCounter = new GroupIndexedCounter();
RegistrationHandle groupIndexEventCounterHandle =
groupIndexedListeners.add(groupIndexedCounter);
try {
// On startup of the slave the test framework ensures that the group index is up-to-date.
// Hence running the reindexer doesn't need to reindex any group.
// Running the reindexer right after startup should not need to reindex any group since
// reindexing was already done on startup.
slaveGroupIndexer.run();
groupIndexedCounter.assertNoReindex();
@@ -1308,6 +1309,33 @@ public class GroupsIT extends AbstractDaemonTest {
}
}
@Test
@Sandboxed
@GerritConfig(name = "index.scheduledIndexer.runOnStartup", value = "false")
@GerritConfig(name = "index.scheduledIndexer.enabled", value = "false")
@GerritConfig(name = "index.autoReindexIfStale", value = "false")
@IgnoreGroupInconsistencies
public void disabledReindexGroupsOnStartupSlaveMode() throws Exception {
assume().that(readGroupsFromNoteDb()).isTrue();
List<AccountGroup.UUID> expectedGroups =
groups.getAllGroupReferences(db).map(GroupReference::getUUID).collect(toList());
assertThat(expectedGroups.size()).isAtLeast(2);
restartAsSlave();
GroupIndexedCounter groupIndexedCounter = new GroupIndexedCounter();
RegistrationHandle groupIndexEventCounterHandle =
groupIndexedListeners.add(groupIndexedCounter);
try {
// No group indexing happened on startup. All groups should be reindexed now.
slaveGroupIndexer.run();
groupIndexedCounter.assertReindexOf(expectedGroups);
} finally {
groupIndexEventCounterHandle.remove();
}
}
private void assertStaleGroupAndReindex(AccountGroup.UUID groupUuid) throws IOException {
// Evict group from cache to be sure that we use the index state for staleness checks.
groupCache.evict(groupUuid);