This is an automated email from the ASF dual-hosted git repository.
erose pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new a65f72a0fe3 HDDS-13784. [Ozone 2.1] Update proto.lock files (#9158)
a65f72a0fe3 is described below
commit a65f72a0fe345f685fce3718b7693a64af23c273
Author: Chung En Lee <[email protected]>
AuthorDate: Fri Oct 17 03:18:44 2025 +0800
HDDS-13784. [Ozone 2.1] Update proto.lock files (#9158)
---
.../interface-admin/src/main/resources/proto.lock | 70 +++-
.../interface-client/src/main/resources/proto.lock | 187 +++++++++++
.../interface-server/src/main/resources/proto.lock | 61 +++-
.../interface-client/src/main/resources/proto.lock | 357 ++++++++++++++++++++-
4 files changed, 662 insertions(+), 13 deletions(-)
diff --git a/hadoop-hdds/interface-admin/src/main/resources/proto.lock
b/hadoop-hdds/interface-admin/src/main/resources/proto.lock
index 45b04084481..81af08d2ca9 100644
--- a/hadoop-hdds/interface-admin/src/main/resources/proto.lock
+++ b/hadoop-hdds/interface-admin/src/main/resources/proto.lock
@@ -203,6 +203,10 @@
{
"name": "GetContainerBalancerStatusInfo",
"integer": 44
+ },
+ {
+ "name": "ReconcileContainer",
+ "integer": 45
}
]
},
@@ -494,7 +498,13 @@
"id": 41,
"name": "resetDeletedBlockRetryCountRequest",
"type": "ResetDeletedBlockRetryCountRequestProto",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 42,
@@ -506,7 +516,13 @@
"id": 43,
"name": "getFailedDeletedBlocksTxnRequest",
"type": "GetFailedDeletedBlocksTxnRequestProto",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 44,
@@ -537,6 +553,12 @@
"name": "containerBalancerStatusInfoRequest",
"type": "ContainerBalancerStatusInfoRequestProto",
"optional": true
+ },
+ {
+ "id": 49,
+ "name": "reconcileContainerRequest",
+ "type": "ReconcileContainerRequestProto",
+ "optional": true
}
]
},
@@ -793,7 +815,13 @@
"id": 41,
"name": "resetDeletedBlockRetryCountResponse",
"type": "ResetDeletedBlockRetryCountResponseProto",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 42,
@@ -805,7 +833,13 @@
"id": 43,
"name": "getFailedDeletedBlocksTxnResponse",
"type": "GetFailedDeletedBlocksTxnResponseProto",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 44,
@@ -836,6 +870,12 @@
"name": "containerBalancerStatusInfoResponse",
"type": "ContainerBalancerStatusInfoResponseProto",
"optional": true
+ },
+ {
+ "id": 49,
+ "name": "reconcileContainerResponse",
+ "type": "ReconcileContainerResponseProto",
+ "optional": true
}
]
},
@@ -846,7 +886,7 @@
"id": 2,
"name": "replicationFactor",
"type": "ReplicationFactor",
- "required": true
+ "optional": true
},
{
"id": 3,
@@ -865,6 +905,12 @@
"name": "traceID",
"type": "string",
"optional": true
+ },
+ {
+ "id": 6,
+ "name": "ecReplicationConfig",
+ "type": "ECReplicationConfig",
+ "optional": true
}
]
},
@@ -2255,6 +2301,20 @@
"optional": true
}
]
+ },
+ {
+ "name": "ReconcileContainerRequestProto",
+ "fields": [
+ {
+ "id": 1,
+ "name": "containerID",
+ "type": "int64",
+ "required": true
+ }
+ ]
+ },
+ {
+ "name": "ReconcileContainerResponseProto"
}
],
"services": [
diff --git a/hadoop-hdds/interface-client/src/main/resources/proto.lock
b/hadoop-hdds/interface-client/src/main/resources/proto.lock
index 2c027a31751..70ff576a708 100644
--- a/hadoop-hdds/interface-client/src/main/resources/proto.lock
+++ b/hadoop-hdds/interface-client/src/main/resources/proto.lock
@@ -94,6 +94,10 @@
{
"name": "Echo",
"integer": 22
+ },
+ {
+ "name": "GetContainerChecksumInfo",
+ "integer": 23
}
]
},
@@ -283,6 +287,10 @@
{
"name": "BLOCK_ALREADY_FINALIZED",
"integer": 47
+ },
+ {
+ "name": "CONTAINER_ID_MISMATCH",
+ "integer": 48
}
]
},
@@ -618,6 +626,12 @@
"name": "echo",
"type": "EchoRequestProto",
"optional": true
+ },
+ {
+ "id": 27,
+ "name": "getContainerChecksumInfo",
+ "type": "GetContainerChecksumInfoRequestProto",
+ "optional": true
}
]
},
@@ -761,6 +775,12 @@
"name": "echo",
"type": "EchoResponseProto",
"optional": true
+ },
+ {
+ "id": 24,
+ "name": "getContainerChecksumInfo",
+ "type": "GetContainerChecksumInfoResponseProto",
+ "optional": true
}
]
},
@@ -1199,6 +1219,34 @@
}
]
},
+ {
+ "name": "GetContainerChecksumInfoRequestProto",
+ "fields": [
+ {
+ "id": 1,
+ "name": "containerID",
+ "type": "int64",
+ "optional": true
+ }
+ ]
+ },
+ {
+ "name": "GetContainerChecksumInfoResponseProto",
+ "fields": [
+ {
+ "id": 1,
+ "name": "containerID",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "containerChecksumInfo",
+ "type": "bytes",
+ "optional": true
+ }
+ ]
+ },
{
"name": "ChunkInfo",
"fields": [
@@ -1601,11 +1649,132 @@
"name": "compression",
"type": "CopyContainerCompressProto",
"optional": true
+ },
+ {
+ "id": 6,
+ "name": "size",
+ "type": "int64",
+ "optional": true
}
]
},
{
"name": "SendContainerResponse"
+ },
+ {
+ "name": "ChunkMerkleTree",
+ "fields": [
+ {
+ "id": 1,
+ "name": "offset",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "length",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 3,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 4,
+ "name": "checksumMatches",
+ "type": "bool",
+ "optional": true
+ }
+ ]
+ },
+ {
+ "name": "BlockMerkleTree",
+ "fields": [
+ {
+ "id": 1,
+ "name": "blockID",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 3,
+ "name": "chunkMerkleTree",
+ "type": "ChunkMerkleTree",
+ "is_repeated": true
+ },
+ {
+ "id": 4,
+ "name": "deleted",
+ "type": "bool",
+ "optional": true
+ }
+ ]
+ },
+ {
+ "name": "ContainerMerkleTree",
+ "fields": [
+ {
+ "id": 1,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "blockMerkleTree",
+ "type": "BlockMerkleTree",
+ "is_repeated": true
+ }
+ ]
+ },
+ {
+ "name": "ContainerChecksumInfo",
+ "fields": [
+ {
+ "id": 1,
+ "name": "containerID",
+ "type": "int64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "containerMerkleTree",
+ "type": "ContainerMerkleTree",
+ "optional": true
+ }
+ ]
+ },
+ {
+ "name": "ContainerCreateInfo",
+ "fields": [
+ {
+ "id": 1,
+ "name": "state",
+ "type": "ContainerDataProto.State",
+ "required": true
+ },
+ {
+ "id": 2,
+ "name": "replicaIndex",
+ "type": "int32",
+ "optional": true,
+ "options": [
+ {
+ "name": "default",
+ "value": "-1"
+ }
+ ]
+ }
+ ]
}
],
"services": [
@@ -3166,6 +3335,12 @@
"name": "state",
"type": "string",
"optional": true
+ },
+ {
+ "id": 6,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
}
]
},
@@ -3219,6 +3394,12 @@
"name": "replicaIndex",
"type": "int64",
"optional": true
+ },
+ {
+ "id": 9,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
}
]
},
@@ -3449,6 +3630,12 @@
"name": "columnFamily",
"type": "string",
"optional": true
+ },
+ {
+ "id": 5,
+ "name": "pruned",
+ "type": "bool",
+ "optional": true
}
]
},
diff --git a/hadoop-hdds/interface-server/src/main/resources/proto.lock
b/hadoop-hdds/interface-server/src/main/resources/proto.lock
index 3ed18f25cc2..822a2f88ebe 100644
--- a/hadoop-hdds/interface-server/src/main/resources/proto.lock
+++ b/hadoop-hdds/interface-server/src/main/resources/proto.lock
@@ -952,6 +952,10 @@
{
"name": "reconstructECContainersCommand",
"integer": 11
+ },
+ {
+ "name": "reconcileContainerCommand",
+ "integer": 12
}
]
},
@@ -1583,7 +1587,13 @@
"id": 10,
"name": "finalhash",
"type": "string",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 11,
@@ -1620,6 +1630,12 @@
"value": "false"
}
]
+ },
+ {
+ "id": 16,
+ "name": "dataChecksum",
+ "type": "int64",
+ "optional": true
}
]
},
@@ -1728,7 +1744,13 @@
"id": 3,
"name": "bytesWritten",
"type": "uint64",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
}
]
},
@@ -1869,6 +1891,12 @@
"type": "ReconstructECContainersCommandProto",
"optional": true
},
+ {
+ "id": 13,
+ "name": "reconcileContainerCommandProto",
+ "type": "ReconcileContainerCommandProto",
+ "optional": true
+ },
{
"id": 15,
"name": "term",
@@ -1934,7 +1962,13 @@
"id": 4,
"name": "count",
"type": "int32",
- "required": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
}
]
},
@@ -2303,6 +2337,23 @@
"required": true
}
]
+ },
+ {
+ "name": "ReconcileContainerCommandProto",
+ "fields": [
+ {
+ "id": 1,
+ "name": "containerID",
+ "type": "int64",
+ "required": true
+ },
+ {
+ "id": 2,
+ "name": "peers",
+ "type": "DatanodeDetailsProto",
+ "is_repeated": true
+ }
+ ]
}
],
"services": [
@@ -2560,6 +2611,10 @@
{
"name": "CONTAINER_ALREADY_CLOSING",
"integer": 46
+ },
+ {
+ "name": "UNSUPPORTED_OPERATION",
+ "integer": 47
}
]
},
diff --git a/hadoop-ozone/interface-client/src/main/resources/proto.lock
b/hadoop-ozone/interface-client/src/main/resources/proto.lock
index 59e91e74d27..0271bd8a20f 100644
--- a/hadoop-ozone/interface-client/src/main/resources/proto.lock
+++ b/hadoop-ozone/interface-client/src/main/resources/proto.lock
@@ -89,6 +89,12 @@
"value": "ACTIVE"
}
]
+ },
+ {
+ "id": 6,
+ "name": "isListener",
+ "type": "bool",
+ "optional": true
}
]
},
@@ -125,6 +131,34 @@
"optional": true
}
]
+ },
+ {
+ "name": "CompactRequest",
+ "fields": [
+ {
+ "id": 1,
+ "name": "columnFamily",
+ "type": "string",
+ "required": true
+ }
+ ]
+ },
+ {
+ "name": "CompactResponse",
+ "fields": [
+ {
+ "id": 1,
+ "name": "success",
+ "type": "bool",
+ "required": true
+ },
+ {
+ "id": 3,
+ "name": "errorMsg",
+ "type": "string",
+ "optional": true
+ }
+ ]
}
],
"services": [
@@ -140,6 +174,11 @@
"name": "decommission",
"in_type": "DecommissionOMRequest",
"out_type": "DecommissionOMResponse"
+ },
+ {
+ "name": "compactDB",
+ "in_type": "CompactRequest",
+ "out_type": "CompactResponse"
}
]
}
@@ -962,6 +1001,10 @@
{
"name": "KEY_UNDER_LEASE_SOFT_LIMIT_PERIOD",
"integer": 97
+ },
+ {
+ "name": "TOO_MANY_SNAPSHOTS",
+ "integer": 98
}
]
},
@@ -1218,6 +1261,31 @@
}
]
},
+ {
+ "name": "SnapshotDiffResponse.SubStatus",
+ "enum_fields": [
+ {
+ "name": "SST_FILE_DELTA_DAG_WALK",
+ "integer": 1
+ },
+ {
+ "name": "SST_FILE_DELTA_FULL_DIFF",
+ "integer": 2
+ },
+ {
+ "name": "OBJECT_ID_MAP_GEN_OBS",
+ "integer": 3
+ },
+ {
+ "name": "OBJECT_ID_MAP_GEN_FSO",
+ "integer": 4
+ },
+ {
+ "name": "DIFF_REPORT_GEN",
+ "integer": 5
+ }
+ ]
+ },
{
"name": "DiffReportEntryProto.DiffTypeProto",
"enum_fields": [
@@ -1812,7 +1880,13 @@
"id": 125,
"name": "PrintCompactionLogDagRequest",
"type": "PrintCompactionLogDagRequest",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 126,
@@ -1885,6 +1959,12 @@
"name": "deleteObjectTaggingRequest",
"type": "DeleteObjectTaggingRequest",
"optional": true
+ },
+ {
+ "id": 143,
+ "name": "SetSnapshotPropertyRequests",
+ "type": "SetSnapshotPropertyRequest",
+ "is_repeated": true
}
]
},
@@ -2429,7 +2509,13 @@
"id": 125,
"name": "PrintCompactionLogDagResponse",
"type": "PrintCompactionLogDagResponse",
- "optional": true
+ "optional": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 126,
@@ -3160,6 +3246,18 @@
"name": "defaultReplicationConfig",
"type": "hadoop.hdds.DefaultReplicationConfig",
"optional": true
+ },
+ {
+ "id": 21,
+ "name": "snapshotUsedBytes",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 22,
+ "name": "snapshotUsedNamespace",
+ "type": "uint64",
+ "optional": true
}
]
},
@@ -3507,6 +3605,24 @@
"name": "lastTransactionInfo",
"type": "bytes",
"optional": true
+ },
+ {
+ "id": 21,
+ "name": "exclusiveSizeDeltaFromDirDeepCleaning",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 22,
+ "name": "exclusiveReplicatedSizeDeltaFromDirDeepCleaning",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 23,
+ "name": "createTransactionInfo",
+ "type": "bytes",
+ "optional": true
}
]
},
@@ -3578,6 +3694,18 @@
"name": "disableNativeDiff",
"type": "bool",
"optional": true
+ },
+ {
+ "id": 12,
+ "name": "subStatus",
+ "type": "SnapshotDiffResponse.SubStatus",
+ "optional": true
+ },
+ {
+ "id": 13,
+ "name": "keysProcessedPct",
+ "type": "double",
+ "optional": true
}
]
},
@@ -4366,6 +4494,89 @@
}
]
},
+ {
+ "name": "KeyInfoProtoLight",
+ "fields": [
+ {
+ "id": 1,
+ "name": "volumeName",
+ "type": "string",
+ "required": true
+ },
+ {
+ "id": 2,
+ "name": "bucketName",
+ "type": "string",
+ "required": true
+ },
+ {
+ "id": 3,
+ "name": "keyName",
+ "type": "string",
+ "required": true
+ },
+ {
+ "id": 4,
+ "name": "dataSize",
+ "type": "uint64",
+ "required": true
+ },
+ {
+ "id": 5,
+ "name": "type",
+ "type": "hadoop.hdds.ReplicationType",
+ "required": true
+ },
+ {
+ "id": 6,
+ "name": "factor",
+ "type": "hadoop.hdds.ReplicationFactor",
+ "optional": true
+ },
+ {
+ "id": 8,
+ "name": "creationTime",
+ "type": "uint64",
+ "required": true
+ },
+ {
+ "id": 9,
+ "name": "modificationTime",
+ "type": "uint64",
+ "required": true
+ },
+ {
+ "id": 14,
+ "name": "objectID",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 15,
+ "name": "updateID",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 16,
+ "name": "parentID",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 17,
+ "name": "ecReplicationConfig",
+ "type": "hadoop.hdds.ECReplicationConfig",
+ "optional": true
+ },
+ {
+ "id": 19,
+ "name": "isFile",
+ "type": "bool",
+ "optional": true
+ }
+ ]
+ },
{
"name": "BasicKeyInfo",
"fields": [
@@ -4422,6 +4633,12 @@
"name": "ownerName",
"type": "string",
"optional": true
+ },
+ {
+ "id": 10,
+ "name": "isEncrypted",
+ "type": "bool",
+ "optional": true
}
]
},
@@ -4492,6 +4709,12 @@
"name": "keyInfo",
"type": "KeyInfo",
"is_repeated": true
+ },
+ {
+ "id": 2,
+ "name": "bucketId",
+ "type": "uint64",
+ "optional": true
}
]
},
@@ -5054,13 +5277,25 @@
"id": 1,
"name": "volumeName",
"type": "string",
- "required": true
+ "required": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 2,
"name": "bucketName",
"type": "string",
- "required": true
+ "required": true,
+ "options": [
+ {
+ "name": "deprecated",
+ "value": "true"
+ }
+ ]
},
{
"id": 3,
@@ -5096,6 +5331,41 @@
"name": "expectedPreviousSnapshotID",
"type": "NullableUUID",
"optional": true
+ },
+ {
+ "id": 5,
+ "name": "renamedKeys",
+ "type": "string",
+ "is_repeated": true
+ },
+ {
+ "id": 6,
+ "name": "bucketPurgeKeysSize",
+ "type": "BucketPurgeKeysSize",
+ "is_repeated": true
+ }
+ ]
+ },
+ {
+ "name": "BucketPurgeKeysSize",
+ "fields": [
+ {
+ "id": 1,
+ "name": "bucketNameInfo",
+ "type": "BucketNameInfo",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "purgedBytes",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 3,
+ "name": "purgedNamespace",
+ "type": "uint64",
+ "optional": true
}
]
},
@@ -5148,6 +5418,41 @@
"name": "expectedPreviousSnapshotID",
"type": "NullableUUID",
"optional": true
+ },
+ {
+ "id": 4,
+ "name": "bucketNameInfos",
+ "type": "BucketNameInfo",
+ "is_repeated": true
+ }
+ ]
+ },
+ {
+ "name": "BucketNameInfo",
+ "fields": [
+ {
+ "id": 1,
+ "name": "volumeId",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 2,
+ "name": "bucketId",
+ "type": "uint64",
+ "optional": true
+ },
+ {
+ "id": 3,
+ "name": "volumeName",
+ "type": "string",
+ "optional": true
+ },
+ {
+ "id": 4,
+ "name": "bucketName",
+ "type": "string",
+ "optional": true
}
]
},
@@ -7048,6 +7353,18 @@
"name": "listAll",
"type": "bool",
"optional": true
+ },
+ {
+ "id": 5,
+ "name": "prevSnapshotDiffJob",
+ "type": "string",
+ "optional": true
+ },
+ {
+ "id": 6,
+ "name": "maxListResult",
+ "type": "uint32",
+ "optional": true
}
]
},
@@ -7198,6 +7515,12 @@
"name": "keyInfos",
"type": "KeyInfo",
"is_repeated": true
+ },
+ {
+ "id": 3,
+ "name": "bucketId",
+ "type": "uint64",
+ "optional": true
}
]
},
@@ -7262,6 +7585,12 @@
"name": "deepCleanedDeletedKey",
"type": "bool",
"optional": true
+ },
+ {
+ "id": 6,
+ "name": "snapshotSizeDeltaFromDirDeepCleaning",
+ "type": "SnapshotSize",
+ "optional": true
}
]
},
@@ -7477,6 +7806,12 @@
"name": "reason",
"type": "string",
"optional": true
+ },
+ {
+ "id": 5,
+ "name": "subStatus",
+ "type": "SubStatus",
+ "optional": true
}
]
},
@@ -7499,6 +7834,12 @@
"name": "snapshotDiffJob",
"type": "SnapshotDiffJobProto",
"is_repeated": true
+ },
+ {
+ "id": 2,
+ "name": "lastSnapshotDiffJob",
+ "type": "string",
+ "optional": true
}
]
},
@@ -8091,6 +8432,12 @@
"name": "ratisPort",
"type": "uint32",
"required": true
+ },
+ {
+ "id": 4,
+ "name": "isListener",
+ "type": "bool",
+ "optional": true
}
]
},
@@ -8309,4 +8656,4 @@
}
}
]
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
