This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ec2634d8d2 HDDS-10027. NPE in VolumeInfoMetrics.getCommitted() (#5885)
ec2634d8d2 is described below
commit ec2634d8d25bc8163c7c48fa869fc8bd584f0a6d
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Dec 29 17:36:51 2023 +0100
HDDS-10027. NPE in VolumeInfoMetrics.getCommitted() (#5885)
---
.../org/apache/hadoop/ozone/container/common/volume/HddsVolume.java | 4 +---
.../apache/hadoop/ozone/container/common/volume/TestHddsVolume.java | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
index 581e5aaa43..44bd4cf19a 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
@@ -79,7 +79,7 @@ public class HddsVolume extends StorageVolume {
private final VolumeIOStats volumeIOStats;
private final VolumeInfoMetrics volumeInfoMetrics;
- private final AtomicLong committedBytes; // till Open containers become full
+ private final AtomicLong committedBytes = new AtomicLong(); // till Open
containers become full
// Mentions the type of volume
private final VolumeType type = VolumeType.DATA_VOLUME;
@@ -121,7 +121,6 @@ public class HddsVolume extends StorageVolume {
this.getStorageDir().toString());
this.volumeInfoMetrics =
new VolumeInfoMetrics(b.getVolumeRootStr(), this);
- this.committedBytes = new AtomicLong(0);
LOG.info("Creating HddsVolume: {} of storage type : {} capacity : {}",
getStorageDir(), b.getStorageType(),
@@ -134,7 +133,6 @@ public class HddsVolume extends StorageVolume {
this.setState(VolumeState.FAILED);
volumeIOStats = null;
volumeInfoMetrics = new VolumeInfoMetrics(b.getVolumeRootStr(), this);
- committedBytes = null;
}
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolume.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolume.java
index 4c4e32b07b..b6a6d2566f 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolume.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestHddsVolume.java
@@ -510,6 +510,7 @@ public class TestHddsVolume {
assertEquals(0, volumeInfoMetrics.getCapacity());
assertEquals(0, volumeInfoMetrics.getReserved());
assertEquals(0, volumeInfoMetrics.getTotalCapacity());
+ assertEquals(0, volumeInfoMetrics.getCommitted());
} finally {
// Shutdown the volume.
volume.shutdown();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
