Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check if the internal project and repos exist before creating them #1010

Merged
merged 5 commits into from
Aug 16, 2024
Merged

Check if the internal project and repos exist before creating them #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb0e77c
Check if the internal project and repos exist before creating them
minwoox Aug 13, 2024
86dd1bb
Remove mirror config
minwoox Aug 13, 2024
7a944f0
Address the comment from @ikhoon
minwoox Aug 16, 2024
ae2c666
Fix
minwoox Aug 16, 2024
a1f3e3c
Add system
minwoox Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions dist/src/conf/dogma.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
},
"webAppEnabled": true,
"webAppTitle": null,
"mirroringEnabled": true,
"numMirroringThreads": null,
"maxNumFilesPerMirror": null,
"maxNumBytesPerMirror": null,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me remove these broken properties for now.
We will introduce a build process to prevent this sort of mistakes later as described in
#1003

"replication": {
"method": "NONE"
},
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/linecorp/centraldogma/server/CentralDogma.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ private CommandExecutor startCommandExecutor(
default:
throw new Error("unknown replication method: " + replicationMethod);
}
projectInitializer = new InternalProjectInitializer(executor);
projectInitializer = new InternalProjectInitializer(executor, pm);

final ServerStatus initialServerStatus = statusManager.serverStatus();
executor.setWritable(initialServerStatus.writable());
Expand Down
9 changes: 7 additions & 2 deletions server/src/main/java/com/linecorp/centraldogma/server/command/Command.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,13 @@ static Command<Void> updateServerStatus(ServerStatus serverStatus) {
*/
static <T> Command<T> forcePush(Command<T> delegate) {
requireNonNull(delegate, "delegate");
checkArgument(delegate.type() == CommandType.NORMALIZING_PUSH || delegate.type() == CommandType.PUSH,
"delegate: %s (expected: NORMALIZING_PUSH or PUSH)", delegate);
checkArgument(delegate.type() == CommandType.CREATE_PROJECT ||
delegate.type() == CommandType.CREATE_REPOSITORY ||
delegate.type() == CommandType.NORMALIZING_PUSH || delegate.type() == CommandType.PUSH,
"delegate: %s (expected: CREATE_PROJECT, CREATE_REPOSITORY, NORMALIZING_PUSH or PUSH)",
delegate);
checkArgument(delegate.author().equals(Author.SYSTEM), "delegate.author: %s (expected: SYSTEM)",
delegate.author());
ikhoon marked this conversation as resolved.
Show resolved Hide resolved
return new ForcePushCommand<>(delegate);
}

Expand Down
51 changes: 35 additions & 16 deletions ...ain/java/com/linecorp/centraldogma/server/storage/project/InternalProjectInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,22 @@
import java.util.List;
import java.util.concurrent.CompletableFuture;

import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.ImmutableList;

import com.linecorp.armeria.common.util.Exceptions;
import com.linecorp.centraldogma.common.Author;
import com.linecorp.centraldogma.common.Change;
import com.linecorp.centraldogma.common.ChangeConflictException;
import com.linecorp.centraldogma.common.Entry;
import com.linecorp.centraldogma.common.Markup;
import com.linecorp.centraldogma.common.ProjectExistsException;
import com.linecorp.centraldogma.common.Query;
import com.linecorp.centraldogma.common.ReadOnlyException;
import com.linecorp.centraldogma.common.RepositoryExistsException;
import com.linecorp.centraldogma.common.Revision;
import com.linecorp.centraldogma.internal.Jackson;
import com.linecorp.centraldogma.server.command.Command;
import com.linecorp.centraldogma.server.command.CommandExecutor;
import com.linecorp.centraldogma.server.metadata.MetadataService;
import com.linecorp.centraldogma.server.metadata.Tokens;
Expand All @@ -49,13 +53,15 @@ public final class InternalProjectInitializer {
public static final String INTERNAL_PROJECT_DOGMA = "dogma";

private final CommandExecutor executor;
private final ProjectManager projectManager;
private final CompletableFuture<Void> initialFuture = new CompletableFuture<>();

/**
* Creates a new instance.
*/
public InternalProjectInitializer(CommandExecutor executor) {
public InternalProjectInitializer(CommandExecutor executor, ProjectManager projectManager) {
this.executor = executor;
this.projectManager = projectManager;
}

/**
Expand Down Expand Up @@ -86,17 +92,16 @@ public void initialize(String projectName) {
*/
public void initialize0(String projectName) {
final long creationTimeMillis = System.currentTimeMillis();
try {
executor.execute(createProject(creationTimeMillis, Author.SYSTEM, projectName))
.get();
} catch (Throwable cause) {
final Throwable peeled = Exceptions.peel(cause);
if (peeled instanceof ReadOnlyException) {
// The executor has stopped right after starting up.
return;
}
if (!(peeled instanceof ProjectExistsException)) {
throw new Error("failed to initialize an internal project: " + projectName, peeled);
if (!projectManager.exists(projectName)) {
try {
executor.execute(Command.forcePush(
createProject(creationTimeMillis, Author.SYSTEM, projectName)))
.get();
} catch (Throwable cause) {
final Throwable peeled = Exceptions.peel(cause);
if (!(peeled instanceof ProjectExistsException)) {
throw new Error("failed to initialize an internal project: " + projectName, peeled);
}
}
}

Expand All @@ -106,17 +111,25 @@ public void initialize0(String projectName) {
}

private void initializeTokens() {
final Entry<JsonNode> entry =
projectManager.get(INTERNAL_PROJECT_DOGMA).repos().get(Project.REPO_DOGMA)
.getOrNull(Revision.HEAD,
Query.ofJson(MetadataService.TOKEN_JSON)).join();
if (entry != null && entry.hasContent()) {
return;
}
try {
final Change<?> change = Change.ofJsonPatch(MetadataService.TOKEN_JSON,
null, Jackson.valueToTree(new Tokens()));
final String commitSummary = "Initialize the token list file: /" + INTERNAL_PROJECT_DOGMA + '/' +
Project.REPO_DOGMA + MetadataService.TOKEN_JSON;
executor.execute(push(Author.SYSTEM, INTERNAL_PROJECT_DOGMA, Project.REPO_DOGMA, Revision.HEAD,
commitSummary, "", Markup.PLAINTEXT, ImmutableList.of(change)))
executor.execute(Command.forcePush(push(Author.SYSTEM, INTERNAL_PROJECT_DOGMA, Project.REPO_DOGMA,
Revision.HEAD, commitSummary, "", Markup.PLAINTEXT,
ImmutableList.of(change))))
.get();
} catch (Throwable cause) {
final Throwable peeled = Exceptions.peel(cause);
if (peeled instanceof ReadOnlyException || peeled instanceof ChangeConflictException) {
if (peeled instanceof ChangeConflictException) {
return;
}
throw new Error("failed to initialize the token list file", peeled);
Expand All @@ -137,9 +150,15 @@ public CompletableFuture<Void> whenInitialized() {
private void initializeInternalRepos(String projectName, List<String> internalRepos,
long creationTimeMillis) {
requireNonNull(internalRepos, "internalRepos");
final Project project = projectManager.get(projectName);
assert project != null;
for (final String repo : internalRepos) {
if (project.repos().exists(repo)) {
continue;
}
try {
executor.execute(createRepository(creationTimeMillis, Author.SYSTEM, projectName, repo))
executor.execute(Command.forcePush(
createRepository(creationTimeMillis, Author.SYSTEM, projectName, repo)))
.get();
} catch (Throwable cause) {
final Throwable peeled = Exceptions.peel(cause);
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/com/linecorp/centraldogma/server/internal/api/auth/PermissionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected void configure(ServerBuilder sb) throws Exception {
final CommandExecutor executor = new StandaloneCommandExecutor(
pm, ForkJoinPool.commonPool(), statusManager, null, null, null);
executor.start().join();
new InternalProjectInitializer(executor).initialize();
new InternalProjectInitializer(executor, pm).initialize();

executor.execute(Command.createProject(AUTHOR, "project1")).join();

Expand Down
2 changes: 1 addition & 1 deletion ...nal/src/main/java/com/linecorp/centraldogma/testing/internal/ProjectManagerExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void before(ExtensionContext context) throws Exception {
executor = newCommandExecutor(projectManager, repositoryWorker, dataDir);

executor.start().get();
internalProjectInitializer = new InternalProjectInitializer(executor);
internalProjectInitializer = new InternalProjectInitializer(executor, projectManager);
internalProjectInitializer.initialize();

afterExecutorStarted();
Expand Down
Loading