Skip to content

Commit

Permalink
Merge branch 'master' into nshead_rpc_dump_and_replay
Browse files Browse the repository at this point in the history
  • Loading branch information
wangweibing committed Mar 28, 2022
2 parents d612130 + 8776fa8 commit 15dc3b5
Show file tree
Hide file tree
Showing 173 changed files with 3,261 additions and 376 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ before_script:
before_install:
- wget --no-clobber https://github.com/bazelbuild/bazel/releases/download/0.25.1/bazel_0.25.1-linux-x86_64.deb && sudo dpkg -i bazel_0.25.1-linux-x86_64.deb
- sudo apt-get install automake bison flex g++ git libboost-all-dev libevent-dev libssl-dev libtool make pkg-config # thrift dependencies
- wget http://www.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && tar -xf thrift-0.11.0.tar.gz && cd thrift-0.11.0/ && ./configure --prefix=/usr --with-rs=no --with-ruby=no --with-python=no --with-java=no --with-go=no --with-perl=no --with-php=no --with-csharp=no --with-erlang=no --with-lua=no --with-nodejs=no CXXFLAGS="-Wno-unused-variable" && make -j4 && sudo make install && cd -
- wget https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && tar -xf thrift-0.11.0.tar.gz && cd thrift-0.11.0/ && ./configure --prefix=/usr --with-rs=no --with-ruby=no --with-python=no --with-java=no --with-go=no --with-perl=no --with-php=no --with-csharp=no --with-erlang=no --with-lua=no --with-nodejs=no CXXFLAGS="-Wno-unused-variable" && make -j4 && sudo make install && cd -

install:
- sudo apt-get install -qq realpath libgflags-dev libprotobuf-dev libprotoc-dev protobuf-compiler libleveldb-dev libgoogle-perftools-dev libboost-dev libssl-dev libevent-dev libboost-test-dev libgoogle-glog-dev
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

# A image for building/testing brpc
FROM ubuntu:16.04
FROM ubuntu:20.04

# prepare env
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand All @@ -37,6 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libsnappy-dev && \
apt-get clean -y

RUN git clone https://github.com/brpc/brpc.git brpc
RUN cd /brpc && sh config_brpc.sh --headers=/usr/include --libs=/usr/lib && \
RUN git clone https://github.com/apache/incubator-brpc.git
RUN cd incubator-brpc && sh config_brpc.sh --headers=/usr/include --libs=/usr/lib && \
make -j "$(nproc)"
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ src/butil/third_party/valgrind/valgrind.h: licensed under the following terms:

--------------------------------------------------------------------------------

src/butil/crc32c.h, src/butil/crc32c.cc: licensed under the following terms:
src/butil/crc32c.h, src/butil/crc32c.cc, test/crc32c_unittest.cc: licensed under the following terms:

Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
This source code is licensed under the BSD-style license found in the
Expand Down Expand Up @@ -663,7 +663,7 @@ src/brpc/ts.cpp: licensed under the following terms:

--------------------------------------------------------------------------------

src/brpc/builtin/pprof_perl.cpp: licensed under the following terms:
src/brpc/builtin/pprof_perl.cpp, tools/pprof: licensed under the following terms:

Copyright (c) 1998-2007, Google Inc.
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache brpc (incubating)
Copyright 2018-2020 The Apache Software Foundation
Copyright 2018-2021 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
2 changes: 1 addition & 1 deletion RELEASE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.7
1.0.0
43 changes: 43 additions & 0 deletions community/cases.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# brpc的应用案例集合

## what is this
这里列出brpc在各个企业中的落地场景,包括企业名称,应用项目作用,集群规模和QPS统计,使用的版本信息等

## Why this
列出各个案例,一来方便用户进行参考,了解brpc可以用在哪些场景下;
二来方便社区开发者统计brpc的版本,规模等情况

# Case List
## 落地case的sample (如果有多个场景,建议分开)
* 公司名称: xxx公司
* 落地项目: 例如app的个性化推荐系统的预测服务
* 集群规模: 例如100台
* QPS: 例如峰值1000万, 均值100万
* 使用版本: 例如社区版本0.9.7
* 信息提供者:某某

## brpc在 百度的落地情况
* 公司名称: 百度
* 落地项目: 基础架构(分布式计算、存储、数据库等),业务系统(Feed、凤巢、地图等)
* 集群规模: 2000多个活跃模块,100w以上实例
* 使用版本: baidu内部版本
* 信息提供者:wwbmmm

## brpc在维沃的落地情况
* 公司名称: 维沃(vivo)
* 落地项目: 在线推荐系统
* 使用版本: 社区版本0.9.7
* 信息提供者:guodongxiaren

## brpc在爱奇艺的落地情况
* 公司名称: 爱奇艺(iqiyi)
* 落地项目: 广告、推荐、搜索
* 使用版本: 基于社区版本定制
* 集群规模: 3000+台机器(广告)
* 信息提供者:cdjingit

## brpc在第四范式的落地情况
* 公司名称: 第四范式(4paradigm)
* 落地项目: 风控、推荐、智能运维等
* 使用版本: 基于社区版本定制
* 信息提供者:dl239
1 change: 1 addition & 0 deletions community/logo-bRPC.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions community/newcommitter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 这里记录new committer相关的流程和网站


## 成为committer的路程
1. 在private邮件中发起讨论和投票
2. 投票通过即OK
3. 让他填写CLA并发给[email protected]


## 如何赋予committer在github上的权限

1. 加为committer
https://whimsy.apache.org/roster/ppmc/brpc

2. 让他设置github id
https://id.apache.org/

3. 让他访问该网址,获得github的权限
https://gitbox.apache.org/setup/


## apache 官网new committer相关的文档

https://community.apache.org/newcommitter.html

https://infra.apache.org/new-committers-guide.html

38 changes: 38 additions & 0 deletions community/oncall.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 值周工程师的职责如下

## 1. 每天查看github上brpc项目待处理的Pull Request和Issue列表,负责问题的处理
* 包括标记issue,回复issue,关闭issue等;
* 判断issue是否是长期Issue,如果是则标记为Pending
* 判断Issue的类型,例如bug,enhancement, discussion等
* 把issue分配到熟悉该模块的贡献者(可在微信群里询问谁来负责)

## 2. 轮值时间为一周
* 即从周日早上到下周六晚上

## 3. 轮值结束需要
* 编写值周report,并发送到[email protected]邮件群中
* 提醒下一位轮值同学

## 4. 值周顺序如下
* 朱佳顺 @zyearn
* 李磊 @lorinlee
* 王伟冰 @wwbmmm
* 蔡道进 @cdjingit
* 何磊 @TousakaRin

## 5. 值周记录如下

| 时间(月/日/年) | 值周人 | 值周report|
| ---- | ---- | --- |
| | 朱佳顺 |
| 06/21/2021 to 06/27/2021 | 李磊 | https://lists.apache.org/thread.html/rc9eb911bc6465c16bd8bb14f9d1f7c9548e13759101f43cf0300908a%40%3Cdev.brpc.apache.org%3E
| 06/28/2021 to 07/04/2021 | 蔡道进 | https://lists.apache.org/thread.html/r23992a4f958bea5b28b9b87a09c60790dae8d5d28f2c49aded3f1760%40%3Cdev.brpc.apache.org%3E
| 07/05/2021 - 07/12/2021 | 何磊 | https://lists.apache.org/thread.html/r3f67bc42ecdc07b25c39aedaf30aeae79039aa1cc3e6ad99364c8178%40%3Cdev.brpc.apache.org%3E
| 08/16/2021 - 08/22/2021 | 朱佳顺 | https://lists.apache.org/thread.html/rc03364574b40e4e9bb8112eae0500589d632011f535a4f0747c4ce5f%40%3Cdev.brpc.apache.org%3E
| 08/23/2021 - 08/29/2021 | 李磊 | https://lists.apache.org/thread.html/r10522af87df62aa0aa48f5a279cef219db1917048108cb744e53772e%40%3Cdev.brpc.apache.org%3E
| 08/30/2021 - 09/05/2021 | 蔡道进 |https://lists.apache.org/thread.html/r6e9846a17464581528280b43d835000da78ee700d2fa195cb92d2353%40%3Cdev.brpc.apache.org%3E
| 09/06/2021 - 09/12/2021 | 何磊 | https://lists.apache.org/thread.html/ra10e10abca213e0e5e797a74af8a9c8810e54fd1543c108bf03a56e5%40%3Cdev.brpc.apache.org%3E
| 09/20/2021 - 09/26/2021 | 李磊 | https://lists.apache.org/thread.html/r19c08874ad681edbc82526a09b34d3ccabe7cf168ed91935575ff557%40%3Cdev.brpc.apache.org%3E
| 09/27/2021 - 10/03/2021 | 蔡道进 | https://lists.apache.org/thread.html/re3391d87f2e2aba55986b96b18ca375f07840bac67249fced2f851f5%40%3Cdev.brpc.apache.org%3E
| 13/12/2021 - 19/12/2021 | 蔡道进 | https://lists.apache.org/thread/mvclsy79859mrbdso1xzm6y7yz3lg6w0
| 01/24/2022 - 02/06/2022 | 王伟冰 | https://lists.apache.org/thread/ttgqnw4hfw0qnb7swvnn2kxb5b9hkdbo
Loading

0 comments on commit 15dc3b5

Please sign in to comment.