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 zookeeper registry get wrong provider list. (#166) #174

Merged
merged 7 commits into from
Jun 19, 2018
Merged

Fix zookeeper registry get wrong provider list. (#166) #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85a66bc
Fix zookeeper registry get wrong provider list. (#166)
JervyShi Jun 13, 2018
58ed594
fix test case NPE
JervyShi Jun 14, 2018
27d4eb3
add test case log
JervyShi Jun 15, 2018
d11dd03
fix code format
JervyShi Jun 15, 2018
0b27c8f
Try to avoid test cases to interfere with each other
JervyShi Jun 16, 2018
757a03d
format code
JervyShi Jun 16, 2018
4ade313
refactor delayGet usage
JervyShi Jun 18, 2018
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
23 changes: 15 additions & 8 deletions core-impl/client/src/main/java/com/alipay/sofa/rpc/client/SingleGroupAddressHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
*/
package com.alipay.sofa.rpc.client;

import com.alipay.sofa.rpc.bootstrap.ConsumerBootstrap;
import com.alipay.sofa.rpc.common.RpcConstants;
import com.alipay.sofa.rpc.common.struct.ConcurrentHashSet;
import com.alipay.sofa.rpc.ext.Extension;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;

import com.alipay.sofa.rpc.bootstrap.ConsumerBootstrap;
import com.alipay.sofa.rpc.common.RpcConstants;
import com.alipay.sofa.rpc.common.struct.ConcurrentHashSet;
import com.alipay.sofa.rpc.ext.Extension;

/**
* 只支持单个分组的地址选择器（额外存一个直连分组）
*
Expand Down Expand Up @@ -78,7 +78,8 @@ public List<ProviderInfo> getProviderInfos(String groupName) {
public ProviderGroup getProviderGroup(String groupName) {
rLock.lock();
try {
return RpcConstants.ADDRESS_DIRECT_GROUP.equals(groupName) ? directUrlGroup : registryGroup;
return RpcConstants.ADDRESS_DIRECT_GROUP.equals(groupName) ? directUrlGroup
: registryGroup;
} finally {
rLock.unlock();
}
Expand All @@ -99,7 +100,12 @@ public List<ProviderGroup> getProviderGroups() {

@Override
public int getAllProviderSize() {
return directUrlGroup.size() + registryGroup.size();
rLock.lock();
try {
return directUrlGroup.size() + registryGroup.size();
} finally {
rLock.unlock();
}
}

@Override
Expand Down Expand Up @@ -132,7 +138,8 @@ public void removeProvider(ProviderGroup providerGroup) {
public void updateProviders(ProviderGroup providerGroup) {
wLock.lock();
try {
getProviderGroup(providerGroup.getName()).setProviderInfos(new ArrayList(providerGroup.getProviderInfos()));
getProviderGroup(providerGroup.getName())
.setProviderInfos(new ArrayList(providerGroup.getProviderInfos()));
} finally {
wLock.unlock();
}
Expand Down
5 changes: 5 additions & 0 deletions core/api/src/main/java/com/alipay/sofa/rpc/common/RpcConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,11 @@ public class RpcConstants {
*/
public static final String CONFIG_KEY_APP_NAME = "appName";

/**
* 配置key:loadBalancer
*/
public static final String CONFIG_KEY_LOADBALANCER = "loadBalancer";

/*--------配置项相关结束---------*/

/*--------客户端相关开始---------*/
Expand Down
15 changes: 10 additions & 5 deletions .../registry-zk/src/main/java/com/alipay/sofa/rpc/registry/zk/ZookeeperProviderObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@

import com.alipay.sofa.rpc.client.ProviderGroup;
import com.alipay.sofa.rpc.client.ProviderInfo;
import com.alipay.sofa.rpc.client.ProviderInfoAttrs;
import com.alipay.sofa.rpc.codec.common.StringSerializer;
import com.alipay.sofa.rpc.common.utils.CommonUtils;
import com.alipay.sofa.rpc.common.utils.StringUtils;
import com.alipay.sofa.rpc.config.ConsumerConfig;
import com.alipay.sofa.rpc.listener.ProviderInfoListener;
import com.alipay.sofa.rpc.log.Logger;
Expand Down Expand Up @@ -83,7 +85,7 @@ public void updateProvider(ConsumerConfig config, String providerPath, ChildData
List<ProviderInfo> providerInfos = Arrays.asList(
ZookeeperRegistryHelper.convertUrlToProvider(providerPath, data));
for (ProviderInfoListener listener : providerInfoListeners) {
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config.getProtocol(), providerInfos);
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config, providerInfos);
listener.addProvider(new ProviderGroup(providerInfosForProtocol));
}
}
Expand All @@ -100,7 +102,7 @@ public void removeProvider(ConsumerConfig config, String providerPath, ChildData
if (CommonUtils.isNotEmpty(providerInfoListeners)) {
List<ProviderInfo> providerInfos = Arrays.asList(
ZookeeperRegistryHelper.convertUrlToProvider(providerPath, data));
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config.getProtocol(), providerInfos);
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config, providerInfos);
for (ProviderInfoListener listener : providerInfoListeners) {
listener.removeProvider(new ProviderGroup(providerInfosForProtocol));
}
Expand All @@ -119,16 +121,19 @@ public void addProvider(ConsumerConfig config, String providerPath, ChildData da
List<ProviderInfo> providerInfos = Arrays.asList(
ZookeeperRegistryHelper.convertUrlToProvider(providerPath, data));
for (ProviderInfoListener listener : providerInfoListeners) {
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config.getProtocol(), providerInfos);
List<ProviderInfo> providerInfosForProtocol = filterByProtocol(config, providerInfos);
listener.addProvider(new ProviderGroup(providerInfosForProtocol));
}
}
}

private List<ProviderInfo> filterByProtocol(String protocol, List<ProviderInfo> providerInfos) {
static List<ProviderInfo> filterByProtocol(ConsumerConfig consumerConfig, List<ProviderInfo> providerInfos) {
String protocol = consumerConfig.getProtocol();
List<ProviderInfo> result = new ArrayList<ProviderInfo>();
for (ProviderInfo providerInfo : providerInfos) {
if (providerInfo.getProtocolType().equalsIgnoreCase(protocol)) {
if (providerInfo.getProtocolType().equalsIgnoreCase(protocol)
&& StringUtils.equals(consumerConfig.getUniqueId(),
providerInfo.getAttr(ProviderInfoAttrs.ATTR_UNIQUEID))) {
result.add(providerInfo);
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...ion-impl/registry-zk/src/main/java/com/alipay/sofa/rpc/registry/zk/ZookeeperRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,12 @@ public void unRegister(ProviderConfig config) {
// 反订阅配置节点
if (config.isSubscribe()) {
try {
configObserver.removeConfigListener(config);
overrideObserver.removeConfigListener(config);
if (null != configObserver) {
configObserver.removeConfigListener(config);
}
if (null != overrideObserver) {
overrideObserver.removeConfigListener(config);
}
} catch (Exception e) {
if (!RpcRunningState.isShuttingDown()) {
throw new SofaRpcRuntimeException("Failed to unsubscribe provider config from zookeeperRegistry!",
Expand Down
Loading