Skip to content

Conversation

@adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

Some proto.lock files were not updated for the 1.4.0 release. This happened because the new v0.17.0 version of protolock introduced a new check, which is failing for DatanodeClientProtocol.proto and csi.proto:

CONFLICT: "data" was moved into oneof "responseData" [DatanodeClientProtocol.proto]
CONFLICT: "dataBuffers" was moved into oneof "responseData" [DatanodeClientProtocol.proto]
CONFLICT: "block" was moved into oneof "access_type" [csi.proto]
CONFLICT: "mount" was moved into oneof "access_type" [csi.proto]
CONFLICT: "rpc" was moved into oneof "type" [csi.proto]
CONFLICT: "rpc" was moved into oneof "type" [csi.proto]
CONFLICT: "service" was moved into oneof "type" [csi.proto]
CONFLICT: "snapshot" was moved into oneof "type" [csi.proto]
CONFLICT: "volume" was moved into oneof "type" [csi.proto]
CONFLICT: "volume_expansion" was moved into oneof "type" [csi.proto]

This PR updates proto.lock files:

  1. eb4eaa6: using v0.16.0, which can be done without conflicts
  2. 42544f0: using v0.17.0 with --force option, done separately for easier review

https://issues.apache.org/jira/browse/HDDS-10187

How was this patch tested?

CI:
https://github.com/adoroszlai/ozone/actions/runs/7622797005

@symious
Copy link
Contributor

symious commented Jan 23, 2024

@adoroszlai Thank you for the fix.

LGTM.

Copy link
Contributor

@errose28 errose28 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks for doing the detective work on this @adoroszlai

@errose28 errose28 merged commit a29bf3a into apache:ozone-1.4 Jan 23, 2024
@adoroszlai adoroszlai deleted the HDDS-10187 branch January 24, 2024 05:06
@adoroszlai
Copy link
Contributor Author

Thanks @errose28, @symious for the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants