Skip to content

HDDS-6824. Revert changes made in proto.lock by HDDS-6768. #3480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandakumar131 merged 2 commits into from
Jun 3, 2022
Merged

HDDS-6824. Revert changes made in proto.lock by HDDS-6768. #3480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42af8b
HDDS-6824. Revert changes made in proto.lock by HDDS-6768.
nandakumar131 Jun 3, 2022
ae1eba1
Fixed unit test failures
nandakumar131 Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ public static boolean isReadOnly(
case SetS3Secret:
case RevokeS3Secret:
case PurgeDirectories:
case PurgePaths:
case CreateTenant:
case DeleteTenant:
case TenantAssignUserAccessId:
Expand Down
38 changes: 27 additions & 11 deletions hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ enum Type {

RevokeS3Secret = 93;

PurgeDirectories = 94;
PurgePaths = 94; // [deprecated = true]
PurgeDirectories = 95;

CreateTenant = 96;
DeleteTenant = 97;
Expand Down Expand Up @@ -201,7 +202,8 @@ message OMRequest {

optional RevokeS3SecretRequest RevokeS3SecretRequest = 93;

optional PurgeDirectoriesRequest purgeDirectoriesRequest = 94;
optional PurgePathsRequest purgePathsRequest = 94 [deprecated = true];
optional PurgeDirectoriesRequest purgeDirectoriesRequest = 108;

optional S3Authentication s3Authentication = 95;

Expand Down Expand Up @@ -297,7 +299,8 @@ message OMResponse {

optional ListTrashResponse listTrashResponse = 91;
optional RecoverTrashResponse RecoverTrashResponse = 92;
optional PurgeDirectoriesResponse purgeDirectoriesResponse = 93;
optional PurgePathsResponse purgePathsResponse = 93 [deprecated = true];
optional PurgeDirectoriesResponse purgeDirectoriesResponse = 108;

// Skipped 94/95 to align with OMRequest
optional CreateTenantResponse CreateTenantResponse = 96;
Expand Down Expand Up @@ -1081,22 +1084,35 @@ message PurgeKeysResponse {

}

message PurgeDirectoriesRequest {
repeated PurgePathRequest deletedPath = 1;
message PurgePathsRequest {
// option deprecated = true;
// Use PurgeDirectoriesRequest
repeated string deletedDirs = 1;
repeated KeyInfo deletedSubFiles = 2;
repeated KeyInfo markDeletedSubDirs = 3;
}

message PurgePathRequest {
required uint64 volumeId = 1;
required uint64 bucketId = 2;
optional string deletedDir = 3;
repeated KeyInfo deletedSubFiles = 4;
repeated KeyInfo markDeletedSubDirs = 5;
message PurgePathsResponse {
// option deprecated = true;
// Use PurgeDirectoriesResponse
}

message PurgeDirectoriesRequest {
repeated PurgePathRequest deletedPath = 1;
}

message PurgeDirectoriesResponse {

}

message PurgePathRequest {
required uint64 volumeId = 1;
required uint64 bucketId = 2;
optional string deletedDir = 3;
repeated KeyInfo deletedSubFiles = 4;
repeated KeyInfo markDeletedSubDirs = 5;
}

message DeleteOpenKeysRequest {
repeated OpenKeyBucket openKeysPerBucket = 1;
}
Expand Down
Loading