Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Huixxi
Huixxi authored Nov 28, 2023
2 parents 0bdf323 + b42e9d5 commit ed4ca0b
Show file tree
Hide file tree
Showing 19 changed files with 1,421 additions and 25 deletions.
2 changes: 1 addition & 1 deletion content/en/_index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h3 class="section-head">You can use it to:</h3>
<li>redis and memcached, thread-safe, more friendly and performant than the official clients.</li>
<li>rtmp/flv/hls, for building streaming services.</li>
<li>hadoop_rpc (may be opensourced).</li>
<li>rdma support (will be opensourced).</li>
<li>rdma support.</li>
<li>thrift support, thread-safe, more friendly and performant than the official clients.</li>
<li>all sorts of protocols used in Baidu: baidu_std, streaming_rpc, hulu_pbrpc, sofa_pbrpc, nova_pbrpc, public_pbrpc, ubrpc and nshead-based ones.</li>
<li>Build HA distributed services using an industrial-grade implementation of RAFT consensus algorithm which is opensourced at braft</li>
Expand Down
20 changes: 19 additions & 1 deletion content/en/docs/DownloadBRPC/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ limitations under the License.
## Apache bRPC Downloads

Apache bRPC is released as a source artifact.
We are pleased to announce our 1.5.0 release as below.
We are pleased to announce our 1.7.0 release as below.


### All Release
Expand All @@ -50,6 +50,24 @@ We are pleased to announce our 1.5.0 release as below.
</tr>
</thead>
<tbody>
<tr>
<td>Apache bRPC 1.7.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.6.1 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.6.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.5.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.5.0/apache-brpc-1.5.0-src.tar.gz">tar.gz</a></td>
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/bthread/Execution Queue/_index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ template <typename T>
int execution_queue_join(ExecutionQueueId<T> id);
```

stop和join都可以多次调用， 都会又合理的行为。stop可以随时调用而不用当心线程安全性问题。
stop和join都可以多次调用， 都会有合理的行为。stop可以随时调用而不用当心线程安全性问题。

和fd的close类似，如果stop不被调用, 相应的资源会永久泄露。

Expand Down Expand Up @@ -192,4 +192,4 @@ high_priority的task之间的执行顺序也会**严格按照提交顺序**, 这
int execution_queue_cancel(const TaskHandle& h);
```

