Skip to content

Commit b048366

Browse files
authored
Merge pull request #1 from apache/3.0
3.0
2 parents 95c99f0 + ddc39a3 commit b048366

File tree

120 files changed

+2628
-2360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2628
-2360
lines changed

.asf.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
notifications:
2-
3-
4-
pullrequests: [email protected]
5-
jira_options: link label link label
1+
notifications:
2+
3+
4+
pullrequests: [email protected]
5+
jira_options: link label link label
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
name: Bug Report
3-
about: Report a bug
4-
labels: kind/bug
5-
6-
---
7-
8-
<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
9-
10-
-->
11-
12-
13-
**What happened**:
14-
15-
**What you expected to happen**:
16-
17-
**How to reproduce it (as minimally and precisely as possible)**:
18-
19-
**Anything else we need to know?**:
1+
---
2+
name: Bug Report
3+
about: Report a bug
4+
labels: kind/bug
5+
6+
---
7+
8+
<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
9+
10+
-->
11+
12+
13+
**What happened**:
14+
15+
**What you expected to happen**:
16+
17+
**How to reproduce it (as minimally and precisely as possible)**:
18+
19+
**Anything else we need to know?**:
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
---
2-
name: Enhancement Request
3-
about: Suggest an enhancement
4-
labels: kind/feature
5-
6-
---
7-
<!-- Please only use this template for submitting enhancement requests -->
8-
9-
**What would you like to be added**:
10-
1+
---
2+
name: Enhancement Request
3+
about: Suggest an enhancement
4+
labels: kind/feature
5+
6+
---
7+
<!-- Please only use this template for submitting enhancement requests -->
8+
9+
**What would you like to be added**:
10+
1111
**Why is this needed**:

.github/workflows/github-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@v2
3636

3737
- name: Cache dependencies
38-
uses: actions/[email protected].4
38+
uses: actions/[email protected].5
3939
with:
4040
# Cache
4141
path: ~/go/pkg/mod

README.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,22 @@ If u want to communicate with our community, pls scan the following dubbobo Ding
202202
</table>
203203
</div>
204204

205-
If u want to visit the wechat group, pls add my wechat AlexanderStocks.
205+
If u want to visit the wechat group, pls add my wechat AlexanderStocks or scan the following wechat picture.
206+
207+
<div>
208+
<table>
209+
<tbody>
210+
<tr></tr>
211+
<tr>
212+
<td align="center" valign="middle">
213+
<img width="80px" height="115px" src="./doc/pic/misc/dubbogo-wechat.png">
214+
</a>
215+
</td>
216+
</tr>
217+
<tr></tr>
218+
</tbody>
219+
</table>
220+
</div>
206221

207222
We welcome the friends who can give us constructing suggestions instead of known-nothing.
208223

@@ -288,6 +303,11 @@ If you are using [apache/dubbo-go](https://github.com/apache/dubbo-go) and think
288303
<img width="222px" src="https://mosn.io/images/community/duodian.png">
289304
</a>
290305
</td>
306+
<td align="center" valign="middle">
307+
<a href="http://www.ruubypay.com" target="_blank">
308+
<img width="222px" src="http://website.ruubypay.com/wifi/image/line5.png">
309+
</a>
310+
</td>
291311
</tr>
292312
<tr></tr>
293313
</tbody>

README_CN.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ make test
201201
</table>
202202
</div>
203203

204-
dubbogo 社区已经开通微信公众号 "dubbogo大区",可在微信搜索 "dubbogo大区" 或者扫描如下二维码关注,可通过公众号私信留言加入 dubbogo 微信社区。
204+
dubbogo 社区已经开通微信公众号,可在微信搜索 "dubbogo示土区" 或者扫描如下二维码关注,可通过公众号私信留言加入 dubbogo 微信社区。
205205

206206
<div>
207207
<table>
@@ -301,6 +301,11 @@ dubbogo 社区已经开通微信公众号 "dubbogo大区",可在微信搜索 "
301301
<img width="222px" src="https://mosn.io/images/community/duodian.png">
302302
</a>
303303
</td>
304+
<td align="center" valign="middle">
305+
<a href="http://www.ruubypay.com" target="_blank">
306+
<img width="222px" src="http://website.ruubypay.com/wifi/image/line5.png">
307+
</a>
308+
</td>
304309
</tr>
305310
<tr></tr>
306311
</tbody>

cluster/cluster_impl/failback_cluster_invoker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (invoker *failbackClusterInvoker) Invoke(ctx context.Context, invocation pr
169169
logger.Errorf("Failback to invoke the method %v in the service %v, wait for retry in background. Ignored exception: %v.\n",
170170
methodName, url.Service(), result.Error().Error())
171171
// ignore
172-
return &protocol.RPCResult{}
172+
return &protocol.RPCResult{Err: result.Error()}
173173
}
174174
return result
175175
}

common/constant/default.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,11 @@ const (
9494
DEFAULT_LOG_CONF_FILE_PATH = "../profiles/dev/log.yml"
9595
DEFAULT_ROUTER_CONF_FILE_PATH = "../profiles/dev/router.yml"
9696
)
97+
98+
// default config value
99+
const (
100+
DEFAULT_REGISTRY_ZK_ID = "demoZK"
101+
DEFAULT_REGISTRY_ZK_PROTOCOL = ZOOKEEPER_KEY
102+
DEFAULT_REGISTRY_ZK_TIMEOUT = "3s"
103+
DEFAULT_REGISTRY_ZK_ADDRESS = "127.0.0.1:2181"
104+
)

common/constant/key.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,12 @@ const (
313313
const (
314314
SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services"
315315
PROVIDER_BY = "provided-by"
316-
EXPORTED_SERVICES_REVISION_PROPERTY_NAME = "dubbo.exported-services.revision"
316+
EXPORTED_SERVICES_REVISION_PROPERTY_NAME = "dubbo.metadata.revision"
317317
SUBSCRIBED_SERVICES_REVISION_PROPERTY_NAME = "dubbo.subscribed-services.revision"
318318
SERVICE_INSTANCE_SELECTOR = "service-instance-selector"
319319
METADATA_STORAGE_TYPE_PROPERTY_NAME = "dubbo.metadata.storage-type"
320320
DEFAULT_METADATA_STORAGE_TYPE = "local"
321+
REMOTE_METADATA_STORAGE_TYPE = "remote"
321322
SERVICE_INSTANCE_ENDPOINTS = "dubbo.endpoints"
322323
METADATA_SERVICE_PREFIX = "dubbo.metadata-service."
323324
METADATA_SERVICE_URL_PARAMS_PROPERTY_NAME = METADATA_SERVICE_PREFIX + "url-params"
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package extension
19+
20+
import (
21+
"fmt"
22+
)
23+
24+
import (
25+
perrors "github.com/pkg/errors"
26+
)
27+
28+
import (
29+
"github.com/apache/dubbo-go/metadata/service/remote"
30+
)
31+
32+
type remoteMetadataServiceCreator func() (remote.RemoteMetadataService, error)
33+
34+
var (
35+
creator remoteMetadataServiceCreator
36+
)
37+
38+
// SetRemoteMetadataService will store the remote metadata service
39+
func SetRemoteMetadataService(creatorFunc remoteMetadataServiceCreator) {
40+
creator = creatorFunc
41+
}
42+
43+
// GetRemoteMetadataServiceFactory will create a MetadataService instance
44+
func GetRemoteMetadataService() (remote.RemoteMetadataService, error) {
45+
if creator != nil {
46+
return creator()
47+
}
48+
return nil, perrors.New(fmt.Sprintf("could not find the metadata service creator for metadataType: remote, please check whether you have imported relative packages, \n" +
49+
"remote - github.com/apache/dubbo-go/metadata/remote/impl"))
50+
}

0 commit comments

Comments
 (0)