From 6b45e4f9c2ace53815d258576a7a0dcd4afc18ea Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 29 Feb 2024 07:44:54 +0000 Subject: [PATCH 01/12] chore: add prow OWNERS file --- OWNERS_ALIASES | 18 ++++++++++++ proto/OWNERS | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 OWNERS_ALIASES create mode 100644 proto/OWNERS diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES new file mode 100644 index 000000000..247c5183c --- /dev/null +++ b/OWNERS_ALIASES @@ -0,0 +1,18 @@ +# Sort the member alphabetically. +aliases: + sig-approvers-pb: # default approvers for `proto` folder + - kevin-xialiu + - yudongusa + - zhangjinpeng1987 + sig-approvers-pb-br: + - BornChanger + sig-approvers-pb-cdc: + - flowbehappy + sig-approvers-pb-raftstore: + - tonyxuqqi + - overvenus + sig-approvers-pb-tikv: + - tonyxuqqi + sig-approvers-pb-autoid: + - bb7133 + - tiancaiamao diff --git a/proto/OWNERS b/proto/OWNERS new file mode 100644 index 000000000..ca8063672 --- /dev/null +++ b/proto/OWNERS @@ -0,0 +1,76 @@ +# See the OWNERS docs at https://go.k8s.io/owners +options: + no_parent_owners: true +filters: + "^autoid\\.proto$": + approvers: [sig-approvers-pb-autoid] + "^brpb\\.proto$": + approvers: [sig-approvers-pb-br] + "^cdcpb\\.proto$": + approvers: [sig-approvers-pb-cdc] + "^disk_usage\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^encryptionpb\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^import_kvpb\\.proto$": + approvers: [sig-approvers-pb-br] + "^import_sstpb\\.proto$": + approvers: [sig-approvers-pb-br] + "^logbackuppb\\.proto$": + approvers: [sig-approvers-pb-br] + "^metapb\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^raft_cmdpb\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^raft_serverpb\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^recoverdatapb\\.proto$": + approvers: [sig-approvers-pb-br] + "^resource_manager\\.proto$": + approvers: [sig-approvers-pb-raftstore] + "^tikvpb\\.proto$": + approvers: [sig-approvers-pb-tikv] + + ### If the special file need to be controlled by a SIG, please uncomment it and fill the approvers. + # "^configpb\\.proto$": + # approvers: [] + # "^coprocessor\\.proto$": + # approvers: [] + # "^deadlock\\.proto$": + # approvers: [] + # "^debugpb\\.proto$": + # approvers: [] + # "^diagnosticspb\\.proto$": + # approvers: [] + # "^disaggregated\\.proto$": + # approvers: [] + # "^enginepb\\.proto$": + # approvers: [] + # "^errorpb\\.proto$": + # approvers: [] + # "^gcpb\\.proto$": + # approvers: [] + # "^keyspacepb\\.proto$": + # approvers: [] + # "^kvrpcpb\\.proto$": + # approvers: [] + # "^meta_storagepb\\.proto$": + # approvers: [] + # "^mpp\\.proto$": + # approvers: [] + # "^pdpb\\.proto$": + # approvers: [] + # "^replication_modepb\\.proto$": + # approvers: [] + # "^resource_usage_agent\\.proto$": + # approvers: [] + # "^schedulingpb\\.proto$": + # approvers: [] + # "^tracepb\\.proto$": + # approvers: [] + # "^tsopb\\.proto$": + # approvers: [] + + # For rest files. + ".*": + approvers: [sig-approvers-pb] From fae2c046019e54025f20e1ef55354a2298dff1d7 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Sun, 24 Mar 2024 16:50:06 +0000 Subject: [PATCH 02/12] chore: update OWNERS files --- OWNERS_ALIASES | 23 +++++++++++------------ proto/OWNERS | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 247c5183c..2c328ddc8 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -4,15 +4,14 @@ aliases: - kevin-xialiu - yudongusa - zhangjinpeng1987 - sig-approvers-pb-br: - - BornChanger - sig-approvers-pb-cdc: - - flowbehappy - sig-approvers-pb-raftstore: - - tonyxuqqi - - overvenus - sig-approvers-pb-tikv: - - tonyxuqqi - sig-approvers-pb-autoid: - - bb7133 - - tiancaiamao + sig-approvers-pb-autoid: [bb7133, tiancaiamao] + sig-approvers-pb-br: [BornChanger] + sig-approvers-pb-cdc: [flowbehappy] + sig-approvers-pb-coprocessor: [cfzjywxk] + sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk] + sig-approvers-pb-debug: [cfzjywxk] + sig-approvers-pb-raftstore: [tonyxuqqi, overvenus] + sig-approvers-pb-tikv: [tonyxuqqi] + sig-approvers-pb-error: [cfzjywxk] + sig-approvers-pb-kvrpc: [cfzjywxk] + sig-approvers-pb-trace: [you06] \ No newline at end of file diff --git a/proto/OWNERS b/proto/OWNERS index ca8063672..e035a7d7b 100644 --- a/proto/OWNERS +++ b/proto/OWNERS @@ -8,14 +8,24 @@ filters: approvers: [sig-approvers-pb-br] "^cdcpb\\.proto$": approvers: [sig-approvers-pb-cdc] + "^coprocessor\\.proto$": + approvers: [sig-approvers-pb-coprocessor] + "^deadlock\\.proto$": + approvers: [sig-approvers-pb-deadlock] + "^debugpb\\.proto$": + approvers: [sig-approvers-pb-debug] "^disk_usage\\.proto$": approvers: [sig-approvers-pb-raftstore] + "^errorpb\\.proto$": + approvers: [sig-approvers-pb-error] "^encryptionpb\\.proto$": approvers: [sig-approvers-pb-raftstore] "^import_kvpb\\.proto$": approvers: [sig-approvers-pb-br] "^import_sstpb\\.proto$": approvers: [sig-approvers-pb-br] + "^kvrpcpb\\.proto$": + approvers: [sig-approvers-kvrpc] "^logbackuppb\\.proto$": approvers: [sig-approvers-pb-br] "^metapb\\.proto$": @@ -29,31 +39,23 @@ filters: "^resource_manager\\.proto$": approvers: [sig-approvers-pb-raftstore] "^tikvpb\\.proto$": - approvers: [sig-approvers-pb-tikv] + approvers: [sig-approvers-pb-tikv, sig-approvers-pb-kvprc] + "^tracepb\\.proto$": + approvers: [sig-approvers-pb-trace] ### If the special file need to be controlled by a SIG, please uncomment it and fill the approvers. # "^configpb\\.proto$": # approvers: [] - # "^coprocessor\\.proto$": - # approvers: [] - # "^deadlock\\.proto$": - # approvers: [] - # "^debugpb\\.proto$": - # approvers: [] # "^diagnosticspb\\.proto$": # approvers: [] # "^disaggregated\\.proto$": # approvers: [] # "^enginepb\\.proto$": # approvers: [] - # "^errorpb\\.proto$": - # approvers: [] # "^gcpb\\.proto$": # approvers: [] # "^keyspacepb\\.proto$": # approvers: [] - # "^kvrpcpb\\.proto$": - # approvers: [] # "^meta_storagepb\\.proto$": # approvers: [] # "^mpp\\.proto$": @@ -66,8 +68,6 @@ filters: # approvers: [] # "^schedulingpb\\.proto$": # approvers: [] - # "^tracepb\\.proto$": - # approvers: [] # "^tsopb\\.proto$": # approvers: [] From f0982ee03377ee5e4d975f2d3992bd8ffaced5b7 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 1 Apr 2024 11:20:45 +0000 Subject: [PATCH 03/12] chore: add default approvers for other folders --- OWNERS | 3 +++ OWNERS_ALIASES | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 000000000..8ae9709ae --- /dev/null +++ b/OWNERS @@ -0,0 +1,3 @@ +# See the OWNERS docs at https://go.k8s.io/owners +approvers: + - sig-approvers \ No newline at end of file diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 2c328ddc8..f1bc73ec4 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -1,5 +1,11 @@ # Sort the member alphabetically. aliases: + sig-approvers: # default approvers for the repo on rest folders. + - cfzjywxk + - lance6716 + - overvenus + - you06 + - YuJuncen sig-approvers-pb: # default approvers for `proto` folder - kevin-xialiu - yudongusa @@ -14,4 +20,4 @@ aliases: sig-approvers-pb-tikv: [tonyxuqqi] sig-approvers-pb-error: [cfzjywxk] sig-approvers-pb-kvrpc: [cfzjywxk] - sig-approvers-pb-trace: [you06] \ No newline at end of file + sig-approvers-pb-trace: [you06] From 644d7747b1d828def765bc4c989de63247b6bdf6 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 1 Apr 2024 11:21:08 +0000 Subject: [PATCH 04/12] ci: ignore OWNERS file for protolock commands --- scripts/check.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/check.sh b/scripts/check.sh index 0218df5d8..8a2a99ae9 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -20,15 +20,20 @@ check-protos-compatible() { export PATH=$GOPATH/bin:$PATH if [ ! -f "$GOPATH/bin/protolock" ]; then - GO111MODULE=off go install github.com/nilslice/protolock/cmd/protolock@v0.17.0 + go install github.com/nilslice/protolock/cmd/protolock@v0.17.0 fi + which protolock || { + echo "not found protolock in PATH." + ls -l "$GOPATH/bin/protolock" + exit 1 + } - if protolock status -lockdir=scripts -protoroot=proto; then - protolock commit -lockdir=scripts -protoroot=proto + if protolock status -lockdir=scripts -protoroot=proto --ignore=OWNERS; then + protolock commit -lockdir=scripts -protoroot=proto --ignore=OWNERS else echo "Meet break compatibility problem, please check the code." # In order not to block local branch development, when meet break compatibility will force to update `proto.lock`. - protolock commit --force -lockdir=scripts -protoroot=proto + protolock commit --force -lockdir=scripts -protoroot=proto --ignore=OWNERS fi # git report error like "fatal: detected dubious ownership in repository at" when reading the host's git folder git config --global --add safe.directory $(pwd) From d9846b048e0156ec355a5e61252bd96ce6032920 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 1 Apr 2024 12:31:07 +0000 Subject: [PATCH 05/12] ci: fix build.rs ignore the no proto files --- OWNERS | 2 +- build.rs | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index 8ae9709ae..d61c6dd11 100644 --- a/OWNERS +++ b/OWNERS @@ -1,3 +1,3 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: - - sig-approvers \ No newline at end of file + - sig-approvers diff --git a/build.rs b/build.rs index 4afddff6f..2cf597780 100644 --- a/build.rs +++ b/build.rs @@ -12,10 +12,27 @@ // limitations under the License. use protobuf_build::Builder; +use std::fs; fn main() { + let proto_dir = "proto"; + let mut proto_files = Vec::new(); + + // Walk the proto directory and collect all .proto files. + for entry in fs::read_dir(proto_dir).unwrap() { + let entry = entry.unwrap(); + let path = entry.path(); + if path.is_file() { + if let Some(ext) = path.extension() { + if ext == "proto" { + proto_files.push(path.to_string_lossy().into_owned()); + } + } + } + } + Builder::new() - .search_dir_for_protos("proto") + .files(&proto_files) .append_to_black_list("eraftpb") .generate() } From 5037f18aa65f80697b854f7f732b4fee1d1fdfdb Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 1 Apr 2024 12:38:49 +0000 Subject: [PATCH 06/12] ci: fix check.sh fast fail when install protolock failed. --- scripts/check.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/check.sh b/scripts/check.sh index 8a2a99ae9..4a0bd6fbf 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -20,20 +20,15 @@ check-protos-compatible() { export PATH=$GOPATH/bin:$PATH if [ ! -f "$GOPATH/bin/protolock" ]; then - go install github.com/nilslice/protolock/cmd/protolock@v0.17.0 + go install github.com/nilslice/protolock/cmd/protolock@v0.17.0 || exit 1 fi - which protolock || { - echo "not found protolock in PATH." - ls -l "$GOPATH/bin/protolock" - exit 1 - } - if protolock status -lockdir=scripts -protoroot=proto --ignore=OWNERS; then - protolock commit -lockdir=scripts -protoroot=proto --ignore=OWNERS + if protolock status -lockdir=scripts -protoroot=proto; then + protolock commit -lockdir=scripts -protoroot=proto else echo "Meet break compatibility problem, please check the code." # In order not to block local branch development, when meet break compatibility will force to update `proto.lock`. - protolock commit --force -lockdir=scripts -protoroot=proto --ignore=OWNERS + protolock commit --force -lockdir=scripts -protoroot=proto fi # git report error like "fatal: detected dubious ownership in repository at" when reading the host's git folder git config --global --add safe.directory $(pwd) From 36006a0b453daead564c338445e13deb0bd15475 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 8 Apr 2024 14:27:10 +0800 Subject: [PATCH 07/12] Update OWNERS_ALIASES --- OWNERS_ALIASES | 1 + 1 file changed, 1 insertion(+) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index f1bc73ec4..ebcf41502 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -16,6 +16,7 @@ aliases: sig-approvers-pb-coprocessor: [cfzjywxk] sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk] sig-approvers-pb-debug: [cfzjywxk] + sig-approvers-pb-pd: [niubell] sig-approvers-pb-raftstore: [tonyxuqqi, overvenus] sig-approvers-pb-tikv: [tonyxuqqi] sig-approvers-pb-error: [cfzjywxk] From 594d9789d9f1c9ae35764756e524d764bdf7e513 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 8 Apr 2024 14:29:03 +0800 Subject: [PATCH 08/12] Update proto/OWNERS --- proto/OWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proto/OWNERS b/proto/OWNERS index e035a7d7b..2b015e416 100644 --- a/proto/OWNERS +++ b/proto/OWNERS @@ -42,7 +42,9 @@ filters: approvers: [sig-approvers-pb-tikv, sig-approvers-pb-kvprc] "^tracepb\\.proto$": approvers: [sig-approvers-pb-trace] - + "^pdpb\\.proto$": + approvers: [sig-approvers-pb-pd] + ### If the special file need to be controlled by a SIG, please uncomment it and fill the approvers. # "^configpb\\.proto$": # approvers: [] @@ -60,8 +62,6 @@ filters: # approvers: [] # "^mpp\\.proto$": # approvers: [] - # "^pdpb\\.proto$": - # approvers: [] # "^replication_modepb\\.proto$": # approvers: [] # "^resource_usage_agent\\.proto$": From c8b18a326193f93048d2b0e7bab813f2857d8f71 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 8 Apr 2024 15:05:33 +0800 Subject: [PATCH 09/12] Update OWNERS_ALIASES --- OWNERS_ALIASES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index ebcf41502..1d92d58c9 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -16,7 +16,7 @@ aliases: sig-approvers-pb-coprocessor: [cfzjywxk] sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk] sig-approvers-pb-debug: [cfzjywxk] - sig-approvers-pb-pd: [niubell] + sig-approvers-pb-pd: [niubell, rleungx] sig-approvers-pb-raftstore: [tonyxuqqi, overvenus] sig-approvers-pb-tikv: [tonyxuqqi] sig-approvers-pb-error: [cfzjywxk] From 170a3809c08cfdf6cef9ce7343ed4b35dbdf2768 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Mon, 8 Apr 2024 15:10:50 +0800 Subject: [PATCH 10/12] Update proto/OWNERS --- proto/OWNERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/proto/OWNERS b/proto/OWNERS index 2b015e416..a2b8048c4 100644 --- a/proto/OWNERS +++ b/proto/OWNERS @@ -44,7 +44,13 @@ filters: approvers: [sig-approvers-pb-trace] "^pdpb\\.proto$": approvers: [sig-approvers-pb-pd] - + "^keyspacepb\\.proto$": + approvers: [sig-approvers-pb-pd] + "^schedulingpb\\.proto$": + approvers: [sig-approvers-pb-pd] + "^tsopb\\.proto$": + approvers: [sig-approvers-pb-pd] + ### If the special file need to be controlled by a SIG, please uncomment it and fill the approvers. # "^configpb\\.proto$": # approvers: [] @@ -56,8 +62,6 @@ filters: # approvers: [] # "^gcpb\\.proto$": # approvers: [] - # "^keyspacepb\\.proto$": - # approvers: [] # "^meta_storagepb\\.proto$": # approvers: [] # "^mpp\\.proto$": @@ -66,10 +70,6 @@ filters: # approvers: [] # "^resource_usage_agent\\.proto$": # approvers: [] - # "^schedulingpb\\.proto$": - # approvers: [] - # "^tsopb\\.proto$": - # approvers: [] # For rest files. ".*": From dd951a08870d53041c6388ff632ff98441a41bc7 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Tue, 9 Apr 2024 09:21:37 +0000 Subject: [PATCH 11/12] chore: update OWNERS for proto files - add match pattern for `meta_storagepb.proto`, `configpb.proto`, `enginepb.proto` - add "overvenus" to cdc and br SIG aliases. --- OWNERS_ALIASES | 5 +++-- proto/OWNERS | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 1d92d58c9..221b31225 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -11,8 +11,9 @@ aliases: - yudongusa - zhangjinpeng1987 sig-approvers-pb-autoid: [bb7133, tiancaiamao] - sig-approvers-pb-br: [BornChanger] - sig-approvers-pb-cdc: [flowbehappy] + sig-approvers-pb-br: [BornChanger, overvenus] + sig-approvers-pb-cdc: [flowbehappy, overvenus] + sig-approvers-pb-config: [overvenus] sig-approvers-pb-coprocessor: [cfzjywxk] sig-approvers-pb-deadlock: [MyonKeminta, cfzjywxk] sig-approvers-pb-debug: [cfzjywxk] diff --git a/proto/OWNERS b/proto/OWNERS index a2b8048c4..4a13f169d 100644 --- a/proto/OWNERS +++ b/proto/OWNERS @@ -8,6 +8,8 @@ filters: approvers: [sig-approvers-pb-br] "^cdcpb\\.proto$": approvers: [sig-approvers-pb-cdc] + "^configpb\\.proto$": + approvers: [sig-approvers-pb-config] "^coprocessor\\.proto$": approvers: [sig-approvers-pb-coprocessor] "^deadlock\\.proto$": @@ -20,6 +22,8 @@ filters: approvers: [sig-approvers-pb-error] "^encryptionpb\\.proto$": approvers: [sig-approvers-pb-raftstore] + "^enginepb\\.proto$": + approvers: [sig-approvers-pb-raftstore] "^import_kvpb\\.proto$": approvers: [sig-approvers-pb-br] "^import_sstpb\\.proto$": @@ -50,20 +54,16 @@ filters: approvers: [sig-approvers-pb-pd] "^tsopb\\.proto$": approvers: [sig-approvers-pb-pd] - + "^meta_storagepb\\.proto$": + approvers: [sig-approvers-pb-pd] + ### If the special file need to be controlled by a SIG, please uncomment it and fill the approvers. - # "^configpb\\.proto$": - # approvers: [] # "^diagnosticspb\\.proto$": # approvers: [] # "^disaggregated\\.proto$": # approvers: [] - # "^enginepb\\.proto$": - # approvers: [] # "^gcpb\\.proto$": # approvers: [] - # "^meta_storagepb\\.proto$": - # approvers: [] # "^mpp\\.proto$": # approvers: [] # "^replication_modepb\\.proto$": From 16101f477272b29eb1bb9a47f4a399e3183f3c2f Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Wed, 10 Apr 2024 11:26:46 +0000 Subject: [PATCH 12/12] chore: update OWNERS for `import_*pb.proto` files - add a new SIG `sig-approvers-pb-import` and add members: BornChanger, D3Hunter, lance6716. - assign ``sig-approvers-pb-import` as the approver for `import_*pb.proto` proto files. --- OWNERS_ALIASES | 1 + proto/OWNERS | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 221b31225..ae0cf5d97 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -12,6 +12,7 @@ aliases: - zhangjinpeng1987 sig-approvers-pb-autoid: [bb7133, tiancaiamao] sig-approvers-pb-br: [BornChanger, overvenus] + sig-approvers-pb-import: [BornChanger, D3Hunter, lance6716] sig-approvers-pb-cdc: [flowbehappy, overvenus] sig-approvers-pb-config: [overvenus] sig-approvers-pb-coprocessor: [cfzjywxk] diff --git a/proto/OWNERS b/proto/OWNERS index 4a13f169d..ee94fa9db 100644 --- a/proto/OWNERS +++ b/proto/OWNERS @@ -25,9 +25,9 @@ filters: "^enginepb\\.proto$": approvers: [sig-approvers-pb-raftstore] "^import_kvpb\\.proto$": - approvers: [sig-approvers-pb-br] + approvers: [sig-approvers-pb-import] "^import_sstpb\\.proto$": - approvers: [sig-approvers-pb-br] + approvers: [sig-approvers-pb-import] "^kvrpcpb\\.proto$": approvers: [sig-approvers-kvrpc] "^logbackuppb\\.proto$":