返回非0仅仅意味着ExecutionQueue已经将对应的task递给过execute, 真实的逻辑中可能将这个task缓存在另外的容器中，所以这并不意味着逻辑上的task已经结束，你需要在自己的业务上保证这一点.
返回非0仅仅意味着ExecutionQueue已经将对应的task递给过execute, 真实的逻辑中可能将这个task缓存在另外的容器中，所以这并不意味着逻辑上的task已经结束，你需要在自己的业务上保证这一点.
16 changes: 16 additions & 0 deletions content/en/docs/community/on-call/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,19 @@ Determine the type of Issue, e.g. bug, enhancement, discussion, etc
| 04/10/2023 - 04/17/2023 | Zhu Jiashun | https://lists.apache.org/thread/l0l1402r8yz7kl2w4hwc835rc1n5o22c
| 04/17/2023 - 04/23/2023 | Lei Li | https://lists.apache.org/thread/3gobs94vogdjg6pmkvbk5kst4z9xbdw9
| 04/24/2023 - 05/07/2023 | Wang Weibing | https://lists.apache.org/thread/25ocwx3n7kvmj0fd5zz5slwd0smt59r2
| 05/08/2023 - 05/14/2023 | Cai Daojin | https://lists.apache.org/thread/676w7087klhsb2hwn9q2p5sj541frgpl
| 05/22/2023 - 05/28/2023 | Liu Shuai | https://lists.apache.org/thread/m2cpr83h5l1gpznowxhf58lrxndok1lp
| 06/19/2023 - 06/25/2023 | Wang Weibing | https://lists.apache.org/thread/jto9mzcbsxw3273xrgwd116vvdl3o1gx
| 06/26/2023 - 07/02/2023 | Cai Daojin | https://lists.apache.org/thread/rzkdbo5ojff9grs2bowwl95n0fsb4zts
| 07/03/2023 - 07/10/2023 | He Lei | https://lists.apache.org/thread/2kh8mq2wn4g0vzdn1czb7nj4t8l2hj9v
| 07/10/2023 - 07/16/2023 | Liu Shuai | https://lists.apache.org/thread/z6jcyqsy31rf1r626kjx2d2sykwtvhqz
| 08/07/2023 - 08/13/2023 | Lei Li | https://lists.apache.org/thread/g2tz50ymsvv3xb2dl3bjot1rfdp74rkj
| 08/21/2023 - 09/03/2023 | Cai Daojin | https://lists.apache.org/thread/f63wnl45l1s3v61681m9tgfpkr6dxptx
| 09/18/2023 - 09/24/2023 | Liu Shuai | https://lists.apache.org/thread/v4po2bwzn3fb7w7qbxfn8hgqzthyqb4b
| 09/25/2023 - 10/08/2023 | Xiguo Hu | https://lists.apache.org/thread/lz3n9nt8xpp7kfb39zxp8m5cjl3dcpbt
| 10/16/2023 - 10/22/2023 | Lei Li | https://lists.apache.org/thread/ylkbpgwp1qv7bs1z1dbxw31lk9o2vqod
| 10/23/2023 - 10/29/2023 | Wang Weibing | https://lists.apache.org/thread/pq87hnf6tdhx0lrdnqpv3dk4tr8wyyrd
| 10/30/2023 - 11/05/2023 | |
| 11/06/2023 - 11/12/2023 | |
| 11/13/2023 - 11/19/2023 | |
| 11/20/2023 - 11/26/2023 | Xiguo Hu | https://lists.apache.org/thread/7hhg555ykcq2sfh0qm71vp9pn4tvb39s
16 changes: 8 additions & 8 deletions content/en/docs/community/release/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ mkdir -p ~/brpc_svn/dev/

cd ~/brpc_svn/dev/

svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/incubator/brpc/
svn --username=lorinlee co https://dist.apache.org/repos/dist/dev/brpc/

cd ~/brpc_svn/dev/brpc
```
Expand Down Expand Up @@ -273,7 +273,7 @@ sha512sum --check apache-brpc-1.0.0-incubating-src.tar.gz.sha512
First import the publisher's public key. Import KEYS from the svn repository to the local. (The person who releases the version does not need to import it again. The person who verify needs to import it.)

```bash
curl https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS >> KEYS
curl https://dist.apache.org/repos/dist/dev/brpc/KEYS >> KEYS

gpg --import KEYS
```
Expand Down Expand Up @@ -451,12 +451,12 @@ If the community vote is not passed, please modify the code of the release branc
### 1. Update GPG Signature

```
svn delete https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "delete KEYS"
svn delete https://dist.apache.org/repos/dist/release/brpc/KEYS -m "delete KEYS"
svn cp https://dist.apache.org/repos/dist/dev/incubator/brpc/KEYS https://dist.apache.org/repos/dist/release/incubator/brpc/KEYS -m "update brpc KEYS"
svn cp https://dist.apache.org/repos/dist/dev/brpc/KEYS https://dist.apache.org/repos/dist/release/brpc/KEYS -m "update brpc KEYS"
```

After commit the svn, access <https://downloads.apache.org/incubator/brpc/KEYS>, check whether the content is updated. It may take several minutes to wait for the content to be updated before continuing.
After commit the svn, access <https://downloads.apache.org/brpc/KEYS>, check whether the content is updated. It may take several minutes to wait for the content to be updated before continuing.

### 2. Vote stage

Expand Down Expand Up @@ -562,7 +562,7 @@ Apache brpc community
### 1. Move the release package from Apache SVN directory dist/dev to dist/release

```
svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.apache.org/repos/dist/release/incubator/brpc/1.0.0 -m "release brpc 1.0.0"
svn mv https://dist.apache.org/repos/dist/dev/brpc/1.0.0 https://dist.apache.org/repos/dist/release/brpc/1.0.0 -m "release brpc 1.0.0"
```

### 2. Create github release
Expand All @@ -574,9 +574,9 @@ svn mv https://dist.apache.org/repos/dist/dev/incubator/brpc/1.0.0 https://dist.

After waiting and confirming that the new release is synchronized to the Apache image, update the following page: <https://brpc.apache.org/docs/downloadbrpc/> by change the code in <https://github.com/apache/brpc-website/>. Please update both Chinese and English.

The download links of GPG signature files and hash check files should use this prefix: `https://downloads.apache.org/incubator/brpc/`
The download links of GPG signature files and hash check files should use this prefix: `https://downloads.apache.org/brpc/`

