forked from line/centraldogma
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Synchronously invoke
RepositoryListener
Motivation: `RepositoryListener` used `Repository.watch()` to continously invoke the callback. Since the callback is not invoked immediately upon commit completion, the cache cannot guarantee a happen-before relationship with the write operation. line#1099 (review) Modifications: - Fix `CommitWatchers` to reuse `Watch` added for `RepositoryListener` - The watch is removed when `WatchListener.onUpdate()` returns true. - `recurseWatch()` no longer use a scheduler to submit a new watch task when it gets notified. - `find().join()` operation is invoked in the same thread as the commit to ensure that the callback is invoked before the commit's returned future. Result: `RepositoryListener` is now immediately invoked when the watching files are modified.
- Loading branch information
Showing
5 changed files
with
165 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...src/main/java/com/linecorp/centraldogma/server/internal/storage/repository/git/Watch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright 2025 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you under the Apache License, | ||
| * version 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at: | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package com.linecorp.centraldogma.server.internal.storage.repository.git; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.linecorp.centraldogma.common.Revision; | ||
|
|
||
| final class Watch { | ||
|
|
||
| final Revision lastKnownRevision; | ||
| @Nullable | ||
| private final CompletableFuture<Revision> future; | ||
| @Nullable | ||
| private final WatchListener listener; | ||
| private boolean shouldRemove; | ||
| private volatile boolean removed; | ||
|
|
||
| Watch(Revision lastKnownRevision, | ||
| @Nullable CompletableFuture<Revision> future, | ||
| @Nullable WatchListener listener) { | ||
| this.lastKnownRevision = lastKnownRevision; | ||
| assert (future != null && listener == null) || (future == null && listener != null); | ||
| this.future = future; | ||
| this.listener = listener; | ||
| shouldRemove = future != null; | ||
| } | ||
|
|
||
| void notify(Revision revision) { | ||
| if (future != null) { | ||
| future.complete(revision); | ||
| } else { | ||
| assert listener != null; | ||
| // The watch will be removed in the next notification. | ||
| shouldRemove = listener.onUpdate(revision, null); | ||
| } | ||
| } | ||
|
|
||
| void notifyFailure(Throwable cause) { | ||
| if (future != null) { | ||
| future.completeExceptionally(cause); | ||
| } else { | ||
| assert listener != null; | ||
| shouldRemove = listener.onUpdate(null, cause); | ||
| } | ||
| } | ||
|
|
||
| @Nullable | ||
| CompletableFuture<Revision> future() { | ||
| return future; | ||
| } | ||
|
|
||
| boolean shouldRemove() { | ||
| return shouldRemove; | ||
| } | ||
|
|
||
| void remove() { | ||
| removed = true; | ||
| } | ||
|
|
||
| boolean wasRemoved() { | ||
| return removed; | ||
| } | ||
|
|
||
| @FunctionalInterface | ||
| interface WatchListener { | ||
| /** | ||
| * Invoked when the {@link Watch} is notified of an update. | ||
| * Returns {@code true} if the {@link Watch} should be removed from the watch list. | ||
| */ | ||
| boolean onUpdate(@Nullable Revision revision, @Nullable Throwable cause); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters