diff --git a/.travis.yml b/.travis.yml index ae0b86ba8af126765ca939804c2b65f801ed1795..03e86fc1d04d8805b3cb0ecba1da51b2bdf0fbc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,10 @@ install: true script: - go fmt ./... && [[ -z `git status -s` ]] + - mkdir -p remoting/zookeeper/zookeeper-4unittest/contrib/fatjar config_center/zookeeper/zookeeper-4unittest/contrib/fatjar registry/zookeeper/zookeeper-4unittest/contrib/fatjar + - wget -P "remoting/zookeeper/zookeeper-4unittest/contrib/fatjar" https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar + - cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar config_center/zookeeper/zookeeper-4unittest/contrib/fatjar/ + - cp remoting/zookeeper/zookeeper-4unittest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar registry/zookeeper/zookeeper-4unittest/contrib/fatjar/ - go mod vendor && go test ./... -coverprofile=coverage.txt -covermode=atomic after_success: diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go index 5bcadee281d6f9cc13fbd67dd4d3e01444de86d0..52e2156885a2e6cc3c35da75a1d0db8bcfcabec0 100644 --- a/cluster/cluster_impl/base_cluster_invoker.go +++ b/cluster/cluster_impl/base_cluster_invoker.go @@ -65,7 +65,7 @@ func (invoker *baseClusterInvoker) checkInvokers(invokers []protocol.Invoker, in if len(invokers) == 0 { ip, _ := utils.GetLocalIP() return perrors.Errorf("Failed to invoke the method %v. No provider available for the service %v from "+ - "registry %v on the consumer %v using the dubbo constant %v .Please check if the providers have been started and registered.", + "registry %v on the consumer %v using the dubbo version %v .Please check if the providers have been started and registered.", invocation.MethodName(), invoker.directory.GetUrl().SubURL.Key(), invoker.directory.GetUrl().String(), ip, constant.Version) } return nil @@ -76,7 +76,7 @@ func (invoker *baseClusterInvoker) checkInvokers(invokers []protocol.Invoker, in func (invoker *baseClusterInvoker) checkWhetherDestroyed() error { if invoker.destroyed.Load() { ip, _ := utils.GetLocalIP() - return perrors.Errorf("Rpc cluster invoker for %v on consumer %v use dubbo constant %v is now destroyed! can not invoke any more. ", + return perrors.Errorf("Rpc cluster invoker for %v on consumer %v use dubbo version %v is now destroyed! can not invoke any more. ", invoker.directory.GetUrl().Service(), ip, constant.Version) } return nil diff --git a/cluster/cluster_impl/failover_cluster_invoker.go b/cluster/cluster_impl/failover_cluster_invoker.go index b29acbf1133fe35f7a380158faacd9b772871a92..3dd8c41dfb7b7512d7c81fa6d7f8a7c35cec0dcb 100644 --- a/cluster/cluster_impl/failover_cluster_invoker.go +++ b/cluster/cluster_impl/failover_cluster_invoker.go @@ -90,6 +90,6 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr ip, _ := utils.GetLocalIP() return &protocol.RPCResult{Err: perrors.Errorf("Failed to invoke the method %v in the service %v. Tried %v times of "+ "the providers %v (%v/%v)from the registry %v on the consumer %v using the dubbo version %v. Last error is %v.", - methodName, invoker.GetUrl().Service(), retries, providers, len(providers), len(invokers), invoker.directory.GetUrl(), ip, version.Version, result.Error().Error(), + methodName, invoker.GetUrl().Service(), retries, providers, len(providers), len(invokers), invoker.directory.GetUrl(), ip, constant.Version, result.Error().Error(), )} } diff --git a/config/config_loader.go b/config/config_loader.go index a2174b90cc43ecfcf53ae3a0afc2938da1704f0c..c5127c8c43622e7b26c998eb54e1b1803e6575ec 100644 --- a/config/config_loader.go +++ b/config/config_loader.go @@ -92,7 +92,7 @@ func Load() { checkok = false count++ if count > maxWait { - panic(fmt.Sprintf("Failed to check the status of the service %v . No provider available for the service to the consumer use dubbo constant %v", refconfig.InterfaceName, constant.Version)) + panic(fmt.Sprintf("Failed to check the status of the service %v . No provider available for the service to the consumer use dubbo version %v", refconfig.InterfaceName, constant.Version)) } time.Sleep(time.Second * 1) break diff --git a/config_center/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar b/config_center/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar deleted file mode 100644 index 839531b8b8762a9c19e334a5cbf79314cb16f945..0000000000000000000000000000000000000000 Binary files a/config_center/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar and /dev/null differ diff --git a/registry/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar b/registry/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar deleted file mode 100644 index 839531b8b8762a9c19e334a5cbf79314cb16f945..0000000000000000000000000000000000000000 Binary files a/registry/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar and /dev/null differ diff --git a/remoting/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar b/remoting/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar deleted file mode 100644 index 839531b8b8762a9c19e334a5cbf79314cb16f945..0000000000000000000000000000000000000000 Binary files a/remoting/zookeeper/zookeeper-4unitest/contrib/fatjar/zookeeper-3.4.9-fatjar.jar and /dev/null differ