diff --git a/hadoop-hdds/interface-admin/src/main/resources/proto.lock b/hadoop-hdds/interface-admin/src/main/resources/proto.lock index d834dd4dffed..8e898afc5c11 100644 --- a/hadoop-hdds/interface-admin/src/main/resources/proto.lock +++ b/hadoop-hdds/interface-admin/src/main/resources/proto.lock @@ -171,6 +171,22 @@ { "name": "ResetDeletedBlockRetryCount", "integer": 36 + }, + { + "name": "GetClosedContainerCount", + "integer": 37 + }, + { + "name": "TransferLeadership", + "integer": 38 + }, + { + "name": "GetFailedDeletedBlocksTransaction", + "integer": 39 + }, + { + "name": "DecommissionScm", + "integer": 40 } ] }, @@ -195,6 +211,23 @@ } ] }, + { + "name": "SCMCloseContainerResponseProto.Status", + "enum_fields": [ + { + "name": "OK", + "integer": 1 + }, + { + "name": "CONTAINER_ALREADY_CLOSED", + "integer": 2 + }, + { + "name": "CONTAINER_ALREADY_CLOSING", + "integer": 3 + } + ] + }, { "name": "PipelineResponseProto.Error", "enum_fields": [ @@ -446,6 +479,24 @@ "name": "resetDeletedBlockRetryCountRequest", "type": "ResetDeletedBlockRetryCountRequestProto", "optional": true + }, + { + "id": 42, + "name": "transferScmLeadershipRequest", + "type": "TransferLeadershipRequestProto", + "optional": true + }, + { + "id": 43, + "name": "getFailedDeletedBlocksTxnRequest", + "type": "GetFailedDeletedBlocksTxnRequestProto", + "optional": true + }, + { + "id": 44, + "name": "decommissionScmRequest", + "type": "DecommissionScmRequestProto", + "optional": true } ] }, @@ -703,6 +754,24 @@ "name": "resetDeletedBlockRetryCountResponse", "type": "ResetDeletedBlockRetryCountResponseProto", "optional": true + }, + { + "id": 42, + "name": "transferScmLeadershipResponse", + "type": "TransferLeadershipResponseProto", + "optional": true + }, + { + "id": 43, + "name": "getFailedDeletedBlocksTxnResponse", + "type": "GetFailedDeletedBlocksTxnResponseProto", + "optional": true + }, + { + "id": 44, + "name": "decommissionScmResponse", + "type": "DecommissionScmResponseProto", + "optional": true } ] }, @@ -1031,7 +1100,15 @@ ] }, { - "name": "SCMCloseContainerResponseProto" + "name": "SCMCloseContainerResponseProto", + "fields": [ + { + "id": 1, + "name": "status", + "type": "Status", + "optional": true + } + ] }, { "name": "NodeQueryRequestProto", @@ -1506,6 +1583,40 @@ } ] }, + { + "name": "GetFailedDeletedBlocksTxnRequestProto", + "fields": [ + { + "id": 1, + "name": "traceID", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "count", + "type": "int32", + "required": true + }, + { + "id": 3, + "name": "startTxId", + "type": "int64", + "optional": true + } + ] + }, + { + "name": "GetFailedDeletedBlocksTxnResponseProto", + "fields": [ + { + "id": 1, + "name": "deletedBlocksTransactions", + "type": "DeletedBlocksTransactionInfo", + "is_repeated": true + } + ] + }, { "name": "ResetDeletedBlockRetryCountRequestProto", "fields": [ @@ -1615,7 +1726,19 @@ "id": 4, "name": "certSerialId", "type": "string", - "required": true + "optional": true, + "options": [ + { + "name": "deprecated", + "value": "true" + } + ] + }, + { + "id": 5, + "name": "secretKeyId", + "type": "UUID", + "optional": true } ] }, @@ -1764,6 +1887,34 @@ "required": true } ] + }, + { + "name": "DecommissionScmRequestProto", + "fields": [ + { + "id": 1, + "name": "scmId", + "type": "string", + "required": true + } + ] + }, + { + "name": "DecommissionScmResponseProto", + "fields": [ + { + "id": 1, + "name": "success", + "type": "bool", + "required": true + }, + { + "id": 2, + "name": "errorMsg", + "type": "string", + "optional": true + } + ] } ], "services": [ diff --git a/hadoop-hdds/interface-server/src/main/resources/proto.lock b/hadoop-hdds/interface-server/src/main/resources/proto.lock index 31659ed1094b..6966915f4a26 100644 --- a/hadoop-hdds/interface-server/src/main/resources/proto.lock +++ b/hadoop-hdds/interface-server/src/main/resources/proto.lock @@ -127,6 +127,14 @@ { "name": "FINALIZE", "integer": 8 + }, + { + "name": "SECRET_KEY", + "integer": 9 + }, + { + "name": "CERT_ROTATE", + "integer": 10 } ] } @@ -460,6 +468,296 @@ ] } }, + { + "protopath": "ScmSecretKeyProtocol.proto", + "def": { + "enums": [ + { + "name": "Type", + "enum_fields": [ + { + "name": "GetCurrentSecretKey", + "integer": 1 + }, + { + "name": "GetSecretKey", + "integer": 2 + }, + { + "name": "GetAllSecretKeys", + "integer": 3 + }, + { + "name": "CheckAndRotate", + "integer": 4 + } + ] + }, + { + "name": "Status", + "enum_fields": [ + { + "name": "OK", + "integer": 1 + }, + { + "name": "INTERNAL_ERROR", + "integer": 2 + }, + { + "name": "SECRET_KEY_NOT_ENABLED", + "integer": 3 + }, + { + "name": "SECRET_KEY_NOT_INITIALIZED", + "integer": 4 + } + ] + } + ], + "messages": [ + { + "name": "SCMSecretKeyRequest", + "fields": [ + { + "id": 1, + "name": "cmdType", + "type": "Type", + "required": true + }, + { + "id": 2, + "name": "traceID", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "getSecretKeyRequest", + "type": "SCMGetSecretKeyRequest", + "optional": true + }, + { + "id": 4, + "name": "checkAndRotateRequest", + "type": "SCMGetCheckAndRotateRequest", + "optional": true + } + ] + }, + { + "name": "SCMSecretKeyResponse", + "fields": [ + { + "id": 1, + "name": "cmdType", + "type": "Type", + "required": true + }, + { + "id": 2, + "name": "traceID", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "success", + "type": "bool", + "optional": true, + "options": [ + { + "name": "default", + "value": "true" + } + ] + }, + { + "id": 4, + "name": "message", + "type": "string", + "optional": true + }, + { + "id": 5, + "name": "status", + "type": "Status", + "required": true + }, + { + "id": 11, + "name": "currentSecretKeyResponseProto", + "type": "SCMGetCurrentSecretKeyResponse", + "optional": true + }, + { + "id": 12, + "name": "getSecretKeyResponseProto", + "type": "SCMGetSecretKeyResponse", + "optional": true + }, + { + "id": 13, + "name": "secretKeysListResponseProto", + "type": "SCMSecretKeysListResponse", + "optional": true + }, + { + "id": 14, + "name": "checkAndRotateResponseProto", + "type": "SCMGetCheckAndRotateResponse", + "optional": true + } + ] + }, + { + "name": "ManagedSecretKey", + "fields": [ + { + "id": 1, + "name": "id", + "type": "UUID", + "required": true + }, + { + "id": 2, + "name": "creationTime", + "type": "uint64", + "required": true + }, + { + "id": 3, + "name": "expiryTime", + "type": "uint64", + "required": true + }, + { + "id": 4, + "name": "algorithm", + "type": "string", + "required": true + }, + { + "id": 5, + "name": "encoded", + "type": "bytes", + "required": true + } + ] + }, + { + "name": "SCMGetSecretKeyRequest", + "fields": [ + { + "id": 1, + "name": "secretKeyId", + "type": "UUID", + "required": true + } + ] + }, + { + "name": "SCMGetCheckAndRotateRequest", + "fields": [ + { + "id": 1, + "name": "force", + "type": "bool", + "optional": true, + "options": [ + { + "name": "default", + "value": "false" + } + ] + } + ] + }, + { + "name": "SCMGetCurrentSecretKeyResponse", + "fields": [ + { + "id": 1, + "name": "secretKey", + "type": "ManagedSecretKey", + "required": true + } + ] + }, + { + "name": "SCMGetSecretKeyResponse", + "fields": [ + { + "id": 1, + "name": "secretKey", + "type": "ManagedSecretKey", + "optional": true + } + ] + }, + { + "name": "SCMSecretKeysListResponse", + "fields": [ + { + "id": 1, + "name": "secretKeys", + "type": "ManagedSecretKey", + "is_repeated": true + } + ] + }, + { + "name": "SCMGetCheckAndRotateResponse", + "fields": [ + { + "id": 1, + "name": "status", + "type": "bool", + "optional": true + } + ] + } + ], + "services": [ + { + "name": "SCMSecretKeyProtocolService", + "rpcs": [ + { + "name": "submitRequest", + "in_type": "SCMSecretKeyRequest", + "out_type": "SCMSecretKeyResponse" + } + ] + } + ], + "imports": [ + { + "path": "hdds.proto" + } + ], + "package": { + "name": "hadoop.hdds.security.symmetric" + }, + "options": [ + { + "name": "java_package", + "value": "org.apache.hadoop.hdds.protocol.proto" + }, + { + "name": "java_outer_classname", + "value": "SCMSecretKeyProtocolProtos" + }, + { + "name": "java_generic_services", + "value": "true" + }, + { + "name": "java_generate_equals_and_hash", + "value": "true" + } + ] + } + }, { "protopath": "ScmServerDatanodeHeartbeatProtocol.proto", "def": { @@ -681,6 +979,19 @@ "integer": 11 } ] + }, + { + "name": "ReplicationCommandPriority", + "enum_fields": [ + { + "name": "NORMAL", + "integer": 1 + }, + { + "name": "LOW", + "integer": 2 + } + ] } ], "messages": [ @@ -999,6 +1310,12 @@ "name": "commands", "type": "SCMCommandProto", "is_repeated": true + }, + { + "id": 3, + "name": "term", + "type": "int64", + "optional": true } ] }, @@ -1292,6 +1609,18 @@ "name": "replicaIndex", "type": "int32", "optional": true + }, + { + "id": 15, + "name": "isEmpty", + "type": "bool", + "optional": true, + "options": [ + { + "name": "default", + "value": "false" + } + ] } ] }, @@ -1552,6 +1881,12 @@ "name": "encodedToken", "type": "string", "optional": true + }, + { + "id": 17, + "name": "deadlineMsSinceEpoch", + "type": "int64", + "optional": true } ] }, @@ -1742,6 +2077,24 @@ "name": "replicaIndex", "type": "int32", "optional": true + }, + { + "id": 5, + "name": "target", + "type": "DatanodeDetailsProto", + "optional": true + }, + { + "id": 6, + "name": "priority", + "type": "ReplicationCommandPriority", + "optional": true, + "options": [ + { + "name": "default", + "value": "NORMAL" + } + ] } ] }, @@ -2176,6 +2529,34 @@ { "name": "FAILED_TO_ADD_CRL_CLIENT", "integer": 39 + }, + { + "name": "INVALID_PIPELINE_STATE", + "integer": 40 + }, + { + "name": "DUPLICATED_PIPELINE_ID", + "integer": 41 + }, + { + "name": "TIMEOUT", + "integer": 42 + }, + { + "name": "CA_ROTATION_IN_PROGRESS", + "integer": 43 + }, + { + "name": "CA_ROTATION_IN_POST_PROGRESS", + "integer": 44 + }, + { + "name": "CONTAINER_ALREADY_CLOSED", + "integer": 45 + }, + { + "name": "CONTAINER_ALREADY_CLOSING", + "integer": 46 } ] }, @@ -2405,6 +2786,12 @@ "name": "ecReplicationConfig", "type": "hadoop.hdds.ECReplicationConfig", "optional": true + }, + { + "id": 9, + "name": "client", + "type": "string", + "optional": true } ] }, @@ -2632,6 +3019,14 @@ { "name": "GetCert", "integer": 12 + }, + { + "name": "GetAllRootCaCertificates", + "integer": 13 + }, + { + "name": "RemoveExpiredCertificates", + "integer": 14 } ] }, @@ -2864,6 +3259,18 @@ "name": "getCertRequest", "type": "SCMGetCertRequestProto", "optional": true + }, + { + "id": 14, + "name": "getAllRootCaCertificatesRequestProto", + "type": "SCMGetAllRootCaCertificatesRequestProto", + "optional": true + }, + { + "id": 15, + "name": "removeExpiredCertificatesRequestProto", + "type": "SCMRemoveExpiredCertificatesRequestProto", + "optional": true } ] }, @@ -2935,6 +3342,18 @@ "name": "revokeCertificatesResponseProto", "type": "SCMRevokeCertificatesResponseProto", "optional": true + }, + { + "id": 11, + "name": "allRootCaCertificatesResponseProto", + "type": "SCMGetAllRootCaCertificatesResponseProto", + "optional": true + }, + { + "id": 12, + "name": "removeExpiredCertificatesResponseProto", + "type": "SCMRemoveExpiredCertificatesResponseProto", + "optional": true } ] }, @@ -3003,6 +3422,18 @@ "name": "CSR", "type": "string", "required": true + }, + { + "id": 3, + "name": "renew", + "type": "bool", + "optional": true, + "options": [ + { + "name": "default", + "value": "false" + } + ] } ] }, @@ -3095,6 +3526,28 @@ } ] }, + { + "name": "SCMGetAllRootCaCertificatesResponseProto", + "fields": [ + { + "id": 1, + "name": "allX509RootCaCertificates", + "type": "string", + "is_repeated": true + } + ] + }, + { + "name": "SCMRemoveExpiredCertificatesResponseProto", + "fields": [ + { + "id": 1, + "name": "removedExpiredCertificates", + "type": "string", + "is_repeated": true + } + ] + }, { "name": "SCMGetRootCACertificateRequestProto" }, @@ -3166,6 +3619,9 @@ } ] }, + { + "name": "SCMGetAllRootCaCertificatesRequestProto" + }, { "name": "SCMRevokeCertificatesResponseProto", "fields": [ @@ -3176,6 +3632,9 @@ "optional": true } ] + }, + { + "name": "SCMRemoveExpiredCertificatesRequestProto" } ], "services": [ diff --git a/hadoop-ozone/interface-client/src/main/resources/proto.lock b/hadoop-ozone/interface-client/src/main/resources/proto.lock index ffe53f04cbfd..b8f5c395baeb 100644 --- a/hadoop-ozone/interface-client/src/main/resources/proto.lock +++ b/hadoop-ozone/interface-client/src/main/resources/proto.lock @@ -174,6 +174,9 @@ { "name": "Type", "enum_fields": [ + { + "name": "UnknownCommand" + }, { "name": "CreateVolume", "integer": 11 @@ -445,6 +448,103 @@ { "name": "GetKeyInfo", "integer": 111 + }, + { + "name": "CreateSnapshot", + "integer": 112 + }, + { + "name": "ListSnapshot", + "integer": 113 + }, + { + "name": "SnapshotDiff", + "integer": 114 + }, + { + "name": "DeleteSnapshot", + "integer": 115 + }, + { + "name": "SnapshotMoveDeletedKeys", + "integer": 116 + }, + { + "name": "TransferLeadership", + "integer": 117 + }, + { + "name": "SnapshotPurge", + "integer": 118 + }, + { + "name": "RecoverLease", + "integer": 119 + }, + { + "name": "SetTimes", + "integer": 120 + }, + { + "name": "RefetchSecretKey", + "integer": 121 + }, + { + "name": "ListSnapshotDiffJobs", + "integer": 122 + }, + { + "name": "CancelSnapshotDiff", + "integer": 123 + }, + { + "name": "SetSafeMode", + "integer": 124 + }, + { + "name": "PrintCompactionLogDag", + "integer": 125 + }, + { + "name": "ListKeysLight", + "integer": 126 + }, + { + "name": "AbortExpiredMultiPartUploads", + "integer": 127 + }, + { + "name": "SetSnapshotProperty", + "integer": 128 + }, + { + "name": "ListStatusLight", + "integer": 129 + }, + { + "name": "GetSnapshotInfo", + "integer": 130 + } + ] + }, + { + "name": "SafeMode", + "enum_fields": [ + { + "name": "ENTER", + "integer": 1 + }, + { + "name": "LEAVE", + "integer": 2 + }, + { + "name": "FORCE_EXIT", + "integer": 3 + }, + { + "name": "GET", + "integer": 4 } ] }, @@ -782,6 +882,38 @@ { "name": "FEATURE_NOT_ENABLED", "integer": 86 + }, + { + "name": "INVALID_SNAPSHOT_ERROR", + "integer": 87 + }, + { + "name": "CONTAINS_SNAPSHOT", + "integer": 88 + }, + { + "name": "SSL_CONNECTION_FAILURE", + "integer": 89 + }, + { + "name": "RENAME_OPEN_FILE", + "integer": 90 + }, + { + "name": "UNAUTHORIZED", + "integer": 91 + }, + { + "name": "S3_SECRET_ALREADY_EXISTS", + "integer": 92 + }, + { + "name": "INVALID_PATH", + "integer": 93 + }, + { + "name": "TOO_MANY_BUCKETS", + "integer": 94 } ] }, @@ -866,6 +998,19 @@ } ] }, + { + "name": "SnapshotStatusProto", + "enum_fields": [ + { + "name": "SNAPSHOT_ACTIVE", + "integer": 1 + }, + { + "name": "SNAPSHOT_DELETED", + "integer": 2 + } + ] + }, { "name": "OzoneObj.ObjectType", "enum_fields": [ @@ -1016,6 +1161,56 @@ "integer": 4 } ] + }, + { + "name": "SnapshotDiffResponse.JobStatusProto", + "enum_fields": [ + { + "name": "QUEUED", + "integer": 1 + }, + { + "name": "IN_PROGRESS", + "integer": 2 + }, + { + "name": "DONE", + "integer": 3 + }, + { + "name": "REJECTED", + "integer": 4 + }, + { + "name": "FAILED", + "integer": 5 + }, + { + "name": "CANCELLED", + "integer": 6 + } + ] + }, + { + "name": "DiffReportEntryProto.DiffTypeProto", + "enum_fields": [ + { + "name": "CREATE", + "integer": 1 + }, + { + "name": "MODIFY", + "integer": 2 + }, + { + "name": "DELETE", + "integer": 3 + }, + { + "name": "RENAME", + "integer": 4 + } + ] } ], "messages": [ @@ -1495,6 +1690,108 @@ "name": "GetKeyInfoRequest", "type": "GetKeyInfoRequest", "optional": true + }, + { + "id": 112, + "name": "CreateSnapshotRequest", + "type": "CreateSnapshotRequest", + "optional": true + }, + { + "id": 113, + "name": "ListSnapshotRequest", + "type": "ListSnapshotRequest", + "optional": true + }, + { + "id": 114, + "name": "snapshotDiffRequest", + "type": "SnapshotDiffRequest", + "optional": true + }, + { + "id": 115, + "name": "DeleteSnapshotRequest", + "type": "DeleteSnapshotRequest", + "optional": true + }, + { + "id": 116, + "name": "SnapshotMoveDeletedKeysRequest", + "type": "SnapshotMoveDeletedKeysRequest", + "optional": true + }, + { + "id": 117, + "name": "TransferOmLeadershipRequest", + "type": "hdds.TransferLeadershipRequestProto", + "optional": true + }, + { + "id": 118, + "name": "SnapshotPurgeRequest", + "type": "SnapshotPurgeRequest", + "optional": true + }, + { + "id": 119, + "name": "RecoverLeaseRequest", + "type": "RecoverLeaseRequest", + "optional": true + }, + { + "id": 120, + "name": "SetTimesRequest", + "type": "SetTimesRequest", + "optional": true + }, + { + "id": 121, + "name": "RefetchSecretKeyRequest", + "type": "RefetchSecretKeyRequest", + "optional": true + }, + { + "id": 122, + "name": "ListSnapshotDiffJobRequest", + "type": "ListSnapshotDiffJobRequest", + "optional": true + }, + { + "id": 123, + "name": "CancelSnapshotDiffRequest", + "type": "CancelSnapshotDiffRequest", + "optional": true + }, + { + "id": 124, + "name": "SetSafeModeRequest", + "type": "SetSafeModeRequest", + "optional": true + }, + { + "id": 125, + "name": "PrintCompactionLogDagRequest", + "type": "PrintCompactionLogDagRequest", + "optional": true + }, + { + "id": 126, + "name": "multipartUploadsExpiredAbortRequest", + "type": "MultipartUploadsExpiredAbortRequest", + "optional": true + }, + { + "id": 127, + "name": "SetSnapshotPropertyRequest", + "type": "SetSnapshotPropertyRequest", + "optional": true + }, + { + "id": 128, + "name": "SnapshotInfoRequest", + "type": "SnapshotInfoRequest", + "optional": true } ] }, @@ -1944,6 +2241,126 @@ "name": "GetKeyInfoResponse", "type": "GetKeyInfoResponse", "optional": true + }, + { + "id": 112, + "name": "CreateSnapshotResponse", + "type": "CreateSnapshotResponse", + "optional": true + }, + { + "id": 113, + "name": "ListSnapshotResponse", + "type": "ListSnapshotResponse", + "optional": true + }, + { + "id": 114, + "name": "snapshotDiffResponse", + "type": "SnapshotDiffResponse", + "optional": true + }, + { + "id": 115, + "name": "DeleteSnapshotResponse", + "type": "DeleteSnapshotResponse", + "optional": true + }, + { + "id": 116, + "name": "SnapshotMoveDeletedKeysResponse", + "type": "SnapshotMoveDeletedKeysResponse", + "optional": true + }, + { + "id": 117, + "name": "TransferOmLeadershipResponse", + "type": "hdds.TransferLeadershipResponseProto", + "optional": true + }, + { + "id": 118, + "name": "SnapshotPurgeResponse", + "type": "SnapshotPurgeResponse", + "optional": true + }, + { + "id": 119, + "name": "RecoverLeaseResponse", + "type": "RecoverLeaseResponse", + "optional": true + }, + { + "id": 120, + "name": "SetTimesResponse", + "type": "SetTimesResponse", + "optional": true + }, + { + "id": 121, + "name": "RefetchSecretKeyResponse", + "type": "RefetchSecretKeyResponse", + "optional": true + }, + { + "id": 122, + "name": "ListSnapshotDiffJobResponse", + "type": "ListSnapshotDiffJobResponse", + "optional": true + }, + { + "id": 123, + "name": "cancelSnapshotDiffResponse", + "type": "CancelSnapshotDiffResponse", + "optional": true + }, + { + "id": 124, + "name": "SetSafeModeResponse", + "type": "SetSafeModeResponse", + "optional": true + }, + { + "id": 125, + "name": "PrintCompactionLogDagResponse", + "type": "PrintCompactionLogDagResponse", + "optional": true + }, + { + "id": 126, + "name": "listKeysLightResponse", + "type": "ListKeysLightResponse", + "optional": true + }, + { + "id": 127, + "name": "multipartUploadsExpiredAbortResponse", + "type": "MultipartUploadsExpiredAbortResponse", + "optional": true + }, + { + "id": 128, + "name": "SetSnapshotPropertyResponse", + "type": "SetSnapshotPropertyResponse", + "optional": true + }, + { + "id": 129, + "name": "listStatusLightResponse", + "type": "ListStatusLightResponse", + "optional": true + }, + { + "id": 130, + "name": "SnapshotInfoResponse", + "type": "SnapshotInfoResponse", + "optional": true + }, + { + "id": 131, + "name": "omLockDetails", + "type": "OMLockDetailsProto", + "optional": true } ] }, @@ -2262,6 +2679,20 @@ } ] }, + { + "name": "RefetchSecretKeyRequest" + }, + { + "name": "RefetchSecretKeyResponse", + "fields": [ + { + "id": 1, + "name": "id", + "type": "hdds.UUID", + "optional": true + } + ] + }, { "name": "CheckVolumeAccessRequest", "fields": [ @@ -2730,22 +3161,206 @@ ] }, { - "name": "OzoneObj", + "name": "SnapshotInfo", "fields": [ { "id": 1, - "name": "resType", - "type": "ObjectType", - "required": true + "name": "snapshotID", + "type": "hadoop.hdds.UUID", + "optional": true }, { "id": 2, - "name": "storeType", - "type": "StoreType", - "required": true, - "options": [ - { - "name": "default", + "name": "name", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 5, + "name": "snapshotStatus", + "type": "SnapshotStatusProto", + "optional": true + }, + { + "id": 6, + "name": "creationTime", + "type": "uint64", + "optional": true + }, + { + "id": 7, + "name": "deletionTime", + "type": "uint64", + "optional": true + }, + { + "id": 8, + "name": "pathPreviousSnapshotID", + "type": "hadoop.hdds.UUID", + "optional": true + }, + { + "id": 9, + "name": "globalPreviousSnapshotID", + "type": "hadoop.hdds.UUID", + "optional": true + }, + { + "id": 10, + "name": "snapshotPath", + "type": "string", + "optional": true + }, + { + "id": 11, + "name": "checkpointDir", + "type": "string", + "optional": true + }, + { + "id": 12, + "name": "dbTxSequenceNumber", + "type": "int64", + "optional": true + }, + { + "id": 13, + "name": "deepClean", + "type": "bool", + "optional": true + }, + { + "id": 14, + "name": "sstFiltered", + "type": "bool", + "optional": true + }, + { + "id": 15, + "name": "referencedSize", + "type": "uint64", + "optional": true + }, + { + "id": 16, + "name": "referencedReplicatedSize", + "type": "uint64", + "optional": true + }, + { + "id": 17, + "name": "exclusiveSize", + "type": "uint64", + "optional": true + }, + { + "id": 18, + "name": "exclusiveReplicatedSize", + "type": "uint64", + "optional": true + } + ] + }, + { + "name": "SnapshotDiffJobProto", + "fields": [ + { + "id": 1, + "name": "creationTime", + "type": "uint64", + "optional": true + }, + { + "id": 2, + "name": "jobId", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "status", + "type": "SnapshotDiffResponse.JobStatusProto", + "optional": true + }, + { + "id": 4, + "name": "volume", + "type": "string", + "optional": true + }, + { + "id": 5, + "name": "bucket", + "type": "string", + "optional": true + }, + { + "id": 6, + "name": "fromSnapshot", + "type": "string", + "optional": true + }, + { + "id": 7, + "name": "toSnapshot", + "type": "string", + "optional": true + }, + { + "id": 8, + "name": "forceFullDiff", + "type": "bool", + "optional": true + }, + { + "id": 9, + "name": "totalDiffEntries", + "type": "uint64", + "optional": true + }, + { + "id": 10, + "name": "message", + "type": "string", + "optional": true + }, + { + "id": 11, + "name": "disableNativeDiff", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "OzoneObj", + "fields": [ + { + "id": 1, + "name": "resType", + "type": "ObjectType", + "required": true + }, + { + "id": 2, + "name": "storeType", + "type": "StoreType", + "required": true, + "options": [ + { + "name": "default", "value": "S3" } ] @@ -3033,6 +3648,12 @@ "name": "count", "type": "int32", "optional": true + }, + { + "id": 5, + "name": "hasSnapshot", + "type": "bool", + "optional": true } ] }, @@ -3463,6 +4084,59 @@ "name": "fileChecksum", "type": "FileChecksumProto", "optional": true + }, + { + "id": 19, + "name": "isFile", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "BasicKeyInfo", + "fields": [ + { + "id": 1, + "name": "keyName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "dataSize", + "type": "uint64", + "optional": true + }, + { + "id": 3, + "name": "creationTime", + "type": "uint64", + "optional": true + }, + { + "id": 4, + "name": "modificationTime", + "type": "uint64", + "optional": true + }, + { + "id": 5, + "name": "type", + "type": "hadoop.hdds.ReplicationType", + "optional": true + }, + { + "id": 6, + "name": "factor", + "type": "hadoop.hdds.ReplicationFactor", + "optional": true + }, + { + "id": 7, + "name": "ecReplicationConfig", + "type": "hadoop.hdds.ECReplicationConfig", + "optional": true } ] }, @@ -3553,6 +4227,41 @@ } ] }, + { + "name": "OzoneFileStatusProtoLight", + "fields": [ + { + "id": 1, + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "basicKeyInfo", + "type": "BasicKeyInfo", + "optional": true + }, + { + "id": 4, + "name": "blockSize", + "type": "uint64", + "optional": true + }, + { + "id": 5, + "name": "isDirectory", + "type": "bool", + "optional": true + } + ] + }, { "name": "GetFileStatusRequest", "fields": [ @@ -3576,11 +4285,22 @@ ] }, { - "name": "CreateDirectoryRequest", + "name": "GetFileStatusLightResponse", "fields": [ { "id": 1, - "name": "keyArgs", + "name": "status", + "type": "OzoneFileStatusProtoLight", + "required": true + } + ] + }, + { + "name": "CreateDirectoryRequest", + "fields": [ + { + "id": 1, + "name": "keyArgs", "type": "KeyArgs", "required": true } @@ -3709,6 +4429,17 @@ } ] }, + { + "name": "ListStatusLightResponse", + "fields": [ + { + "id": 1, + "name": "statuses", + "type": "OzoneFileStatusProtoLight", + "is_repeated": true + } + ] + }, { "name": "CreateKeyRequest", "fields": [ @@ -4027,6 +4758,18 @@ "name": "deletedKeys", "type": "DeletedKeys", "is_repeated": true + }, + { + "id": 2, + "name": "snapshotTableKey", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "keysToUpdate", + "type": "SnapshotMoveKeyInfos", + "is_repeated": true } ] }, @@ -4067,6 +4810,12 @@ "name": "deletedPath", "type": "PurgePathRequest", "is_repeated": true + }, + { + "id": 2, + "name": "snapshotTableKey", + "type": "string", + "optional": true } ] }, @@ -4338,6 +5087,29 @@ "name": "keyInfo", "type": "KeyInfo", "is_repeated": true + }, + { + "id": 3, + "name": "isTruncated", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "ListKeysLightResponse", + "fields": [ + { + "id": 1, + "name": "basicKeyInfo", + "type": "BasicKeyInfo", + "is_repeated": true + }, + { + "id": 2, + "name": "isTruncated", + "type": "bool", + "optional": true } ] }, @@ -4355,6 +5127,12 @@ "name": "clientID", "type": "uint64", "required": true + }, + { + "id": 3, + "name": "hsync", + "type": "bool", + "optional": true } ] }, @@ -4464,6 +5242,12 @@ "name": "latestSequenceNumber", "type": "uint64", "optional": true + }, + { + "id": 4, + "name": "dbUpdateSuccess", + "type": "bool", + "optional": true } ] }, @@ -4932,6 +5716,54 @@ { "name": "MultipartUploadAbortResponse" }, + { + "name": "MultipartUploadsExpiredAbortRequest", + "fields": [ + { + "id": 1, + "name": "expiredMultipartUploadsPerBucket", + "type": "ExpiredMultipartUploadsBucket", + "is_repeated": true + } + ] + }, + { + "name": "ExpiredMultipartUploadsBucket", + "fields": [ + { + "id": 1, + "name": "volumeName", + "type": "string", + "required": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "required": true + }, + { + "id": 3, + "name": "multipartUploads", + "type": "ExpiredMultipartUploadInfo", + "is_repeated": true + } + ] + }, + { + "name": "ExpiredMultipartUploadInfo", + "fields": [ + { + "id": 1, + "name": "name", + "type": "string", + "required": true + } + ] + }, + { + "name": "MultipartUploadsExpiredAbortResponse" + }, { "name": "MultipartUploadListPartsRequest", "fields": [ @@ -5150,6 +5982,18 @@ "name": "payloadSizeResp", "type": "int32", "optional": true + }, + { + "id": 3, + "name": "readOnly", + "type": "bool", + "optional": true, + "options": [ + { + "name": "default", + "value": "true" + } + ] } ] }, @@ -5492,6 +6336,12 @@ "name": "adminRoleName", "type": "string", "optional": true + }, + { + "id": 5, + "name": "forceCreationWhenVolumeExists", + "type": "bool", + "optional": true } ] }, @@ -5507,107 +6357,188 @@ ] }, { - "name": "DeleteTenantRequest", + "name": "CreateSnapshotRequest", "fields": [ { "id": 1, - "name": "tenantId", + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "snapshotName", "type": "string", "optional": true + }, + { + "id": 4, + "name": "snapshotId", + "type": "hadoop.hdds.UUID", + "optional": true + }, + { + "id": 5, + "name": "creationTime", + "type": "uint64", + "optional": true } ] }, { - "name": "TenantAssignUserAccessIdRequest", + "name": "ListSnapshotRequest", "fields": [ { "id": 1, - "name": "userPrincipal", + "name": "volumeName", "type": "string", "optional": true }, { "id": 2, - "name": "tenantId", + "name": "bucketName", "type": "string", "optional": true }, { "id": 3, - "name": "accessId", + "name": "prefix", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "prevSnapshot", "type": "string", "optional": true + }, + { + "id": 5, + "name": "maxListResult", + "type": "uint32", + "optional": true } ] }, { - "name": "TenantRevokeUserAccessIdRequest", + "name": "SnapshotDiffRequest", "fields": [ { "id": 1, - "name": "accessId", + "name": "volumeName", "type": "string", "optional": true }, { "id": 2, - "name": "tenantId", + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "fromSnapshot", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "toSnapshot", "type": "string", "optional": true + }, + { + "id": 5, + "name": "token", + "type": "string", + "optional": true + }, + { + "id": 6, + "name": "pageSize", + "type": "uint32", + "optional": true + }, + { + "id": 7, + "name": "forceFullDiff", + "type": "bool", + "optional": true + }, + { + "id": 8, + "name": "disableNativeDiff", + "type": "bool", + "optional": true } ] }, { - "name": "TenantAssignAdminRequest", + "name": "CancelSnapshotDiffRequest", "fields": [ { "id": 1, - "name": "accessId", + "name": "volumeName", "type": "string", "optional": true }, { "id": 2, - "name": "tenantId", + "name": "bucketName", "type": "string", "optional": true }, { "id": 3, - "name": "delegated", - "type": "bool", + "name": "fromSnapshot", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "toSnapshot", + "type": "string", "optional": true } ] }, { - "name": "TenantRevokeAdminRequest", + "name": "ListSnapshotDiffJobRequest", "fields": [ { "id": 1, - "name": "accessId", + "name": "volumeName", "type": "string", - "optional": true + "required": true }, { "id": 2, - "name": "tenantId", + "name": "bucketName", + "type": "string", + "required": true + }, + { + "id": 3, + "name": "jobStatus", "type": "string", "optional": true + }, + { + "id": 4, + "name": "listAll", + "type": "bool", + "optional": true } ] }, { - "name": "GetS3VolumeContextRequest" - }, - { - "name": "CreateTenantResponse" - }, - { - "name": "SetRangerServiceVersionResponse" - }, - { - "name": "DeleteTenantResponse", + "name": "DeleteSnapshotRequest", "fields": [ { "id": 1, @@ -5617,19 +6548,462 @@ }, { "id": 2, - "name": "volRefCount", - "type": "int64", + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "snapshotName", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "deletionTime", + "type": "uint64", "optional": true } ] }, { - "name": "TenantAssignUserAccessIdResponse", + "name": "SnapshotInfoRequest", "fields": [ { "id": 1, - "name": "s3Secret", - "type": "S3Secret", + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "snapshotName", + "type": "string", + "optional": true + } + ] + }, + { + "name": "PrintCompactionLogDagRequest", + "fields": [ + { + "id": 1, + "name": "fileNamePrefix", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "graphType", + "type": "string", + "optional": true + } + ] + }, + { + "name": "SnapshotMoveDeletedKeysRequest", + "fields": [ + { + "id": 1, + "name": "fromSnapshot", + "type": "SnapshotInfo", + "optional": true + }, + { + "id": 2, + "name": "nextDBKeys", + "type": "SnapshotMoveKeyInfos", + "is_repeated": true + }, + { + "id": 3, + "name": "reclaimKeys", + "type": "SnapshotMoveKeyInfos", + "is_repeated": true + }, + { + "id": 4, + "name": "renamedKeys", + "type": "hadoop.hdds.KeyValue", + "is_repeated": true + }, + { + "id": 5, + "name": "deletedDirsToMove", + "type": "string", + "is_repeated": true + } + ] + }, + { + "name": "SnapshotMoveKeyInfos", + "fields": [ + { + "id": 1, + "name": "key", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "keyInfos", + "type": "KeyInfo", + "is_repeated": true + } + ] + }, + { + "name": "SnapshotPurgeRequest", + "fields": [ + { + "id": 1, + "name": "snapshotDBKeys", + "type": "string", + "is_repeated": true + }, + { + "id": 2, + "name": "updatedSnapshotDBKey", + "type": "string", + "is_repeated": true + } + ] + }, + { + "name": "SetSnapshotPropertyRequest", + "fields": [ + { + "id": 1, + "name": "snapshotProperty", + "type": "SnapshotProperty", + "optional": true + } + ] + }, + { + "name": "SnapshotProperty", + "fields": [ + { + "id": 1, + "name": "snapshotKey", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "exclusiveSize", + "type": "uint64", + "optional": true + }, + { + "id": 3, + "name": "exclusiveReplicatedSize", + "type": "uint64", + "optional": true + } + ] + }, + { + "name": "DeleteTenantRequest", + "fields": [ + { + "id": 1, + "name": "tenantId", + "type": "string", + "optional": true + } + ] + }, + { + "name": "TenantAssignUserAccessIdRequest", + "fields": [ + { + "id": 1, + "name": "userPrincipal", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "tenantId", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "accessId", + "type": "string", + "optional": true + } + ] + }, + { + "name": "TenantRevokeUserAccessIdRequest", + "fields": [ + { + "id": 1, + "name": "accessId", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "tenantId", + "type": "string", + "optional": true + } + ] + }, + { + "name": "TenantAssignAdminRequest", + "fields": [ + { + "id": 1, + "name": "accessId", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "tenantId", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "delegated", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "TenantRevokeAdminRequest", + "fields": [ + { + "id": 1, + "name": "accessId", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "tenantId", + "type": "string", + "optional": true + } + ] + }, + { + "name": "GetS3VolumeContextRequest" + }, + { + "name": "CreateTenantResponse" + }, + { + "name": "SetRangerServiceVersionResponse" + }, + { + "name": "CreateSnapshotResponse", + "fields": [ + { + "id": 1, + "name": "snapshotInfo", + "type": "SnapshotInfo", + "optional": true + } + ] + }, + { + "name": "ListSnapshotResponse", + "fields": [ + { + "id": 1, + "name": "snapshotInfo", + "type": "SnapshotInfo", + "is_repeated": true + } + ] + }, + { + "name": "SnapshotDiffResponse", + "fields": [ + { + "id": 1, + "name": "snapshotDiffReport", + "type": "SnapshotDiffReportProto", + "optional": true + }, + { + "id": 2, + "name": "jobStatus", + "type": "JobStatusProto", + "optional": true + }, + { + "id": 3, + "name": "waitTimeInMs", + "type": "int64", + "optional": true + }, + { + "id": 4, + "name": "reason", + "type": "string", + "optional": true + } + ] + }, + { + "name": "CancelSnapshotDiffResponse", + "fields": [ + { + "id": 1, + "name": "reason", + "type": "string", + "optional": true + } + ] + }, + { + "name": "ListSnapshotDiffJobResponse", + "fields": [ + { + "id": 1, + "name": "snapshotDiffJob", + "type": "SnapshotDiffJobProto", + "is_repeated": true + } + ] + }, + { + "name": "DeleteSnapshotResponse" + }, + { + "name": "SnapshotInfoResponse", + "fields": [ + { + "id": 1, + "name": "snapshotInfo", + "type": "SnapshotInfo", + "optional": true + } + ] + }, + { + "name": "PrintCompactionLogDagResponse", + "fields": [ + { + "id": 1, + "name": "message", + "type": "string", + "optional": true + } + ] + }, + { + "name": "SnapshotMoveDeletedKeysResponse" + }, + { + "name": "SnapshotPurgeResponse" + }, + { + "name": "SetSnapshotPropertyResponse" + }, + { + "name": "SnapshotDiffReportProto", + "fields": [ + { + "id": 1, + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "fromSnapshot", + "type": "string", + "optional": true + }, + { + "id": 4, + "name": "toSnapshot", + "type": "string", + "optional": true + }, + { + "id": 5, + "name": "diffList", + "type": "DiffReportEntryProto", + "is_repeated": true + }, + { + "id": 6, + "name": "token", + "type": "string", + "optional": true + } + ] + }, + { + "name": "DiffReportEntryProto", + "fields": [ + { + "id": 1, + "name": "diffType", + "type": "DiffTypeProto", + "optional": true + }, + { + "id": 2, + "name": "sourcePath", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "targetPath", + "type": "string", + "optional": true + } + ] + }, + { + "name": "DeleteTenantResponse", + "fields": [ + { + "id": 1, + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "volRefCount", + "type": "int64", + "optional": true + } + ] + }, + { + "name": "TenantAssignUserAccessIdResponse", + "fields": [ + { + "id": 1, + "name": "s3Secret", + "type": "S3Secret", "optional": true } ] @@ -5699,6 +7073,117 @@ "optional": true } ] + }, + { + "name": "RecoverLeaseRequest", + "fields": [ + { + "id": 1, + "name": "volumeName", + "type": "string", + "optional": true + }, + { + "id": 2, + "name": "bucketName", + "type": "string", + "optional": true + }, + { + "id": 3, + "name": "keyName", + "type": "string", + "optional": true + } + ] + }, + { + "name": "RecoverLeaseResponse", + "fields": [ + { + "id": 1, + "name": "response", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "SetTimesRequest", + "fields": [ + { + "id": 1, + "name": "keyArgs", + "type": "KeyArgs", + "required": true + }, + { + "id": 2, + "name": "mtime", + "type": "uint64", + "required": true + }, + { + "id": 3, + "name": "atime", + "type": "uint64", + "required": true + } + ] + }, + { + "name": "SetTimesResponse" + }, + { + "name": "SetSafeModeRequest", + "fields": [ + { + "id": 1, + "name": "safeMode", + "type": "SafeMode", + "required": true + } + ] + }, + { + "name": "SetSafeModeResponse", + "fields": [ + { + "id": 1, + "name": "response", + "type": "bool", + "optional": true + } + ] + }, + { + "name": "OMLockDetailsProto", + "fields": [ + { + "id": 1, + "name": "isLockAcquired", + "type": "bool", + "optional": true + }, + { + "id": 2, + "name": "waitLockNanos", + "type": "uint64", + "optional": true + }, + { + "id": 3, + "name": "readLockNanos", + "type": "uint64", + "optional": true + }, + { + "id": 4, + "name": "writeLockNanos", + "type": "uint64", + "optional": true + } + ] } ], "services": [