adoroszlai commented on PR #6044: URL: https://github.com/apache/ozone/pull/6044#issuecomment-1905541843
Thanks a lot @errose28 for spotting the missing change. Since this PR just picks the change from Ozone 1.4.0 (9090d52387), the release also has incomplete `proto.lock`. ``` $ git checkout ozone-1.4.0 $ protolock status --lockdir=hadoop-hdds/interface-client/src/main/resources --protoroot=hadoop-hdds/interface-client/src/main/proto CONFLICT: "data" was moved into oneof "responseData" [DatanodeClientProtocol.proto] CONFLICT: "dataBuffers" was moved into oneof "responseData" [DatanodeClientProtocol.proto] ``` It complains about a change made in https://github.com/apache/ozone/commit/4136d47868e. This is not a recent change, first went into 1.1.0. Same/similar problem for previous releases: ``` $ git checkout ozone-1.1.0 $ protolock status --lockdir=hadoop-hdds/interface-client/src/main/resources --protoroot=hadoop-hdds/interface-client/src/main/proto CONFLICT: "data" was moved into oneof "responseData" [DatanodeClientProtocol.proto] $ git checkout ozone-1.2.0 $ protolock status --lockdir=hadoop-hdds/interface-client/src/main/resources --protoroot=hadoop-hdds/interface-client/src/main/proto CONFLICT: "data" was moved into oneof "responseData" [DatanodeClientProtocol.proto] CONFLICT: "dataBuffers" was moved into oneof "responseData" [DatanodeClientProtocol.proto] ... ``` It turns out to be a new compatibility check added in https://github.com/nilslice/protolock/commit/01572fa3b6b26607564fa07a6910c2616b7f89bd recently. Works fine with the previous release: ``` $ go install github.com/nilslice/protolock/cmd/[email protected] $ protolock status --lockdir=hadoop-hdds/interface-client/src/main/resources --protoroot=hadoop-hdds/interface-client/src/main/proto ``` Similar problem applies to `csi.proto`, which was last changed in 2019, `proto.lock` added in 2020. I suggest: 1. close this PR 2. update `proto.lock` on `ozone-1.4` branch (filed HDDS-10187) in two steps (two commits in same PR): a. using v0.16.0 to get the missing changes without conflicts b. using v0.17.0 and `protolock commit --force` to persist structures for the new rule 3. update `proto.lock` on `master` in a new PR by taking both 9090d52387 and the changes from step 2 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
