alievmirza commented on code in PR #2450: URL: https://github.com/apache/ignite-3/pull/2450#discussion_r1307038374
########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/CheckCatalogVersionOnAppendEntries.java: ########## @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.table.distributed.schema; + +import java.nio.ByteBuffer; +import org.apache.ignite.internal.catalog.CatalogService; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; +import org.apache.ignite.raft.jraft.Node; +import org.apache.ignite.raft.jraft.entity.EnumOutter.EntryType; +import org.apache.ignite.raft.jraft.entity.RaftOutter; +import org.apache.ignite.raft.jraft.entity.RaftOutter.EntryMeta; +import org.apache.ignite.raft.jraft.error.RaftError; +import org.apache.ignite.raft.jraft.rpc.Message; +import org.apache.ignite.raft.jraft.rpc.RaftRpcFactory; +import org.apache.ignite.raft.jraft.rpc.RaftServerService; +import org.apache.ignite.raft.jraft.rpc.RpcRequestClosure; +import org.apache.ignite.raft.jraft.rpc.RpcRequests.AppendEntriesRequest; +import org.apache.ignite.raft.jraft.rpc.impl.core.AppendEntriesRequestInterceptor; +import org.apache.ignite.raft.jraft.util.Marshaller; +import org.jetbrains.annotations.Nullable; + +/** + * An {@link AppendEntriesRequestInterceptor} that rejects requests (by returning EBUSY error code) if any of the + * incoming commands requires catalog version that is not available locally yet. + */ +public class CheckCatalogVersionOnAppendEntries implements AppendEntriesRequestInterceptor { + private static final IgniteLogger LOG = Loggers.forClass(CheckCatalogVersionOnAppendEntries.class); + + private static final int NO_VERSION_REQUIREMENT = Integer.MIN_VALUE; + + private final CatalogService catalogService; + + public CheckCatalogVersionOnAppendEntries(CatalogService catalogService) { + this.catalogService = catalogService; + } + + @Override + public @Nullable Message intercept(RaftServerService service, AppendEntriesRequest request, RpcRequestClosure done) { + if (request.entriesList() == null || request.data() == null) { + return null; + } + + Node node = (Node) service; + + ByteBuffer allData = request.data().asReadOnlyByteBuffer(); + int offset = 0; + + for (RaftOutter.EntryMeta entry : request.entriesList()) { + int requiredCatalogVersion = readRequiredCatalogVersionForMeta(allData, entry, node.getOptions().requiredCommandsMarshaller()); + + if (requiredCatalogVersion != NO_VERSION_REQUIREMENT && !isMetadataAvailableFor(requiredCatalogVersion)) { + LOG.warn("Metadata not yet available, group {}, required level {}.", request.groupId(), requiredCatalogVersion); + return RaftRpcFactory.DEFAULT // + .newResponse(node.getRaftOptions().getRaftMessagesFactory(), RaftError.EBUSY, + "Metadata not yet available, group '%s', required level %d.", request.groupId(), requiredCatalogVersion); + } + + offset += (int) entry.dataLen(); + allData.position(offset); + } + + return null; + } + + private static int readRequiredCatalogVersionForMeta(ByteBuffer allData, final EntryMeta entry, Marshaller commandsMarshaller) { + if (entry.type() != EntryType.ENTRY_TYPE_DATA) { + return NO_VERSION_REQUIREMENT; + } + + if (!(commandsMarshaller instanceof PartitionCommandsMarshaller)) { + return NO_VERSION_REQUIREMENT; + } + + PartitionCommandsMarshaller partitionCommandsMarshaller = (PartitionCommandsMarshaller) commandsMarshaller; + + long dataLen = entry.dataLen(); + if (dataLen > 0) { + return partitionCommandsMarshaller.readRequiredCatalogVersion(allData); + } + + return NO_VERSION_REQUIREMENT; + } + + private boolean isMetadataAvailableFor(int requiredCatalogVersion) { + return requiredCatalogVersion <= catalogService.latestCatalogVersion(); Review Comment: I'm a bit confused with the javadoc of `CatalogService#latestCatalogVersion` > <p>NOTE: This method should only be used at the start of components that may be removed or moved in the future. which is not true anymore ########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/CheckCatalogVersionOnAppendEntries.java: ########## @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.table.distributed.schema; + +import java.nio.ByteBuffer; +import org.apache.ignite.internal.catalog.CatalogService; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; +import org.apache.ignite.raft.jraft.Node; +import org.apache.ignite.raft.jraft.entity.EnumOutter.EntryType; +import org.apache.ignite.raft.jraft.entity.RaftOutter; +import org.apache.ignite.raft.jraft.entity.RaftOutter.EntryMeta; +import org.apache.ignite.raft.jraft.error.RaftError; +import org.apache.ignite.raft.jraft.rpc.Message; +import org.apache.ignite.raft.jraft.rpc.RaftRpcFactory; +import org.apache.ignite.raft.jraft.rpc.RaftServerService; +import org.apache.ignite.raft.jraft.rpc.RpcRequestClosure; +import org.apache.ignite.raft.jraft.rpc.RpcRequests.AppendEntriesRequest; +import org.apache.ignite.raft.jraft.rpc.impl.core.AppendEntriesRequestInterceptor; +import org.apache.ignite.raft.jraft.util.Marshaller; +import org.jetbrains.annotations.Nullable; + +/** + * An {@link AppendEntriesRequestInterceptor} that rejects requests (by returning EBUSY error code) if any of the + * incoming commands requires catalog version that is not available locally yet. + */ +public class CheckCatalogVersionOnAppendEntries implements AppendEntriesRequestInterceptor { + private static final IgniteLogger LOG = Loggers.forClass(CheckCatalogVersionOnAppendEntries.class); + + private static final int NO_VERSION_REQUIREMENT = Integer.MIN_VALUE; + + private final CatalogService catalogService; + + public CheckCatalogVersionOnAppendEntries(CatalogService catalogService) { + this.catalogService = catalogService; + } + + @Override + public @Nullable Message intercept(RaftServerService service, AppendEntriesRequest request, RpcRequestClosure done) { + if (request.entriesList() == null || request.data() == null) { + return null; + } + + Node node = (Node) service; + + ByteBuffer allData = request.data().asReadOnlyByteBuffer(); + int offset = 0; + + for (RaftOutter.EntryMeta entry : request.entriesList()) { + int requiredCatalogVersion = readRequiredCatalogVersionForMeta(allData, entry, node.getOptions().requiredCommandsMarshaller()); + + if (requiredCatalogVersion != NO_VERSION_REQUIREMENT && !isMetadataAvailableFor(requiredCatalogVersion)) { + LOG.warn("Metadata not yet available, group {}, required level {}.", request.groupId(), requiredCatalogVersion); + return RaftRpcFactory.DEFAULT // + .newResponse(node.getRaftOptions().getRaftMessagesFactory(), RaftError.EBUSY, + "Metadata not yet available, group '%s', required level %d.", request.groupId(), requiredCatalogVersion); + } + + offset += (int) entry.dataLen(); + allData.position(offset); + } + + return null; + } + + private static int readRequiredCatalogVersionForMeta(ByteBuffer allData, final EntryMeta entry, Marshaller commandsMarshaller) { + if (entry.type() != EntryType.ENTRY_TYPE_DATA) { + return NO_VERSION_REQUIREMENT; + } + + if (!(commandsMarshaller instanceof PartitionCommandsMarshaller)) { + return NO_VERSION_REQUIREMENT; + } + + PartitionCommandsMarshaller partitionCommandsMarshaller = (PartitionCommandsMarshaller) commandsMarshaller; + + long dataLen = entry.dataLen(); + if (dataLen > 0) { + return partitionCommandsMarshaller.readRequiredCatalogVersion(allData); + } + + return NO_VERSION_REQUIREMENT; + } + + private boolean isMetadataAvailableFor(int requiredCatalogVersion) { + return requiredCatalogVersion <= catalogService.latestCatalogVersion(); Review Comment: I'm a bit confused with the javadoc of `CatalogService#latestCatalogVersion`: > <p>NOTE: This method should only be used at the start of components that may be removed or moved in the future. which is not true anymore -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
