Skip to content

HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch #7188

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
swamirishi merged 13 commits into from
Sep 13, 2024
Merged

HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch #7188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ecf8413
HDDS-11453. OmSnapshotPurge should be in a different ozone manager do…
swamirishi Sep 11, 2024
b5a5eeb
HDDS-11453. Remove hasOmSNapshotCreateResponse check
swamirishi Sep 11, 2024
7fb2f8e
HDDS-11453. Suppress spotbugs warnings
swamirishi Sep 12, 2024
bde5dbb
Revert "HDDS-11453. Suppress spotbugs warnings"
swamirishi Sep 12, 2024
8d565f6
HDDS-11453. Exclude spotbugs warning for the 2 methods
swamirishi Sep 12, 2024
4c52f98
HDDS-11453. Exclude spotbugs warning for the field
swamirishi Sep 12, 2024
b5fce03
HDDS-11453. Add warning comment
swamirishi Sep 12, 2024
a85b2f2
HDDS-11453. Revert findbugs.sh file
swamirishi Sep 12, 2024
1ca07a4
Revert "HDDS-11453. Revert findbugs.sh file"
swamirishi Sep 12, 2024
ae364d1
Revert "HDDS-11453. Add warning comment"
swamirishi Sep 12, 2024
e00255d
Revert "HDDS-11453. Exclude spotbugs warning for the field"
swamirishi Sep 12, 2024
42bbb7d
HDDS-11453. Make methods synchronized
swamirishi Sep 12, 2024
3f4d8f9
HDDS-11453. Fix checkstyle
swamirishi Sep 12, 2024
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
4 changes: 4 additions & 0 deletions hadoop-ozone/ozone-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
3 changes: 3 additions & 0 deletions ...zone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
Expand Down Expand Up @@ -445,6 +446,7 @@ private String addToBatch(Queue<Entry> buffer, BatchOperation batchOperation) {
* response = [[request1, request2], [snapshotRequest1], [request3],
* [snapshotRequest2], [request4]]
*/
@SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
private List<Queue<Entry>> splitReadyBufferAtCreateSnapshot() {
final List<Queue<Entry>> response = new ArrayList<>();
final Set<OzoneManagerProtocolProtos.Type> standaloneBatchCmdTypes = ImmutableSet.of(
Expand Down Expand Up @@ -626,6 +628,7 @@ int getCurrentBufferSize() {
return currentBuffer.size();
}

@SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
int getReadyBufferSize() {
return readyBuffer.size();
}
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>

<spotbugs.version>3.1.12.2</spotbugs.version>
<spotbugs.annotation.version>3.1.12</spotbugs.annotation.version>
<dnsjava.version>2.1.9</dnsjava.version>
<okhttp3.version>4.12.0</okhttp3.version>
<stax2.version>4.2.2</stax2.version>
Expand Down Expand Up @@ -1312,6 +1313,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>nimbus-jose-jwt</artifactId>
<version>${com.nimbusds.nimbus-jose-jwt.version}</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>${spotbugs.annotation.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down