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

Refactor EtcdRepository watch consume #29738

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Refactor EtcdRepository watch consume #29738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c40cff
Refactor EtcdRepository watch consume
zhaojinchao95 Jan 16, 2024
5855ef8
Fix checkstyle
zhaojinchao95 Jan 16, 2024
3b74144
Fix spotless
zhaojinchao95 Jan 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
21 changes: 19 additions & 2 deletions .../src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.KeyValue;
Expand All @@ -33,6 +34,7 @@
import io.etcd.jetcd.watch.WatchEvent;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.etcd.props.EtcdProperties;
Expand All @@ -44,14 +46,20 @@

import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

/**
* Registry repository of ETCD.
*/
@Slf4j
public final class EtcdRepository implements ClusterPersistRepository {

private static final ExecutorService EVENT_LISTENER_EXECUTOR = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Etcd-EventListener-%d").build());

private Client client;

private EtcdProperties etcdProps;
Expand Down Expand Up @@ -148,8 +156,7 @@ public void watch(final String key, final DataChangedEventListener dataChangedEv
for (WatchEvent each : response.getEvents()) {
Type type = getEventChangedType(each);
if (Type.IGNORED != type) {
dataChangedEventListener.onChange(new DataChangedEvent(each.getKeyValue().getKey().toString(StandardCharsets.UTF_8),
each.getKeyValue().getValue().toString(StandardCharsets.UTF_8), type));
dispatchEvent(dataChangedEventListener, each, type);
}
}
});
Expand All @@ -173,9 +180,19 @@ private Type getEventChangedType(final WatchEvent event) {
}
}

private void dispatchEvent(final DataChangedEventListener dataChangedEventListener, final WatchEvent event, final Type type) {
CompletableFuture.runAsync(() -> dataChangedEventListener.onChange(new DataChangedEvent(event.getKeyValue().getKey().toString(StandardCharsets.UTF_8),
event.getKeyValue().getValue().toString(StandardCharsets.UTF_8), type)), EVENT_LISTENER_EXECUTOR).whenComplete((unused, throwable) -> {
if (null != throwable) {
log.error("Dispatch event failed", throwable);
}
});
}

@Override
public void close() {
client.close();
EVENT_LISTENER_EXECUTOR.shutdown();
}

@Override
Expand Down