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

Jump to bottom

fix some etcd3 registry bugs. #3632

Merged
merged 4 commits into from
Mar 11, 2019
Merged

fix some etcd3 registry bugs. #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
733105b
fix some bugs.
zonghaishang Mar 11, 2019
d2998e6
fix typo
zonghaishang Mar 11, 2019
6a662bf
cancel keep alive if recovery failed.
zonghaishang Mar 11, 2019
0bafe83
remove duplicate license header.
zonghaishang Mar 11, 2019
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
11 changes: 8 additions & 3 deletions dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,13 @@ public class Constants {
* Production environment key.
*/
public static final String PRODUCTION_ENVIRONMENT = "product";
/*
* private Constants(){ }
*/

public static final String ETCD3_NOTIFY_MAXTHREADS_KEYS = "etcd3.notify.maxthreads";

public static final int DEFAULT_ETCD3_NOTIFY_THREADS = DEFAULT_IO_THREADS;

public static final String DEFAULT_ETCD3_NOTIFY_QUEUES_KEY = "etcd3.notify.queues";

public static final int DEFAULT_GRPC_QUEUES = 300_0000;

}
113 changes: 68 additions & 45 deletions .../dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,19 @@
* limitations under the License.
*/

/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF 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
*
* http://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 org.apache.dubbo.remoting.etcd.jetcd;

import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ExecutorUtil;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.remoting.etcd.ChildListener;
import org.apache.dubbo.remoting.etcd.StateListener;
import org.apache.dubbo.remoting.etcd.option.OptionUtil;
import org.apache.dubbo.remoting.etcd.support.AbstractEtcdClient;

import com.google.protobuf.ByteString;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.api.Event;
Expand All @@ -46,15 +41,6 @@
import io.grpc.Status;
import io.grpc.stub.StreamObserver;
import io.netty.util.internal.ConcurrentSet;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.remoting.etcd.ChildListener;
import org.apache.dubbo.remoting.etcd.StateListener;
import org.apache.dubbo.remoting.etcd.option.OptionUtil;
import org.apache.dubbo.remoting.etcd.support.AbstractEtcdClient;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -63,10 +49,14 @@
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReentrantLock;

import static java.util.stream.Collectors.toList;
import static org.apache.dubbo.remoting.etcd.jetcd.JEtcdClientWrapper.UTF_8;
Expand All @@ -79,6 +69,8 @@ public class JEtcdClient extends AbstractEtcdClient<JEtcdClient.EtcdWatcher> {
private JEtcdClientWrapper clientWrapper;
private ScheduledExecutorService reconnectSchedule;

private ExecutorService notifyExecutor;

private int delayPeriod;
private Logger logger = LoggerFactory.getLogger(JEtcdClient.class);

Expand All @@ -95,7 +87,16 @@ public JEtcdClient(URL url) {
});
delayPeriod = getUrl().getParameter(Constants.REGISTRY_RETRY_PERIOD_KEY, Constants.DEFAULT_REGISTRY_RETRY_PERIOD);
reconnectSchedule = Executors.newScheduledThreadPool(1,
new NamedThreadFactory("auto-reconnect"));
new NamedThreadFactory("etcd3-watch-auto-reconnect"));

notifyExecutor = new ThreadPoolExecutor(
1
, url.getParameter(Constants.ETCD3_NOTIFY_MAXTHREADS_KEYS, Constants.DEFAULT_ETCD3_NOTIFY_THREADS)
, Constants.DEFAULT_SESSION_TIMEOUT
, TimeUnit.MILLISECONDS
, new LinkedBlockingQueue<Runnable>(url.getParameter(Constants.DEFAULT_ETCD3_NOTIFY_QUEUES_KEY, Constants.DEFAULT_GRPC_QUEUES * 3))
, new NamedThreadFactory("etcd3-notify", true));

clientWrapper.start();
} catch (Exception e) {
throw new IllegalStateException(e.getMessage(), e);
Expand Down Expand Up @@ -166,9 +167,19 @@ public void revokeLease(long lease) {
@Override
public void doClose() {
try {
reconnectSchedule.shutdownNow();
if (notifyExecutor != null) {
ExecutorUtil.shutdownNow(notifyExecutor, 100);
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
}

try {
if (reconnectSchedule != null) {
ExecutorUtil.shutdownNow(reconnectSchedule, 100);
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
} finally {
clientWrapper.doClose();
}
Expand All @@ -181,9 +192,11 @@ public class EtcdWatcher implements StreamObserver<WatchResponse> {
protected long watchId;
protected String path;
protected Throwable throwable;
protected Set<String> urls = new ConcurrentSet<>();
protected volatile Set<String> urls = new ConcurrentSet<>();
private ChildListener listener;

protected ReentrantLock lock = new ReentrantLock(true);

public EtcdWatcher(ChildListener listener) {
this.listener = listener;
}
Expand Down Expand Up @@ -220,7 +233,12 @@ public void onNext(WatchResponse response) {
}
}
if (modified > 0) {
listener.childChanged(path, new ArrayList<>(urls));
notifyExecutor.execute(new Runnable() {
@Override
public void run() {
listener.childChanged(path, new ArrayList<>(urls));
}
});
}

}
Expand Down Expand Up @@ -257,37 +275,42 @@ public List<String> forPath(String path) {
if (!isConnected()) {
throw new ClosedClientException("watch client has been closed, path '" + path + "'");
}

if (this.path != null) {
if (this.path.equals(path)) {
return clientWrapper.getChildren(path);
}
unwatch();
}

this.watchStub = WatchGrpc.newStub(clientWrapper.getChannel());
this.watchRequest = watchStub.watch(this);
this.path = path;
this.watchRequest.onNext(nextRequest());

List<String> children = clientWrapper.getChildren(path);
lock.lock();
try {

/**
* caching the current service
*/
if (!children.isEmpty()) {
this.urls.addAll(filterChildren(children));
}
this.watchStub = WatchGrpc.newStub(clientWrapper.getChannel());
this.watchRequest = watchStub.watch(this);
this.watchRequest.onNext(nextRequest());

return new ArrayList<>(urls);
List<String> children = clientWrapper.getChildren(path);
/**
* caching the current service
*/
if (!children.isEmpty()) {
this.urls.addAll(filterChildren(children));
}

return new ArrayList<>(urls);
} finally {
lock.unlock();
}
}

private boolean safeUpdate(String service, boolean add) {
synchronized (this) {
lock.lock();
try {
/**
* If the collection already contains the specified service, do nothing
*/
return add ? this.urls.add(service) : this.urls.remove(service);
} finally {
lock.unlock();
}
}

Expand Down
Loading