Skip to content

Commit db86e61

Browse files
adding test to validate reserved space and minfreespace
1 parent 7e5f8e0 commit db86e61

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestStorageDistributionEndpoint.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
5050
import org.apache.hadoop.hdds.client.ReplicationConfig;
5151
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
52+
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
5253
import org.apache.hadoop.hdds.scm.ScmConfig;
5354
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
5455
import org.apache.hadoop.hdds.scm.events.SCMEvents;
@@ -74,6 +75,7 @@
7475
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
7576
import org.apache.hadoop.ozone.recon.api.DataNodeMetricsService;
7677
import org.apache.hadoop.ozone.recon.api.types.DataNodeMetricsServiceResponse;
78+
import org.apache.hadoop.ozone.recon.api.types.DatanodeStorageReport;
7779
import org.apache.hadoop.ozone.recon.api.types.ScmPendingDeletion;
7880
import org.apache.hadoop.ozone.recon.api.types.StorageCapacityDistributionResponse;
7981
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
@@ -215,7 +217,21 @@ private boolean verifyStorageDistributionAfterKeyCreation() {
215217
assertEquals(0, storageResponse.getUsedSpaceBreakDown().getOpenKeyBytes());
216218
assertEquals(60, storageResponse.getUsedSpaceBreakDown().getCommittedKeyBytes());
217219
assertEquals(3, storageResponse.getDataNodeUsage().size());
218-
220+
List<DatanodeStorageReport> reports = storageResponse.getDataNodeUsage();
221+
List<HddsProtos.DatanodeUsageInfoProto> scmReports =
222+
scm.getClientProtocolServer().getDatanodeUsageInfo(true, 3, 1);
223+
for(DatanodeStorageReport report : reports) {
224+
for (HddsProtos.DatanodeUsageInfoProto scmReport : scmReports) {
225+
if (scmReport.getNode().getUuid().equals(report.getDatanodeUuid())) {
226+
assertEquals(report.getMinimumFreeSpace(), scmReport.getFreeSpaceToSpare());
227+
assertEquals(report.getReserved(), scmReport.getReserved());
228+
assertEquals(report.getCapacity(), scmReport.getCapacity());
229+
assertEquals(report.getRemaining(), scmReport.getRemaining());
230+
assertEquals(report.getUsed(), scmReport.getUsed());
231+
assertEquals(report.getCommitted(), scmReport.getCommitted());
232+
}
233+
}
234+
}
219235
return true;
220236
} catch (Exception e) {
221237
LOG.debug("Waiting for storage distribution assertions to pass", e);

0 commit comments

Comments
 (0)