Skip to content

Tx lcn foxdd #20

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

Merged
xlorne merged 6 commits into from
Dec 12, 2017
Merged

Tx lcn foxdd #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6a6232
align with the loadbalance method of master branch
foxdd Dec 8, 2017
dfcc29d
注释 added
foxdd Dec 8, 2017
074666d
修正
foxdd Dec 8, 2017
23821ec
constants log deleted
foxdd Dec 11, 2017
a8dbdb2
coding style aligned with master
foxdd Dec 11, 2017
305d4f3
Merge branch 'master' into tx-lcn-foxdd
xlorne Dec 12, 2017
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
3 changes: 3 additions & 0 deletions ...tion-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnLoadBalancerRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.codingapi.ribbon.loadbalancer;


import com.alibaba.fastjson.JSONObject;

import com.codingapi.tx.aop.bean.TxTransactionLocal;
import com.lorne.core.framework.utils.encode.MD5Util;
import com.netflix.loadbalancer.Server;
Expand Down
8 changes: 7 additions & 1 deletion ...springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnNoOpLoadBalancerProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import com.netflix.loadbalancer.NoOpLoadBalancer;
import com.netflix.loadbalancer.Server;

import java.util.ArrayList;
import java.util.List;

/**
* created by foxdd 2017-12-05
*/
Expand All @@ -22,7 +25,10 @@ public LcnNoOpLoadBalancerProxy(){
@Override
public Server chooseServer(Object key){
logger.info("enter chooseServer method, key:" + key);
return lcnLoadBalancerRule.proxy(getAllServers(),super.chooseServer(key));

List<Server> serverList = new ArrayList<Server>();
return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));

}

}
2 changes: 1 addition & 1 deletion ...n-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnRibbonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class LcnRibbonConfiguration {
public ILoadBalancer ribbonLoadBalancer(IClientConfig config,
ServerList<Server> serverList, ServerListFilter<Server> serverListFilter,
IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
return new LcnZoneAwareLoadBalancerProxy<>(config, rule, ping, serverList,
return new LcnZoneAwareLoadBalancerProxy(config, rule, ping, serverList,
serverListFilter, serverListUpdater);
}

Expand Down
25 changes: 14 additions & 11 deletions ...gcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnZoneAwareLoadBalancerProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
package com.codingapi.ribbon.loadbalancer;

import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.IPing;
import com.netflix.loadbalancer.IRule;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.loadbalancer.ServerListFilter;
import com.netflix.loadbalancer.ServerListUpdater;
import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
import java.util.ArrayList;
import java.util.List;

/**
* created by foxdd 2017-12-05
*/
public class LcnZoneAwareLoadBalancerProxy<T extends Server> extends ZoneAwareLoadBalancer<T> {
public class LcnZoneAwareLoadBalancerProxy extends ZoneAwareLoadBalancer<Server> {

private Logger logger = LoggerFactory.getLogger(LcnZoneAwareLoadBalancerProxy.class);

LcnLoadBalancerRule lcnLoadBalancerRule = new LcnLoadBalancerRule();

public LcnZoneAwareLoadBalancerProxy(IClientConfig clientConfig, IRule rule,
IPing ping, ServerList<T> serverList, ServerListFilter<T> filter,
IPing ping, ServerList<Server> serverList, ServerListFilter<Server> filter,
ServerListUpdater serverListUpdater) {
super(clientConfig, rule, ping, serverList, filter, serverListUpdater);
}

@Override
public Server chooseServer(Object key){
logger.info("enter chooseServer method, key:" + key);
return lcnLoadBalancerRule.proxy(getAllServers(),super.chooseServer(key));

List<Server> serverList = new ArrayList<Server>();
//获取处理之后的serverlist
serverList = super.getServerListImpl().getUpdatedListOfServers();
//获取过滤之后的serverlist
serverList = super.getFilter().getFilteredListOfServers(serverList);
return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));

}

}