Skip to content
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

HDDS-11266. Update proto.lock for Ozone 1.4.1 #7504

Merged
merged 1 commit into from
Dec 3, 2024
Merged

HDDS-11266. Update proto.lock for Ozone 1.4.1 #7504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions hadoop-hdds/interface-client/src/main/resources/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,6 +2433,18 @@
"name": "containerCount",
"type": "int64",
"optional": true
},
{
"id": 6,
"name": "committed",
"type": "int64",
"optional": true
},
{
"id": 7,
"name": "freeSpaceToSpare",
"type": "int64",
"optional": true
}
]
},
Expand Down
24 changes: 24 additions & 0 deletions hadoop-hdds/interface-server/src/main/resources/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,6 +1427,30 @@
"value": "false"
}
]
},
{
"id": 8,
"name": "committed",
"type": "uint64",
"optional": true,
"options": [
{
"name": "default",
"value": "0"
}
]
},
{
"id": 9,
"name": "freeSpaceToSpare",
"type": "uint64",
"optional": true,
"options": [
{
"name": "default",
"value": "0"
}
]
}
]
},
Expand Down
136 changes: 133 additions & 3 deletions hadoop-ozone/interface-client/src/main/resources/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3270,6 +3270,12 @@
"name": "exclusiveReplicatedSize",
"type": "uint64",
"optional": true
},
{
"id": 19,
"name": "deepCleanedDeletedDir",
"type": "bool",
"optional": true
}
]
},
Expand Down Expand Up @@ -4137,6 +4143,12 @@
"name": "ecReplicationConfig",
"type": "hadoop.hdds.ECReplicationConfig",
"optional": true
},
{
"id": 8,
"name": "eTag",
"type": "string",
"optional": true
}
]
},
Expand Down Expand Up @@ -4687,6 +4699,29 @@
}
]
},
{
"name": "DeleteKeyError",
Copy link
Contributor

Choose a reason for hiding this comment

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

@xichen01 , I run the update_protolocks.sh against the ozone-1.4.1 branch. The updated proto.lock doesn't have this DeleteKeyError message, and DeleteKeyError reference in DeleteKeysResponse.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, it's my environment problem.

The current patch is correct. Thanks @xichen01 .

"fields": [
{
"id": 1,
"name": "key",
"type": "string",
"optional": true
},
{
"id": 2,
"name": "errorCode",
"type": "string",
"optional": true
},
{
"id": 3,
"name": "errorMsg",
"type": "string",
"optional": true
}
]
},
{
"name": "DeleteKeysResponse",
"fields": [
Expand All @@ -4701,6 +4736,12 @@
"name": "status",
"type": "bool",
"optional": true
},
{
"id": 3,
"name": "errors",
"type": "DeleteKeyError",
"is_repeated": true
}
]
},
Expand Down Expand Up @@ -5636,6 +5677,12 @@
"name": "partName",
"type": "string",
"optional": true
},
{
"id": 2,
"name": "eTag",
"type": "string",
"optional": true
}
]
},
Expand Down Expand Up @@ -5699,6 +5746,12 @@
"name": "partName",
"type": "string",
"required": true
},
{
"id": 3,
"name": "eTag",
"type": "string",
"optional": true
}
]
},
Expand Down Expand Up @@ -5965,6 +6018,12 @@
"name": "size",
"type": "uint64",
"required": true
},
{
"id": 5,
"name": "eTag",
"type": "string",
"optional": true
}
]
},
Expand Down Expand Up @@ -6671,7 +6730,13 @@
"id": 2,
"name": "updatedSnapshotDBKey",
"type": "string",
"is_repeated": true
"is_repeated": true,
"options": [
{
"name": "deprecated",
"value": "true"
}
]
}
]
},
Expand All @@ -6682,6 +6747,36 @@
"id": 1,
"name": "snapshotProperty",
"type": "SnapshotProperty",
"optional": true,
"options": [
{
"name": "deprecated",
"value": "true"
}
]
},
{
"id": 2,
"name": "snapshotKey",
"type": "string",
"optional": true
},
{
"id": 3,
"name": "snapshotSize",
"type": "SnapshotSize",
"optional": true
},
{
"id": 4,
"name": "deepCleanedDeletedDir",
"type": "bool",
"optional": true
},
{
"id": 5,
"name": "deepCleanedDeletedKey",
"type": "bool",
"optional": true
}
]
Expand All @@ -6693,18 +6788,53 @@
"id": 1,
"name": "snapshotKey",
"type": "string",
"optional": true
"optional": true,
"options": [
{
"name": "deprecated",
"value": "true"
}
]
},
{
"id": 2,
"name": "exclusiveSize",
"type": "uint64",
"optional": true
"optional": true,
"options": [
{
"name": "deprecated",
"value": "true"
}
]
},
{
"id": 3,
"name": "exclusiveReplicatedSize",
"type": "uint64",
"optional": true,
"options": [
{
"name": "deprecated",
"value": "true"
}
]
}
]
},
{
"name": "SnapshotSize",
"fields": [
{
"id": 1,
"name": "exclusiveSize",
"type": "uint64",
"optional": true
},
{
"id": 2,
"name": "exclusiveReplicatedSize",
"type": "uint64",
"optional": true
}
]
Expand Down