adoroszlai commented on code in PR #9755:
URL: https://github.com/apache/ozone/pull/9755#discussion_r2797285029
##########
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestStorageVolumeChecker.java:
##########
@@ -208,6 +208,11 @@ public void testVolumeDeletion(VolumeCheckResult
checkResult,
conf.getObject(DatanodeConfiguration.class);
dnConf.setDiskCheckMinGap(Duration.ofMillis(0));
conf.setFromObject(dnConf);
+ File volParentDir =
+ new File(folder.toString(), UUID.randomUUID().toString());
+ conf.get(ScmConfigKeys.HDDS_DATANODE_DIR_KEY);
Review Comment:
```suggestion
```
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java:
##########
@@ -456,26 +376,20 @@ public void setVolumeMap(Map<String, StorageVolume> map) {
this.volumeMap = map;
}
- @VisibleForTesting
- public Map<StorageType, List<StorageVolume>> getVolumeStateMap() {
- return ImmutableMap.copyOf(volumeStateMap);
- }
-
public boolean hasEnoughVolumes() {
// Max number of bad volumes allowed, should have at least
// 1 good volume
boolean hasEnoughVolumes;
- if (maxVolumeFailuresTolerated ==
- StorageVolumeChecker.MAX_VOLUME_FAILURE_TOLERATED_LIMIT) {
- hasEnoughVolumes = !getVolumesList().isEmpty();
+ if (maxVolumeFailuresTolerated ==
StorageVolumeChecker.MAX_VOLUME_FAILURE_TOLERATED_LIMIT) {
+ hasEnoughVolumes = !volumeMap.isEmpty();
} else {
- hasEnoughVolumes = getFailedVolumesList().size() <=
maxVolumeFailuresTolerated;
+ hasEnoughVolumes = volumeMap.values().size() <=
maxVolumeFailuresTolerated;
}
if (!hasEnoughVolumes) {
LOG.error("Not enough volumes in MutableVolumeSet. DatanodeUUID: {},
VolumeType: {}, " +
"MaxVolumeFailuresTolerated: {}, ActiveVolumes: {},
FailedVolumes: {}",
datanodeUuid, volumeType, maxVolumeFailuresTolerated,
- getVolumesList().size(), getFailedVolumesList().size());
+ volumeMap.values().size(), failedVolumeMap.values().size());
Review Comment:
nit: can use map size directly.
```suggestion
volumeMap.size(), failedVolumeMap.size());
```
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java:
##########
@@ -456,26 +376,20 @@ public void setVolumeMap(Map<String, StorageVolume> map) {
this.volumeMap = map;
}
- @VisibleForTesting
- public Map<StorageType, List<StorageVolume>> getVolumeStateMap() {
- return ImmutableMap.copyOf(volumeStateMap);
- }
-
public boolean hasEnoughVolumes() {
// Max number of bad volumes allowed, should have at least
// 1 good volume
boolean hasEnoughVolumes;
- if (maxVolumeFailuresTolerated ==
- StorageVolumeChecker.MAX_VOLUME_FAILURE_TOLERATED_LIMIT) {
- hasEnoughVolumes = !getVolumesList().isEmpty();
+ if (maxVolumeFailuresTolerated ==
StorageVolumeChecker.MAX_VOLUME_FAILURE_TOLERATED_LIMIT) {
+ hasEnoughVolumes = !volumeMap.isEmpty();
} else {
- hasEnoughVolumes = getFailedVolumesList().size() <=
maxVolumeFailuresTolerated;
+ hasEnoughVolumes = volumeMap.values().size() <=
maxVolumeFailuresTolerated;
Review Comment:
`getFailedVolumesList` should be replaced with `failedVolumeMap`, not
`volumeMap`.
```suggestion
hasEnoughVolumes = failedVolumeMap.size() <=
maxVolumeFailuresTolerated;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
