Skip to content

HDDS-3205. DeleteBlock via Ratis in SCM HA #1780

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

Merged
bshashikant merged 1 commit into from
Jan 28, 2021
Merged

HDDS-3205. DeleteBlock via Ratis in SCM HA #1780

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
1 change: 1 addition & 0 deletions hadoop-hdds/interface-server/src/main/proto/SCMRatisProtocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ option java_generate_equals_and_hash = true;
enum RequestType {
PIPELINE = 1;
CONTAINER = 2;
BLOCK = 3;
}

message Method {
Expand Down
7 changes: 5 additions & 2 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,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(),
scm.getScmContext());
Duration svcInterval = conf.getObject(
ScmConfig.class).getBlockDeletionInterval();
long serviceTimeout =
Expand Down
11 changes: 0 additions & 11 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,6 @@ void incrementCount(List<Long> txIDs)
void commitTransactions(List<DeleteBlockTransactionResult> transactionResults,
UUID dnID);

/**
* Creates a block deletion transaction and adds that into the log.
*
* @param containerID - container ID.
* @param blocks - blocks that belong to the same container.
*
* @throws IOException
*/
void addTransaction(long containerID, List<Long> blocks)
throws IOException;

/**
* Creates block deletion transactions for a set of containers,
* add into the log and persist them atomically. An object key
Expand Down
21 changes: 0 additions & 21 deletions ...p-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,27 +260,6 @@ private boolean isTransactionFailed(DeleteBlockTransactionResult result) {
return false;
}

/**
* {@inheritDoc}
*
* @param containerID - container ID.
* @param blocks - blocks that belong to the same container.
* @throws IOException
*/
@Override
public void addTransaction(long containerID, List<Long> blocks)
throws IOException {
lock.lock();
try {
Long nextTXID = scmMetadataStore.getNextDeleteBlockTXID();
DeletedBlocksTransaction tx =
constructNewTransaction(nextTXID, containerID, blocks);
scmMetadataStore.getDeletedBlocksTXTable().put(nextTXID, tx);
} finally {
lock.unlock();
}
}

@Override
public int getNumOfValidTransactions() throws IOException {
lock.lock();
Expand Down
Loading