opendev/gerrit
Code Issues Proposed changes

GroupList: Log null UUIDs

Browse Source 
These shouldn't happen, but we've observed some in production
(possibly involving a custom group backend). Logging might help us
track it down.

Change-Id: Ib7a956774647d1bea4fb49ad55376de0408dcf71
This commit is contained in:
Dave Borowitz
2016-10-14 18:51:53 -04:00
parent 2e2cd58a5c
commit 11eb31d952
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gerrit-server/src/main/java/com/google/gerrit/server/git/GroupList.java
View File

@@ -16,7 +16,10 @@ package com.google.gerrit.server.git;
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroup.UUID;
import com.google.gerrit.reviewdb.client.Project;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,19 +30,29 @@ import java.util.Map;
import java.util.Set;
public class GroupList extends TabFile {
private static final Logger log = LoggerFactory.getLogger(GroupList.class);
public static final String FILE_NAME = "groups";
private final Project.NameKey project;
private final Map<AccountGroup.UUID, GroupReference> byUUID;
private GroupList(Map<AccountGroup.UUID, GroupReference> byUUID) {
this.byUUID = byUUID;
private GroupList(Project.NameKey project,
Map<AccountGroup.UUID, GroupReference> byUUID) {
this.project = project;
this.byUUID = byUUID;
}
public static GroupList parse(String text, ValidationError.Sink errors)
throws IOException {
public static GroupList parse(Project.NameKey project, String text,
ValidationError.Sink errors) throws IOException {
List<Row> rows = parse(text, FILE_NAME, TRIM, TRIM, errors);
Map<AccountGroup.UUID, GroupReference> groupsByUUID =
new HashMap<>(rows.size());
for (Row row : rows) {
if (row.left == null) {
log.warn("null field in group list for {}:\n{}", project, text);
continue;
}
AccountGroup.UUID uuid = new AccountGroup.UUID(row.left);
String name = row.right;
GroupReference ref = new GroupReference(uuid, name);
@@ -47,7 +60,7 @@ public class GroupList extends TabFile {
groupsByUUID.put(uuid, ref);
}
return new GroupList(groupsByUUID);
return new GroupList(project, groupsByUUID);
}
public GroupReference byUUID(AccountGroup.UUID uuid) {
@@ -56,6 +69,10 @@ public class GroupList extends TabFile {
public GroupReference resolve(GroupReference group) {
if (group != null) {
if (group.getUUID() == null || group.getUUID().get() == null) {
log.warn("attempting to resolve null group in {}: {}", project, group);
return group;
}
GroupReference ref = byUUID.get(group.getUUID());
if (ref != null) {
return ref;
@@ -73,7 +90,11 @@ public class GroupList extends TabFile {
return byUUID.keySet();
}
public void put(UUID uuid, GroupReference reference) {
public void put(AccountGroup.UUID uuid, GroupReference reference) {
if (uuid == null || uuid.get() == null) {
log.warn("attempting to put null group in {}: {}", project, reference);
return;
}
byUUID.put(uuid, reference);
}

3
gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
View File

@@ -910,7 +910,8 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
}
private void readGroupList() throws IOException {
groupList = GroupList.parse(readUTF8(GroupList.FILE_NAME), this);
groupList = GroupList.parse(
projectName, readUTF8(GroupList.FILE_NAME), this);
}
private Map<String, GroupReference> mapGroupReferences() {