-
Notifications
You must be signed in to change notification settings - Fork 593
HDDS-3208. Implement Ratis snapshot on SCM #1725
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.
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
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
78fb54c
HDDS-3208. Implement Ratis Snapshots on SCM
amaliujia 76509c8
fixup! fix comments
amaliujia 1751c5c
fixup! fix UT
amaliujia f22d5ea
trigger new CI check
amaliujia cde5996
fixup! fix NPE
amaliujia bbd561d
trigger new CI check
amaliujia cb4d4f4
trigger new CI check
amaliujia 68e02fa
trigger new CI check
amaliujia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/DBTransactionBuffer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> | ||
| * <p>http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * <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.ha; | ||
|
|
||
| import org.apache.hadoop.hdds.utils.db.BatchOperation; | ||
| import org.apache.ratis.statemachine.SnapshotInfo; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * DB transaction that buffers SCM DB transactions. Call the flush method | ||
| * to flush a batch into SCM DB. This buffer also maintains a latest transaction | ||
| * info to indicate the information of the latest transaction in the buffer. | ||
| */ | ||
| public interface DBTransactionBuffer extends Closeable { | ||
|
|
||
| BatchOperation getCurrentBatchOperation(); | ||
|
|
||
| void updateLatestTrxInfo(SCMTransactionInfo info); | ||
|
|
||
| SCMTransactionInfo getLatestTrxInfo(); | ||
|
|
||
| SnapshotInfo getLatestSnapshot(); | ||
|
|
||
| void setLatestSnapshot(SnapshotInfo latestSnapshot); | ||
|
|
||
| void flush() throws IOException; | ||
| } |
82 changes: 82 additions & 0 deletions
82
...-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/MockDBTransactionBuffer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * 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.ha; | ||
|
|
||
| import org.apache.hadoop.hdds.utils.db.BatchOperation; | ||
| import org.apache.hadoop.hdds.utils.db.DBStore; | ||
| import org.apache.hadoop.hdds.utils.db.RDBBatchOperation; | ||
| import org.apache.ratis.statemachine.SnapshotInfo; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class MockDBTransactionBuffer implements DBTransactionBuffer { | ||
| private DBStore dbStore; | ||
| private BatchOperation currentBatchOperation; | ||
|
|
||
| public MockDBTransactionBuffer() { | ||
| } | ||
|
|
||
| public MockDBTransactionBuffer(DBStore store) { | ||
| this.dbStore = store; | ||
| } | ||
|
|
||
| @Override | ||
| public BatchOperation getCurrentBatchOperation() { | ||
| if (currentBatchOperation == null) { | ||
| if (dbStore != null) { | ||
| currentBatchOperation = dbStore.initBatchOperation(); | ||
| } else { | ||
| currentBatchOperation = new RDBBatchOperation(); | ||
| } | ||
| } | ||
| return currentBatchOperation; | ||
| } | ||
|
|
||
| @Override | ||
| public void updateLatestTrxInfo(SCMTransactionInfo info) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public SCMTransactionInfo getLatestTrxInfo() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public SnapshotInfo getLatestSnapshot() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void setLatestSnapshot(SnapshotInfo latestSnapshot) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void flush() throws IOException { | ||
| if (dbStore != null) { | ||
| dbStore.commitBatchOperation(currentBatchOperation); | ||
| currentBatchOperation.close(); | ||
| currentBatchOperation = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| flush(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add an annotation of
@VisibleForTesting.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done