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.

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

Master sync #7

Merged
merged 268 commits into from
Dec 25, 2018
Merged

Master sync #7

merged 268 commits into from
Dec 25, 2018

Conversation

khanimteyaz
Copy link
Owner

What is the purpose of the change

XXXXX

Brief changelog

XXXXX

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

展图 and others added 30 commits September 4, 2018 15:10
1. TagRouter change from global to Application level
2. Add tag rule and condition rule support
3. Fix problem when building RouterChain
4. Change logic of getting invokers from router cache.
# Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java
1. Extract common method to AbstractDynamicConfiguration
2. Unify strategy when config server cannot be reached at startup: start using local snapshot and try to connect in background.
chickenlj and others added 29 commits December 19, 2018 19:42
…ing instanceof (#3020)

Removing null validation because a null check is not needed before using instanceof
dubbo.registries.id.address=xxx
dubbo.registry.address=xxx
dubbo.configCenters.apollo.address=xxx
dubbo.configCenter.address=xxx
Fixing some typos.
*     #3023: problem in ActiveLimitFilter

* fix problem when max <= 0
*     #2988 [Dubbo - telnet] Unrecognized the other provider

* remove useless files added by accident.

* fix cycle dependency

* fix more cycle dependency

* revert unnecessary change in demo

* make unit test pass

* revert LF to the original CRLF

* change to use lambda

* fix cycle dependency

* remove useless imports

* make unit test stable

* make refactor change according to code review comments

* refactor as review comments suggest.
# Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockInvokersSelector.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
#	dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderConsumerRegTable.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
#	dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RuntimeExceptionInvoker.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/service/GenericServiceTest.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationParameter.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationService.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
…3046)

'continue' statement is unnecessary as the last statement in a loop
…ore than one time (if users don't explicitly add id, cache can not work properly)
1. limit the size of the map,default is 1000. can config by key failcapacity
2. retry period,default is 100.can config by key retries.
3. shutdown the timer when destroyed
Only change FailbackClusterInvoker$RetryTimerTask, code Optimization,only save lastInvoker.
@khanimteyaz khanimteyaz merged commit 565aa1a into khanimteyaz:master Dec 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants