|
@@ -210,16 +210,14 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
|
|
|
@Override
|
|
|
public Set<? extends Replica> deepCopyReplica(String bpid)
|
|
|
throws IOException {
|
|
|
- try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
|
|
|
- Set<ReplicaInfo> replicas = new HashSet<>();
|
|
|
- volumeMap.replicas(bpid, (iterator) -> {
|
|
|
- while (iterator.hasNext()) {
|
|
|
- ReplicaInfo b = iterator.next();
|
|
|
- replicas.add(b);
|
|
|
- }
|
|
|
- });
|
|
|
- return replicas;
|
|
|
- }
|
|
|
+ Set<ReplicaInfo> replicas = new HashSet<>();
|
|
|
+ volumeMap.replicas(bpid, (iterator) -> {
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ ReplicaInfo b = iterator.next();
|
|
|
+ replicas.add(b);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return replicas;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -2169,19 +2167,16 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
|
|
|
*/
|
|
|
@Override
|
|
|
public List<ReplicaInfo> getFinalizedBlocks(String bpid) {
|
|
|
- try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
|
|
|
- ArrayList<ReplicaInfo> finalized =
|
|
|
- new ArrayList<>(volumeMap.size(bpid));
|
|
|
- volumeMap.replicas(bpid, (iterator) -> {
|
|
|
- while (iterator.hasNext()) {
|
|
|
- ReplicaInfo b = iterator.next();
|
|
|
- if (b.getState() == ReplicaState.FINALIZED) {
|
|
|
- finalized.add(new FinalizedReplica((FinalizedReplica)b));
|
|
|
- }
|
|
|
+ ArrayList<ReplicaInfo> finalized = new ArrayList<>();
|
|
|
+ volumeMap.replicas(bpid, (iterator) -> {
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ ReplicaInfo b = iterator.next();
|
|
|
+ if (b.getState() == ReplicaState.FINALIZED) {
|
|
|
+ finalized.add(new FinalizedReplica((FinalizedReplica)b));
|
|
|
}
|
|
|
- });
|
|
|
- return finalized;
|
|
|
- }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return finalized;
|
|
|
}
|
|
|
|
|
|
/**
|