The download link of the code package should use this prefix: `https://dlcdn.apache.org/incubator/brpc/`
The download link of the code package should use this prefix: `https://dlcdn.apache.org/brpc/`

### 4. Send email to announce release finished

Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/getting_started/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ no known issues.

Be compatible with pb 3.x and pb 2.x with the same file:
Don't use new types in proto3 and start the proto file with `syntax="proto2";`
[tools/add_syntax_equal_proto2_to_all.sh](https://github.com/brpc/brpc/blob/master/tools/add_syntax_equal_proto2_to_all.sh)can add `syntax="proto2"` to all proto files without it.
[tools/add_syntax_equal_proto2_to_all.sh](https://github.com/brpc/brpc/blob/master/tools/add_syntax_equal_proto2_to_all.sh) can add `syntax="proto2"` to all proto files without it.

Arena in pb 3.x is not supported yet.

Expand Down Expand Up @@ -358,7 +358,7 @@ When you remove tcmalloc, not only remove the linkage with tcmalloc but also the

#### glog: 3.3+

brpc implements a default [logging utility](../../src/butil/logging.h) which conflicts with glog. To replace this with glog, add *--with-glog* to config_brpc.sh or add `-DWITH_GLOG=ON` to cmake.
brpc implements a default [logging utility](../../src/butil/logging.h) which conflicts with glog. To replace this with glog, add `--with-glog` to config_brpc.sh or add `-DWITH_GLOG=ON` to cmake.

#### valgrind: 3.8+

Expand Down
2 changes: 1 addition & 1 deletion content/zh/_index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h3 class="section-head">你可以使用它：</h3>
<li>redis and memcached, 线程安全，比官方client更方便。</li>
<li>rtmp/flv/hls, 可用于搭建流媒体服务。</li>
<li>hadoop_rpc (可能开源)。</li>
<li>支持rdma(即将开源)。</li>
<li>支持rdma。</li>
<li>支持thrift, 线程安全，比官方client更方便。</li>
<li>各种百度内使用的协议: baidu_std, streaming_rpc, hulu_pbrpc, sofa_pbrpc, nova_pbrpc, public_pbrpc, ubrpc和使用nshead的各种协议。</li>
<li>基于工业级的RAFT算法实现搭建高可用分布式系统，已在braft开源。</li>
Expand Down
20 changes: 19 additions & 1 deletion content/zh/docs/DownloadBRPC/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ limitations under the License.
-->
## 下载 Apache bRPC

Apache bRPC 作为源工件发布。我们很高兴宣布我们的 1.5.0 版本已经发布如下了！
Apache bRPC 作为源工件发布。我们很高兴宣布我们的 1.7.0 版本已经发布如下了！


### 全部版本
Expand All @@ -50,6 +50,24 @@ Apache bRPC 作为源工件发布。我们很高兴宣布我们的 1.5.0 版本
</tr>
</thead>
<tbody>
<tr>
<td>Apache bRPC 1.7.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.7.0/apache-brpc-1.7.0-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.6.1 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.1/apache-brpc-1.6.1-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.6.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz">tar.gz</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz.sha512">SHA-512</a></td>
<td><a href="https://downloads.apache.org/brpc/1.6.0/apache-brpc-1.6.0-src.tar.gz.asc">ASC</a></td>
</tr>
<tr>
<td>Apache bRPC 1.5.0 (tar.gz)</td>
<td><a href="https://dlcdn.apache.org/brpc/1.5.0/apache-brpc-1.5.0-src.tar.gz">tar.gz</a></td>
Expand Down
Loading

0 comments on commit ed4ca0b

Please sign in to comment.