|
49 | 49 | import org.apache.hadoop.hdds.client.DefaultReplicationConfig; |
50 | 50 | import org.apache.hadoop.hdds.client.ReplicationConfig; |
51 | 51 | import org.apache.hadoop.hdds.conf.OzoneConfiguration; |
| 52 | +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; |
52 | 53 | import org.apache.hadoop.hdds.scm.ScmConfig; |
53 | 54 | import org.apache.hadoop.hdds.scm.container.ContainerInfo; |
54 | 55 | import org.apache.hadoop.hdds.scm.events.SCMEvents; |
|
74 | 75 | import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup; |
75 | 76 | import org.apache.hadoop.ozone.recon.api.DataNodeMetricsService; |
76 | 77 | import org.apache.hadoop.ozone.recon.api.types.DataNodeMetricsServiceResponse; |
| 78 | +import org.apache.hadoop.ozone.recon.api.types.DatanodeStorageReport; |
77 | 79 | import org.apache.hadoop.ozone.recon.api.types.ScmPendingDeletion; |
78 | 80 | import org.apache.hadoop.ozone.recon.api.types.StorageCapacityDistributionResponse; |
79 | 81 | import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl; |
@@ -215,7 +217,21 @@ private boolean verifyStorageDistributionAfterKeyCreation() { |
215 | 217 | assertEquals(0, storageResponse.getUsedSpaceBreakDown().getOpenKeyBytes()); |
216 | 218 | assertEquals(60, storageResponse.getUsedSpaceBreakDown().getCommittedKeyBytes()); |
217 | 219 | 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 | + } |
219 | 235 | return true; |
220 | 236 | } catch (Exception e) { |
221 | 237 | LOG.debug("Waiting for storage distribution assertions to pass", e); |
|
0 commit comments