From 6fb54d4fc50d23b94bb800c85843bbe0cf835ab9 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 15:49:51 +0800 Subject: [PATCH 01/23] sig: merge Signed-off-by: tison --- teams/README.md | 4 ++ teams/bigdata/READNE.md | 11 +++++ teams/bigdata/membership.json | 21 +++++++++ teams/deployment/READNE.md | 14 ++++++ teams/deployment/membership.json | 45 ++++++++++++++++++++ teams/docs/READNE.md | 14 ++++++ teams/docs/membership.json | 59 ++++++++++++++++++++++++++ teams/migration/READNE.md | 15 +++++++ teams/migration/membership.json | 41 ++++++++++++++++++ teams/postgresql/READNE.md | 15 +++++++ teams/postgresql/membership.json | 21 +++++++++ teams/tidb/READNE.md | 28 ++++++++++++ teams/tidb/membership.json | 73 ++++++++++++++++++++++++++++++++ 13 files changed, 361 insertions(+) create mode 100644 teams/README.md create mode 100644 teams/bigdata/READNE.md create mode 100644 teams/bigdata/membership.json create mode 100644 teams/deployment/READNE.md create mode 100644 teams/deployment/membership.json create mode 100644 teams/docs/READNE.md create mode 100644 teams/docs/membership.json create mode 100644 teams/migration/READNE.md create mode 100644 teams/migration/membership.json create mode 100644 teams/postgresql/READNE.md create mode 100644 teams/postgresql/membership.json create mode 100644 teams/tidb/READNE.md create mode 100644 teams/tidb/membership.json diff --git a/teams/README.md b/teams/README.md new file mode 100644 index 00000000..246a8f85 --- /dev/null +++ b/teams/README.md @@ -0,0 +1,4 @@ +# Teams + +This folder holds all teams in the TiDB projects. + diff --git a/teams/bigdata/READNE.md b/teams/bigdata/READNE.md new file mode 100644 index 00000000..c212a68c --- /dev/null +++ b/teams/bigdata/READNE.md @@ -0,0 +1,11 @@ +# BigData Team + +This team works for connecting TiDB with Big Data ecosystem. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [tidb-incubator/TiBigData](https://github.com/tidb-incubator/TiBigData) diff --git a/teams/bigdata/membership.json b/teams/bigdata/membership.json new file mode 100644 index 00000000..9953ed13 --- /dev/null +++ b/teams/bigdata/membership.json @@ -0,0 +1,21 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "marsishandsome" + ], + + "committers": [ + "Coderlxl", + "LittleFall", + "birdstorm", + "humengyu2012", + "ilovesoup", + "sunxiaoguang", + "windtalker" + ], + + "reviewers": [] +} diff --git a/teams/deployment/READNE.md b/teams/deployment/READNE.md new file mode 100644 index 00000000..adb011cd --- /dev/null +++ b/teams/deployment/READNE.md @@ -0,0 +1,14 @@ +# Deployment Team + +This team works for deployment of TiDB cluster. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [tiup](https://github.com/pingcap/tiup) +* [tidb-operator](https://github.com/pingcap/tidb-operator) +* [tidb-docker-compose](https://github.com/pingcap/tidb-docker-compose) +* [advanced-statefulset](https://github.com/pingcap/advanced-statefulset) diff --git a/teams/deployment/membership.json b/teams/deployment/membership.json new file mode 100644 index 00000000..0425bf3a --- /dev/null +++ b/teams/deployment/membership.json @@ -0,0 +1,45 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "DanielZhangQD", + "Yisaer", + "lonng", + "lucklove" + ], + + "committers": [ + "9547", + "AstroProfundis", + "LinuxGit", + "aylei", + "cofyc", + "csuzhangxc", + "dragonly", + "gregwebs", + "handlerww", + "jlerche", + "july2993", + "july2993", + "mikechengwei", + "nrc", + "onlymellb", + "qiffang", + "sdojjy", + "shuijing198799", + "tennix", + "weekface" + ], + + "reviewers": [ + "KanShiori", + "birdstorm", + "breeswish", + "cvvz", + "howardlau1999", + "lichunzhu", + "shonge" + ] +} diff --git a/teams/docs/READNE.md b/teams/docs/READNE.md new file mode 100644 index 00000000..6f7c72df --- /dev/null +++ b/teams/docs/READNE.md @@ -0,0 +1,14 @@ +# Docs Team + +This team works for documentation of TiDB projects. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [docs](https://github.com/pingcap/docs) +* [docs-cn](https://github.com/pingcap/docs-cn) +* [docs-dm](https://github.com/pingcap/docs-dm) +* [docs-tidb-operator](https://github.com/pingcap/docs-tidb-operator) diff --git a/teams/docs/membership.json b/teams/docs/membership.json new file mode 100644 index 00000000..7da9f2cf --- /dev/null +++ b/teams/docs/membership.json @@ -0,0 +1,59 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "lilin90", + "yikeke" + ], + + "committers": [ + "CaitinChen", + "CharLotteiu", + "DanielZhangQD", + "Liuxiaozhen12", + "SunRunAway", + "TomShawn", + "WangXiangUSTC", + "YiniXu9506", + "breeswish", + "cofyc", + "csuzhangxc", + "dcalvin", + "dragonly", + "jackysp", + "kissmydb", + "lance6716", + "lichunzhu", + "morgo", + "nullnotnil", + "overvenus", + "qiancai", + "queenypingcap", + "ran-huang", + "tangenta", + "toutdesuite" + ], + + "reviewers": [ + "3pointer", + "GMHDBJD", + "Joyinqin", + "Yisaer", + "amyangfei", + "anotherrachel", + "aylei", + "crazycs520", + "dveeden", + "ericsyh", + "glkappe", + "junlan-zhang", + "lucklove", + "lysu", + "superlzs0476", + "tiancaiamao", + "weekface", + "zimulala" + ] +} diff --git a/teams/migration/READNE.md b/teams/migration/READNE.md new file mode 100644 index 00000000..173a23d6 --- /dev/null +++ b/teams/migration/READNE.md @@ -0,0 +1,15 @@ +# Migration Team + +This team works for migration, replication, synchronization and transmission of data into and out of the TiDB ecosystem. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [ticdc](https://github.com/pingcap/ticdc) +* [dm](https://github.com/pingcap/dm) +* [dumpling](https://github.com/pingcap/dumpling) +* [tidb-binlog](https://github.com/pingcap/tidb-binlog) +* [br](https://github.com/pingcap/br) diff --git a/teams/migration/membership.json b/teams/migration/membership.json new file mode 100644 index 00000000..e5b58e77 --- /dev/null +++ b/teams/migration/membership.json @@ -0,0 +1,41 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "amyangfei", + "kennytm", + "lance6716" + ], + + "committers": [ + "3pointer", + "5kbpers", + "Ehco1996", + "GMHDBJD", + "IANTHEREAL", + "Leavrth", + "Little-Wallace", + "WangXiangUSTC", + "YuJuncen", + "csuzhangxc", + "glorv", + "holys", + "july2993", + "leoppro", + "lichunzhu", + "liuzix", + "lonng", + "overvenus", + "suzaku", + "zwj-coder" + ], + + "reviewers": [ + "gozssky", + "hi-rustin", + "iamxy", + "tiancaiamao" + ] +} diff --git a/teams/postgresql/READNE.md b/teams/postgresql/READNE.md new file mode 100644 index 00000000..72878259 --- /dev/null +++ b/teams/postgresql/READNE.md @@ -0,0 +1,15 @@ +# PostgreSQL Team + +This team works for integration between TiDB and PostgreSQL protocol. + +More details can be found in the [Design Document](https://github.com/DigitalChinaOpenSource/TiDB-for-PostgreSQL/blob/main/DESIGN_DOCUMENT.md) + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [DigitalChinaOpenSource/TiDB-for-PostgreSQL](https://github.com/DigitalChinaOpenSource/TiDB-for-PostgreSQL) +* [DigitalChinaOpenSource/DCParser](https://github.com/DigitalChinaOpenSource/DCParser) +* [DigitalChinaOpenSource/dcbr](https://github.com/DigitalChinaOpenSource/dcbr) diff --git a/teams/postgresql/membership.json b/teams/postgresql/membership.json new file mode 100644 index 00000000..88596630 --- /dev/null +++ b/teams/postgresql/membership.json @@ -0,0 +1,21 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "RogueJin", + "pupillord" + ], + + "committers": [ + "AmoebaProtozoa", + "MichaelYuAlreadyExists", + "Orion7r", + "guoshengcc", + "hey-hoho", + "studiolee" + ], + + "reviewers": [] +} diff --git a/teams/tidb/READNE.md b/teams/tidb/READNE.md new file mode 100644 index 00000000..017a2b20 --- /dev/null +++ b/teams/tidb/READNE.md @@ -0,0 +1,28 @@ +# TiDB Team + +This team works for the sql engine of TiDB, and multiple utilities. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [tidb](https://github.com/pingcap/tidb) +* [parser](https://github.com/pingcap/parser) +* [tidb-dashboard](https://github.com/pingcap/tidb-dashboard) +* [kvproto](https://github.com/pingcap/kvproto) +* [tipb](https://github.com/pingcap/tipb) +* [errcode](https://github.com/pingcap/errcode) +* [check](https://github.com/pingcap/check) +* [badger](https://github.com/pingcap/badger) +* [errors](https://github.com/pingcap/errors) +* [log](https://github.com/pingcap/log) +* [failpoint](https://github.com/pingcap/failpoint) +* [fn](https://github.com/pingcap/fn) +* [sysutil](https://github.com/pingcap/sysutil) +* [tidb-tools](https://github.com/pingcap/tidb-tools) +* [sqlalchemy-tidb](https://github.com/pingcap/sqlalchemy-tidb) +* [django-tidb](https://github.com/pingcap/django-tidb) +* [activerecord-tidb-adapter](https://github.com/pingcap/activerecord-tidb-adapter) +* [tidb-dev-guide](https://github.com/pingcap/tidb-dev-guide) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json new file mode 100644 index 00000000..ded92606 --- /dev/null +++ b/teams/tidb/membership.json @@ -0,0 +1,73 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "HunDunDM", + "XuHuaiyu", + "baurine", + "breeswish", + "kennytm", + "qw4990", + "tangenta", + "tiancaiamao", + "winoros", + "zimulala" + ], + + "committers": [ + "AilinKid", + "Deardrops", + "Reminiscent", + "SunRunAway", + "Yisaer", + "b41sh", + "bb7133", + "cfzjywxk", + "coocood", + "crazycs520", + "djshow832", + "eurekaka", + "francis0407", + "fzhedu", + "hanfei1991", + "ichn-hu", + "imtbkcat", + "iosmanthus", + "jackysp", + "lysu", + "lzmhhh123", + "mmyj", + "morgo", + "rebelice", + "shhdgit", + "winkyao", + "wjhuang2016", + "wshwsh12", + "xhebox", + "xiongjiwei", + "zhongzc", + "zz-jason" + ], + + "reviewers": [ + "Fullstop000", + "Renkai", + "Tjianke", + "TszKitLo40", + "bobotu", + "guo-shaoge", + "js00070", + "lamxTyler", + "lcwangchao", + "pingyu", + "shihongzhi", + "spongedu", + "tangwz", + "time-and-fate", + "tsthght", + "xuyifangreeneyes", + "zhuo-zhi" + ] +} From b87c841054d794ec990bdb92bd3fef58870cc33c Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 16:28:28 +0800 Subject: [PATCH 02/23] fix README typo Signed-off-by: tison --- teams/bigdata/{READNE.md => README.md} | 0 teams/deployment/{READNE.md => README.md} | 0 teams/docs/{READNE.md => README.md} | 0 teams/migration/{READNE.md => README.md} | 0 teams/postgresql/{READNE.md => README.md} | 0 teams/tidb/{READNE.md => README.md} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename teams/bigdata/{READNE.md => README.md} (100%) rename teams/deployment/{READNE.md => README.md} (100%) rename teams/docs/{READNE.md => README.md} (100%) rename teams/migration/{READNE.md => README.md} (100%) rename teams/postgresql/{READNE.md => README.md} (100%) rename teams/tidb/{READNE.md => README.md} (100%) diff --git a/teams/bigdata/READNE.md b/teams/bigdata/README.md similarity index 100% rename from teams/bigdata/READNE.md rename to teams/bigdata/README.md diff --git a/teams/deployment/READNE.md b/teams/deployment/README.md similarity index 100% rename from teams/deployment/READNE.md rename to teams/deployment/README.md diff --git a/teams/docs/READNE.md b/teams/docs/README.md similarity index 100% rename from teams/docs/READNE.md rename to teams/docs/README.md diff --git a/teams/migration/READNE.md b/teams/migration/README.md similarity index 100% rename from teams/migration/READNE.md rename to teams/migration/README.md diff --git a/teams/postgresql/READNE.md b/teams/postgresql/README.md similarity index 100% rename from teams/postgresql/READNE.md rename to teams/postgresql/README.md diff --git a/teams/tidb/READNE.md b/teams/tidb/README.md similarity index 100% rename from teams/tidb/READNE.md rename to teams/tidb/README.md From e7c073b9739296e95cacdd7e1aadadcec5fc8c9f Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 16:50:33 +0800 Subject: [PATCH 03/23] Update teams/deployment/membership.json --- teams/deployment/membership.json | 1 - 1 file changed, 1 deletion(-) diff --git a/teams/deployment/membership.json b/teams/deployment/membership.json index 0425bf3a..5c745d8c 100644 --- a/teams/deployment/membership.json +++ b/teams/deployment/membership.json @@ -22,7 +22,6 @@ "handlerww", "jlerche", "july2993", - "july2993", "mikechengwei", "nrc", "onlymellb", From 879a286c7d716294815fa463ed8f54acedaa1f20 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:04:43 +0800 Subject: [PATCH 04/23] separate diagnostic team Signed-off-by: tison --- teams/diagnostic/README.md | 11 +++++++++++ teams/diagnostic/membership.json | 24 ++++++++++++++++++++++++ teams/tidb/membership.json | 7 ------- 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 teams/diagnostic/README.md create mode 100644 teams/diagnostic/membership.json diff --git a/teams/diagnostic/README.md b/teams/diagnostic/README.md new file mode 100644 index 00000000..f5ecedc5 --- /dev/null +++ b/teams/diagnostic/README.md @@ -0,0 +1,11 @@ +# Diagnostic Team + +This team works for improving the observability and diagnostic experience of TiDB projects. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [tidb-dashboard](https://github.com/pingcap/tidb-dashboard) diff --git a/teams/diagnostic/membership.json b/teams/diagnostic/membership.json new file mode 100644 index 00000000..d1a9bf87 --- /dev/null +++ b/teams/diagnostic/membership.json @@ -0,0 +1,24 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "HunDunDM", + "baurine", + "breeswish" + ], + + "committers": [ + "Deardrops", + "zhongzc", + "crazycs520", + "iosmanthus", + "shhdgit" + ], + + "reviewers": [ + "Fullstop000", + "Renkai" + ] +} diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index ded92606..89cd0750 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -4,9 +4,7 @@ ], "maintainers": [ - "HunDunDM", "XuHuaiyu", - "baurine", "breeswish", "kennytm", "qw4990", @@ -34,26 +32,21 @@ "hanfei1991", "ichn-hu", "imtbkcat", - "iosmanthus", "jackysp", "lysu", "lzmhhh123", "mmyj", "morgo", "rebelice", - "shhdgit", "winkyao", "wjhuang2016", "wshwsh12", "xhebox", "xiongjiwei", - "zhongzc", "zz-jason" ], "reviewers": [ - "Fullstop000", - "Renkai", "Tjianke", "TszKitLo40", "bobotu", From 03d2a50c0a1d77d43780604b17e2c39a4dd43e70 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:19:54 +0800 Subject: [PATCH 05/23] respect tidb founders Signed-off-by: tison --- teams/tidb/membership.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index 89cd0750..16a65f03 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -6,12 +6,21 @@ "maintainers": [ "XuHuaiyu", "breeswish", + "c4pt0r", + "coocood", + "disksing", "kennytm", + "ngaut", + "qiuyesuifeng", "qw4990", + "shenli", + "siddontang", "tangenta", "tiancaiamao", + "winkyao", "winoros", - "zimulala" + "zimulala", + "zz-jason" ], "committers": [ @@ -23,7 +32,6 @@ "b41sh", "bb7133", "cfzjywxk", - "coocood", "crazycs520", "djshow832", "eurekaka", @@ -38,12 +46,10 @@ "mmyj", "morgo", "rebelice", - "winkyao", "wjhuang2016", "wshwsh12", "xhebox", - "xiongjiwei", - "zz-jason" + "xiongjiwei" ], "reviewers": [ From 566d577260b3a85d032f9fcdb19334f044d24a77 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:22:05 +0800 Subject: [PATCH 06/23] repositories ownership Signed-off-by: tison --- teams/migration/README.md | 1 - teams/tidb/README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/teams/migration/README.md b/teams/migration/README.md index 173a23d6..2cc0218c 100644 --- a/teams/migration/README.md +++ b/teams/migration/README.md @@ -12,4 +12,3 @@ See [membership.json](membership.json) * [dm](https://github.com/pingcap/dm) * [dumpling](https://github.com/pingcap/dumpling) * [tidb-binlog](https://github.com/pingcap/tidb-binlog) -* [br](https://github.com/pingcap/br) diff --git a/teams/tidb/README.md b/teams/tidb/README.md index 017a2b20..e4089ca8 100644 --- a/teams/tidb/README.md +++ b/teams/tidb/README.md @@ -10,7 +10,7 @@ See [membership.json](membership.json) * [tidb](https://github.com/pingcap/tidb) * [parser](https://github.com/pingcap/parser) -* [tidb-dashboard](https://github.com/pingcap/tidb-dashboard) +* [br](https://github.com/pingcap/br) * [kvproto](https://github.com/pingcap/kvproto) * [tipb](https://github.com/pingcap/tipb) * [errcode](https://github.com/pingcap/errcode) From 483566707a22caa55e35947b41f769173530b5a8 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:24:52 +0800 Subject: [PATCH 07/23] update migration membership Signed-off-by: tison --- teams/migration/membership.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teams/migration/membership.json b/teams/migration/membership.json index e5b58e77..8c5da8ad 100644 --- a/teams/migration/membership.json +++ b/teams/migration/membership.json @@ -33,6 +33,8 @@ ], "reviewers": [ + "3AceShowHand", + "ben1009", "gozssky", "hi-rustin", "iamxy", From b943b810291a832bed51e1fe3e93fc40fb483e0c Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:52:59 +0800 Subject: [PATCH 08/23] Yisaer self requests as committer Signed-off-by: tison --- teams/deployment/membership.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/deployment/membership.json b/teams/deployment/membership.json index 5c745d8c..83f9b79c 100644 --- a/teams/deployment/membership.json +++ b/teams/deployment/membership.json @@ -5,7 +5,6 @@ "maintainers": [ "DanielZhangQD", - "Yisaer", "lonng", "lucklove" ], @@ -14,6 +13,7 @@ "9547", "AstroProfundis", "LinuxGit", + "Yisaer", "aylei", "cofyc", "csuzhangxc", From 9e36d7252f82f248d1adc33c82f939dce0c546a1 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 17:55:31 +0800 Subject: [PATCH 09/23] nolouch & JmPotato as tidb reviewer Signed-off-by: tison --- teams/tidb/membership.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index 16a65f03..ce6f25a6 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -53,6 +53,7 @@ ], "reviewers": [ + "JmPotato", "Tjianke", "TszKitLo40", "bobotu", @@ -60,6 +61,7 @@ "js00070", "lamxTyler", "lcwangchao", + "nolouch", "pingyu", "shihongzhi", "spongedu", From 8fb7804486af05b8c583caa1c6eadfb5dfee6fa5 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 17 Aug 2021 19:11:34 +0800 Subject: [PATCH 10/23] transaction committers join to tidb team committer Signed-off-by: tison --- teams/tidb/membership.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index ce6f25a6..b4d6a32d 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -26,9 +26,11 @@ "committers": [ "AilinKid", "Deardrops", + "MyonKeminta", "Reminiscent", "SunRunAway", "Yisaer", + "andylokandy", "b41sh", "bb7133", "cfzjywxk", @@ -45,11 +47,14 @@ "lzmhhh123", "mmyj", "morgo", + "nrc", "rebelice", + "sticnarf", "wjhuang2016", "wshwsh12", "xhebox", - "xiongjiwei" + "xiongjiwei", + "youjiali1995" ], "reviewers": [ From f7544716c7fcfc736ba528176fd2b2b169574c95 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Aug 2021 11:56:05 +0800 Subject: [PATCH 11/23] upadte bigdata team scope and members Signed-off-by: tison --- teams/bigdata/README.md | 3 +++ teams/bigdata/membership.json | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/teams/bigdata/README.md b/teams/bigdata/README.md index c212a68c..e0402a84 100644 --- a/teams/bigdata/README.md +++ b/teams/bigdata/README.md @@ -8,4 +8,7 @@ See [membership.json](membership.json) ## Repositories +* [tispark](https://github.com/pingcap/tispark) +* [tispark-test](https://github.com/pingcap/tispark-test) +* [tispark-test-data](https://github.com/pingcap/tispark-test-data) * [tidb-incubator/TiBigData](https://github.com/tidb-incubator/TiBigData) diff --git a/teams/bigdata/membership.json b/teams/bigdata/membership.json index 9953ed13..843d7e40 100644 --- a/teams/bigdata/membership.json +++ b/teams/bigdata/membership.json @@ -4,16 +4,16 @@ ], "maintainers": [ - "marsishandsome" + "birdstorm", + "humengyu2012", + "marsishandsome", + "sunxiaoguang" ], "committers": [ "Coderlxl", "LittleFall", - "birdstorm", - "humengyu2012", "ilovesoup", - "sunxiaoguang", "windtalker" ], From b4300e7013407c09c570bfd7702f2af5d9f24ab0 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Aug 2021 12:22:48 +0800 Subject: [PATCH 12/23] respect acting tidb maintainers Signed-off-by: tison --- teams/tidb/membership.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index b4d6a32d..a31ee953 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -5,11 +5,15 @@ "maintainers": [ "XuHuaiyu", + "bb7133", "breeswish", "c4pt0r", + "cfzjywxk", "coocood", "disksing", + "jackysp", "kennytm", + "lonng", "ngaut", "qiuyesuifeng", "qw4990", @@ -32,8 +36,6 @@ "Yisaer", "andylokandy", "b41sh", - "bb7133", - "cfzjywxk", "crazycs520", "djshow832", "eurekaka", @@ -42,7 +44,6 @@ "hanfei1991", "ichn-hu", "imtbkcat", - "jackysp", "lysu", "lzmhhh123", "mmyj", From 20c8f37f6fecd30bb21f8e0a9bd8b84220905c59 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Aug 2021 17:24:21 +0800 Subject: [PATCH 13/23] TomShawn & qiancai as docs team maintainer Signed-off-by: tison --- teams/docs/membership.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teams/docs/membership.json b/teams/docs/membership.json index 7da9f2cf..05e64126 100644 --- a/teams/docs/membership.json +++ b/teams/docs/membership.json @@ -4,7 +4,9 @@ ], "maintainers": [ + "TomShawn", "lilin90", + "qiancai", "yikeke" ], @@ -14,7 +16,6 @@ "DanielZhangQD", "Liuxiaozhen12", "SunRunAway", - "TomShawn", "WangXiangUSTC", "YiniXu9506", "breeswish", @@ -29,7 +30,6 @@ "morgo", "nullnotnil", "overvenus", - "qiancai", "queenypingcap", "ran-huang", "tangenta", From 1361026c26421a4383dcb82ba34eb1c4f6dd9e17 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Aug 2021 17:25:36 +0800 Subject: [PATCH 14/23] zhouqiang-cl as tidb team committer for being release manager many times Signed-off-by: tison --- teams/tidb/membership.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index a31ee953..751cdf86 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -55,7 +55,8 @@ "wshwsh12", "xhebox", "xiongjiwei", - "youjiali1995" + "youjiali1995", + "zhouqiang-cl" ], "reviewers": [ From 20b796408a9f03ccc05be637981bbaf002c4d4b6 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 18 Aug 2021 20:13:51 +0800 Subject: [PATCH 15/23] zhangjinpeng1987 as tidb reviewer Signed-off-by: tison --- teams/tidb/membership.json | 1 + 1 file changed, 1 insertion(+) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index 751cdf86..07423d34 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -76,6 +76,7 @@ "time-and-fate", "tsthght", "xuyifangreeneyes", + "zhangjinpeng1987", "zhuo-zhi" ] } From 4f32e4af2ad5947a8b9680f61ec25dade72fe796 Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 19 Aug 2021 13:05:33 +0800 Subject: [PATCH 16/23] separate tiup and sig-k8s Signed-off-by: tison --- teams/deployment/membership.json | 8 +------- teams/tiup/README.md | 11 +++++++++++ teams/tiup/membership.json | 23 +++++++++++++++++++++++ 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 teams/tiup/README.md create mode 100644 teams/tiup/membership.json diff --git a/teams/deployment/membership.json b/teams/deployment/membership.json index 83f9b79c..170e5a73 100644 --- a/teams/deployment/membership.json +++ b/teams/deployment/membership.json @@ -4,13 +4,10 @@ ], "maintainers": [ - "DanielZhangQD", - "lonng", - "lucklove" + "DanielZhangQD" ], "committers": [ - "9547", "AstroProfundis", "LinuxGit", "Yisaer", @@ -23,7 +20,6 @@ "jlerche", "july2993", "mikechengwei", - "nrc", "onlymellb", "qiffang", "sdojjy", @@ -34,8 +30,6 @@ "reviewers": [ "KanShiori", - "birdstorm", - "breeswish", "cvvz", "howardlau1999", "lichunzhu", diff --git a/teams/tiup/README.md b/teams/tiup/README.md new file mode 100644 index 00000000..d2ef6b69 --- /dev/null +++ b/teams/tiup/README.md @@ -0,0 +1,11 @@ +# Deployment Team + +This team works for TiUP, a tool to download and install TiDB components. + +## Members + +See [membership.json](membership.json) + +## Repositories + +* [tiup](https://github.com/pingcap/tiup) diff --git a/teams/tiup/membership.json b/teams/tiup/membership.json new file mode 100644 index 00000000..b830c4a3 --- /dev/null +++ b/teams/tiup/membership.json @@ -0,0 +1,23 @@ +{ + "_comment": [ + "Items of lists in this file are in alphabetical order. Please keep it on modification." + ], + + "maintainers": [ + "AstroProfundis", + "lonng", + "lucklove", + "nexustar" + ], + + "committers": [ + "9547", + "july2993", + "nrc" + ], + + "reviewers": [ + "birdstorm", + "breeswish" + ] +} From f726935e8242a2f9d3016c57e7c88e4511f62875 Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 19 Aug 2021 13:09:54 +0800 Subject: [PATCH 17/23] asddongmen as migration reviewer Signed-off-by: tison --- teams/migration/membership.json | 1 + 1 file changed, 1 insertion(+) diff --git a/teams/migration/membership.json b/teams/migration/membership.json index 8c5da8ad..d344645f 100644 --- a/teams/migration/membership.json +++ b/teams/migration/membership.json @@ -34,6 +34,7 @@ "reviewers": [ "3AceShowHand", + "asddongmen", "ben1009", "gozssky", "hi-rustin", From 4d72cf5d49ff844513d48515db804b3e310bfbc1 Mon Sep 17 00:00:00 2001 From: tison Date: Thu, 19 Aug 2021 14:28:45 +0800 Subject: [PATCH 18/23] lonng as tiup committer Signed-off-by: tison --- teams/tiup/membership.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/tiup/membership.json b/teams/tiup/membership.json index b830c4a3..77d1eca0 100644 --- a/teams/tiup/membership.json +++ b/teams/tiup/membership.json @@ -5,7 +5,6 @@ "maintainers": [ "AstroProfundis", - "lonng", "lucklove", "nexustar" ], @@ -13,6 +12,7 @@ "committers": [ "9547", "july2993", + "lonng", "nrc" ], From b1dcf5a3e1b6005351cd795c13b7decc9a996b87 Mon Sep 17 00:00:00 2001 From: tison Date: Sun, 22 Aug 2021 13:51:44 +0800 Subject: [PATCH 19/23] team bylaws Signed-off-by: tison --- teams/README.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++- votes/README.md | 3 ++ votes/TEMPLATE.md | 13 ++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 votes/README.md create mode 100644 votes/TEMPLATE.md diff --git a/teams/README.md b/teams/README.md index 246a8f85..be538796 100644 --- a/teams/README.md +++ b/teams/README.md @@ -1,4 +1,80 @@ # Teams -This folder holds all teams in the TiDB projects. +This folder holds all teams in the TiDB projects. This document defines governance policies of the teams. +Teams are persistent open groups that focus on a part of the TiDB projects. A team has its reviewer, committer and maintainer, and owns one or more repositories.Team level decision making comes from its maintainers. + +The [Technical Oversight Committee (TOC)](/toc/README.md) is in charge of team creation and retirement, and arbitrates divergence between team. But TOC members don't participant team level decision making directly. + +## Roles and Responsibilities + +### Reviewers + +Reviewers are individuals who actively make contribution and are willing to participate in the code review of new contributions. We identify reviewers from active contributors. The committers should explicitly solicit reviews from reviewers. High-quality code reviews prevent technical debt for long-term and are crucial to the success of the project. A pull request to the project has to be reviewed by at least one reviewer in order to be merged. + +Review access is by invitation only and must be approved by consensus of the maintainers. A reviewer is considered emeritus by their own declaration. An emeritus reviewer may request reinstatement of review access from the maintainers, which will be sufficient to restore him or her to active reviewer status. + +Review access can be revoked by consensus by the maintainers (except the reviewer in question if they are also a maintainer). + +### Committers + +Committers are individuals who are granted the write access to the repositories belong to the team. A committer is usually responsible for a certain area or several areas of the code where they oversee the code review process. The area of contribution can take all forms, including code contributions and code reviews, documents, education, and outreach. Committers are essential for a high quality and healthy project. + +Commit access is by invitation only and must be approved by consensus of the maintainers. A committer is considered emeritus by their own declaration. An emeritus committer may request reinstatement of commit access from the maintainers, which will be sufficient to restore him or her to active committer status. + +Commit access can be revoked by consensus by the maintainers (except the committer in question if they are also a maintainer). + +### Maintainers + +The maintainers consist group of active committers that moderate the discussion, manage the project release, and proposes new committers or maintainers. Potential candidates are usually proposed via an internal discussion among maintainers, followed by a consensus approval, i.e. a concrete number of approvals, and no vetoes. Any veto must be accompanied by reasoning. Maintainers should serve the community by upholding the community practices and guidelines TiDB a better community for everyone. Maintainers should nominate new reviewer, committers and maintainers, and should also strive to only nominate new candidates outside of their own organization. + +Membership of the maintainers is by invitation only and must be approved by a consensus of the maintainers. A maintainer is considered emeritus by their own declaration. An emeritus member may request reinstatement to the maintainers, which will be sufficient to restore him or her to active maintainers. + +Membership of the maintainers can be revoked by a consensus vote of all the maintainers other than the member in question. + +## Decision Making + +Within the teams, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require 'consensus' approval. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval. + +### Voting + +Decisions regarding the project are made by votes on [the community repository](https://github.com/pingcap/community). Votes are clearly indicated by a pull request adding an entry under [votes](/votes/README.md) folder. Votes may contain multiple items for approval and these should be clearly separated. Voting is carried out by replying to the vote pull request. Voting may take three flavors + +* **+1**: 'Yes,' 'Agree,' or 'the action should be performed.' +* **0**: Neutral about the proposed action (or mildly negative but not enough so to want to block it). +* **-1**: This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. + +All participants in the TiDB community are encouraged to show their agreement with or against a particular action by voting. For team decisions, only the votes of active team maintainers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action in the wider community. + +Only active (i.e. non-emeritus) maintainers have binding votes. + +### Approvals + +These are three types of approvals that can be sought. Different actions require different types of approvals. + +* **Consensus**: Consensus requires 2 binding +1 votes and no binding vetoes. +* **Lazy Majority**: A lazy majority vote requires 2 binding +1 votes and more binding +1 votes than -1 votes. +* **2/3 Majority**: Some actions require a 2/3 majority to pass. Such actions typically affect the foundation of the project (e.g. adopting a new codebase). The higher threshold is designed to ensure such changes are strongly supported. To pass this vote requires at least 2/3 of binding vote holders to vote +1. + +> In order to address the case of insufficient active binding voters to reach 2/3 majority, one can follow the process below to exclude a binding vote from the counting of this particular voting thread. +> +> 1. Wait until the minimum length of the voting passes. +> 2. Publicly reach out via mentioned to the remaining binding voters in the voting pull request for at least 2 attempts with at least 7 days between two attempts. +> 3. If the binding voter being contacted still failed to respond after all the attempts, the binding voter will be considered as inactive for the purpose of this particular voting. + +### Vetoes + +A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the reasons for the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto - merely that the veto is valid. + +If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the action that has been vetoed must be reversed in a timely manner. + +### Actions + +| Actions | Description | Approval | Binding Voters | Minimum Length (days) | +| :----------------- | :---------------------------------------------- | :------------ | :----------------- | :-------------------- | +| New Reviewer | When a new reviewer is proposed for the team. | Lazy Majority | Active maintainers | 3 | +| New Committer | When a new committer is proposed for the team. | Consensus | Active maintainers | 6 | +| New Maintainer | When a new maintainer is proposed for the team. | Consensus | Active maintainers | 6 | +| Reviewer Removal | When removal of review privileges is sought. | Consensus | Active maintainers | 6 | +| Committer Removal | When removal of commit privileges is sought. | Consensus | Active maintainers | 6 | +| Maintainer Removal | When removal of maintain privileges is sought. | Consensus | Active maintainers | 6 | diff --git a/votes/README.md b/votes/README.md new file mode 100644 index 00000000..879aed16 --- /dev/null +++ b/votes/README.md @@ -0,0 +1,3 @@ +# Votes + +This folder holds all votes proposed in TiDB community. diff --git a/votes/TEMPLATE.md b/votes/TEMPLATE.md new file mode 100644 index 00000000..349c0bc2 --- /dev/null +++ b/votes/TEMPLATE.md @@ -0,0 +1,13 @@ +# A Vote for My Proposal + +## Proposal + +Replace this content with the proposal. + +## Deadline + +The vote will be open for at least {duration} unless there is an objection or not enough votes. + +## Result + +Conclude the voting result, including approvals and vetoes, binding and non-binding. From e76aca0bcf419496f805f2856ab2682dc598af7b Mon Sep 17 00:00:00 2001 From: tison Date: Sun, 22 Aug 2021 13:55:20 +0800 Subject: [PATCH 20/23] migrate memebers always works on tidb teams projects Signed-off-by: tison --- teams/tidb/membership.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/teams/tidb/membership.json b/teams/tidb/membership.json index 07423d34..1b484388 100644 --- a/teams/tidb/membership.json +++ b/teams/tidb/membership.json @@ -5,6 +5,7 @@ "maintainers": [ "XuHuaiyu", + "amyangfei", "bb7133", "breeswish", "c4pt0r", @@ -13,6 +14,7 @@ "disksing", "jackysp", "kennytm", + "lance6716", "lonng", "ngaut", "qiuyesuifeng", @@ -28,12 +30,18 @@ ], "committers": [ + "3pointer", "AilinKid", "Deardrops", + "Ehco1996", + "GMHDBJD", + "Leavrth", + "Little-Wallace", "MyonKeminta", "Reminiscent", "SunRunAway", "Yisaer", + "YuJuncen", "andylokandy", "b41sh", "crazycs520", @@ -41,14 +49,18 @@ "eurekaka", "francis0407", "fzhedu", + "glorv", "hanfei1991", "ichn-hu", "imtbkcat", + "lichunzhu", + "liuzix", "lysu", "lzmhhh123", "mmyj", "morgo", "nrc", + "overvenus", "rebelice", "sticnarf", "wjhuang2016", @@ -56,7 +68,8 @@ "xhebox", "xiongjiwei", "youjiali1995", - "zhouqiang-cl" + "zhouqiang-cl", + "zwj-coder" ], "reviewers": [ @@ -64,7 +77,9 @@ "Tjianke", "TszKitLo40", "bobotu", + "gozssky", "guo-shaoge", + "hi-rustin", "js00070", "lamxTyler", "lcwangchao", From e1dd2ee0060f28117809ef18769755c373ceecda Mon Sep 17 00:00:00 2001 From: tison Date: Mon, 23 Aug 2021 09:08:52 +0800 Subject: [PATCH 21/23] kubernetes team Signed-off-by: tison --- teams/{deployment => kubernetes}/README.md | 6 ++++-- teams/{deployment => kubernetes}/membership.json | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename teams/{deployment => kubernetes}/README.md (56%) rename teams/{deployment => kubernetes}/membership.json (93%) diff --git a/teams/deployment/README.md b/teams/kubernetes/README.md similarity index 56% rename from teams/deployment/README.md rename to teams/kubernetes/README.md index adb011cd..d53b3a47 100644 --- a/teams/deployment/README.md +++ b/teams/kubernetes/README.md @@ -1,6 +1,9 @@ # Deployment Team -This team works for deployment of TiDB cluster. +This team works for Kubernetes and Docker integration. + +* Supporting new features or improving performance for TiDB Products on Kubernetes and Docker. +* Supporting TiDB ecosystem tools integrated natively with TiDB on Kubernetes. ## Members @@ -8,7 +11,6 @@ See [membership.json](membership.json) ## Repositories -* [tiup](https://github.com/pingcap/tiup) * [tidb-operator](https://github.com/pingcap/tidb-operator) * [tidb-docker-compose](https://github.com/pingcap/tidb-docker-compose) * [advanced-statefulset](https://github.com/pingcap/advanced-statefulset) diff --git a/teams/deployment/membership.json b/teams/kubernetes/membership.json similarity index 93% rename from teams/deployment/membership.json rename to teams/kubernetes/membership.json index 170e5a73..2f48d6eb 100644 --- a/teams/deployment/membership.json +++ b/teams/kubernetes/membership.json @@ -4,7 +4,8 @@ ], "maintainers": [ - "DanielZhangQD" + "DanielZhangQD", + "csuzhangxc" ], "committers": [ @@ -13,7 +14,6 @@ "Yisaer", "aylei", "cofyc", - "csuzhangxc", "dragonly", "gregwebs", "handlerww", From bf479bbdde04de8f6d3c6f1dd5f119a05a54b00b Mon Sep 17 00:00:00 2001 From: tison Date: Mon, 23 Aug 2021 22:08:41 +0800 Subject: [PATCH 22/23] address comments Signed-off-by: tison --- teams/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teams/README.md b/teams/README.md index be538796..1f10fe08 100644 --- a/teams/README.md +++ b/teams/README.md @@ -2,7 +2,7 @@ This folder holds all teams in the TiDB projects. This document defines governance policies of the teams. -Teams are persistent open groups that focus on a part of the TiDB projects. A team has its reviewer, committer and maintainer, and owns one or more repositories.Team level decision making comes from its maintainers. +Teams are persistent open groups that focus on a part of the TiDB projects. A team has its reviewer, committer and maintainer, and owns one or more repositories. Team level decision making comes from its maintainers. The [Technical Oversight Committee (TOC)](/toc/README.md) is in charge of team creation and retirement, and arbitrates divergence between team. But TOC members don't participant team level decision making directly. @@ -14,7 +14,7 @@ Reviewers are individuals who actively make contribution and are willing to part Review access is by invitation only and must be approved by consensus of the maintainers. A reviewer is considered emeritus by their own declaration. An emeritus reviewer may request reinstatement of review access from the maintainers, which will be sufficient to restore him or her to active reviewer status. -Review access can be revoked by consensus by the maintainers (except the reviewer in question if they are also a maintainer). +Review access can be revoked by consensus by the maintainers. ### Committers @@ -22,7 +22,7 @@ Committers are individuals who are granted the write access to the repositories Commit access is by invitation only and must be approved by consensus of the maintainers. A committer is considered emeritus by their own declaration. An emeritus committer may request reinstatement of commit access from the maintainers, which will be sufficient to restore him or her to active committer status. -Commit access can be revoked by consensus by the maintainers (except the committer in question if they are also a maintainer). +Commit access can be revoked by consensus by the maintainers. ### Maintainers From 5697ba763b2b6fa365ddf200fc410eeac4a0d1c6 Mon Sep 17 00:00:00 2001 From: tison Date: Mon, 30 Aug 2021 14:49:25 +0800 Subject: [PATCH 23/23] remove tidb-docker-compose for kubernetes team Signed-off-by: tison --- teams/kubernetes/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/teams/kubernetes/README.md b/teams/kubernetes/README.md index d53b3a47..7597faad 100644 --- a/teams/kubernetes/README.md +++ b/teams/kubernetes/README.md @@ -12,5 +12,4 @@ See [membership.json](membership.json) ## Repositories * [tidb-operator](https://github.com/pingcap/tidb-operator) -* [tidb-docker-compose](https://github.com/pingcap/tidb-docker-compose) * [advanced-statefulset](https://github.com/pingcap/advanced-statefulset)