GlenGeng commented on a change in pull request #1780:
URL: https://github.com/apache/ozone/pull/1780#discussion_r563434511
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
##########
@@ -101,8 +103,11 @@ public BlockManagerImpl(final ConfigurationSource conf,
mxBean = MBeans.register("BlockManager", "BlockManagerImpl", this);
// SCM block deleting transaction log and deleting service.
- deletedBlockLog = new DeletedBlockLogImpl(conf, scm.getContainerManager(),
- scm.getScmMetadataStore());
+ deletedBlockLog = new DeletedBlockLogImplV2(conf,
scm.getContainerManager(),
+ scm.getScmHAManager().getRatisServer(),
+ scm.getScmMetadataStore().getDeletedBlocksTXTable(),
+ scm.getScmHAManager().getDBTransactionBuffer());
+ scmContext.setDeletedBlockLog(deletedBlockLog);
Review comment:
This change ` scmContext.setDeletedBlockLog(deletedBlockLog);` is not
needed.
You can use scm as a mediator.
```
StorageContainerManager.getScmBlockManager()
BlockManagerImpl.getDeletedBlockLog()
```
##########
File path:
hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
##########
@@ -337,6 +337,10 @@ message DeletedBlocksTransaction {
required int32 count = 4;
}
+message DeletedBlocksTransactionIDs {
Review comment:
Long type has been supported, can we remove this new added message ?
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManager.java
##########
@@ -0,0 +1,43 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.hdds.scm.block;
+
+import
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction;
+import org.apache.hadoop.hdds.scm.metadata.Replicate;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+import org.apache.hadoop.hdds.utils.db.Table.KeyValue;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public interface DeletedBlockLogStateManager {
+ @Replicate
+ void addTransactionsToDB(ArrayList<DeletedBlocksTransaction> txs)
+ throws IOException;
+
+ @Replicate
+ void removeTransactionsFromDB(ArrayList<Long> txIDs)
+ throws IOException;
+
+ @Replicate
+ void increaseRetryCountOfTransactionDB(ArrayList<Long> txIDs)
Review comment:
`increaseRetryCountOfTransactionDB` to
`increaseRetryCountOfTransactionInDB`
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManagerImpl.java
##########
@@ -0,0 +1,221 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.hdds.scm.block;
+
+import com.google.common.base.Preconditions;
+import org.apache.hadoop.hdds.conf.ConfigurationSource;
+import org.apache.hadoop.hdds.protocol.proto.SCMRatisProtocol;
+import
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction;
+import org.apache.hadoop.hdds.scm.ha.DBTransactionBuffer;
+import org.apache.hadoop.hdds.scm.ha.SCMHAInvocationHandler;
+import org.apache.hadoop.hdds.scm.ha.SCMRatisServer;
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.hdds.utils.db.TableIterator;
+import org.apache.hadoop.hdds.utils.db.TypedTable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+
+import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_BLOCK_DELETION_MAX_RETRY;
+import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_BLOCK_DELETION_MAX_RETRY_DEFAULT;
+
+public class DeletedBlockLogStateManagerImpl
+ implements DeletedBlockLogStateManager {
+
+ public static final Logger LOG =
+ LoggerFactory.getLogger(DeletedBlockLogStateManagerImpl.class);
+
+ private final Table<Long, DeletedBlocksTransaction> deletedTable;
+ private final DBTransactionBuffer transactionBuffer;
+ private final int maxRetry;
+
+ public DeletedBlockLogStateManagerImpl(
+ ConfigurationSource conf,
+ Table<Long, DeletedBlocksTransaction> deletedTable,
+ DBTransactionBuffer buffer) {
+ this.maxRetry = conf.getInt(OZONE_SCM_BLOCK_DELETION_MAX_RETRY,
+ OZONE_SCM_BLOCK_DELETION_MAX_RETRY_DEFAULT);
+ this.deletedTable = deletedTable;
+ this.transactionBuffer = buffer;
Review comment:
We need add a cache for deleted keys, and clear the cache when
transactionBuffer is flushed.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@ozone.apache.org
For additional commands, e-mail: issues-h...@ozone.apache.org
