Skip to content

Commit 12582a7

Browse files
horizonzyhorizonzy
committed
fix checkstyle.
1 parent 5433819 commit 12582a7

14 files changed

+140
-136
lines changed

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LocalBookieEnsemblePlacementPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ public PlacementResult<List<BookieId>> newEnsemble(int ensembleSize, int writeQu
125125
public void updateBookieInfo(Map<BookieId, BookieInfo> bookieToFreeSpaceMap) {
126126
return;
127127
}
128-
128+
129129
@Override
130130
public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<BookieId> ensemble, int writeQuorumSize,
131131
int ackQuorumSize) {
132132
//local bookie needn't support it.
133133
return Collections.emptyMap();
134134
}
135-
135+
136136
@Override
137137
public PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy(List<BookieId> ensembleList,
138138
int writeQuorumSize, int ackQuorumSize) {

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,9 +1147,8 @@ public void replicateLedgerFragment(LedgerHandle lh, final LedgerFragment ledger
11471147
return;
11481148
}
11491149
replicateLedgerFragment(lh, ledgerFragment, targetBookieAddresses, onReadEntryFailureCallback);
1150-
11511150
}
1152-
1151+
11531152
private void replicateLedgerFragment(LedgerHandle lh,
11541153
final LedgerFragment ledgerFragment,
11551154
final Map<Integer, BookieId> targetBookieAddresses,
@@ -1786,7 +1785,7 @@ public PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy(List<BookieI
17861785
return bkc.getPlacementPolicy().isEnsembleAdheringToPlacementPolicy(ensembleBookiesList, writeQuorumSize,
17871786
ackQuorumSize);
17881787
}
1789-
1788+
17901789
public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<BookieId> ensembleBookiesList,
17911790
int writeQuorumSize, int ackQuorumSize) {
17921791
return bkc.getPlacementPolicy()

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,14 @@ public void updateBookieInfo(Map<BookieId, BookieInfo> bookieInfoMap) {
214214
rwLock.writeLock().unlock();
215215
}
216216
}
217-
217+
218218
@Override
219219
public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<BookieId> ensemble, int writeQuorumSize,
220220
int ackQuorumSize) {
221221
//Default ensemble placement policy always adhering.
222222
return Collections.emptyMap();
223223
}
224-
224+
225225
@Override
226226
public void uninitalize() {
227227
// do nothing

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/EnsemblePlacementPolicy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ DistributionSchedule.WriteSet reorderReadLACSequence(
363363
*/
364364
default void updateBookieInfo(Map<BookieId, BookieInfo> bookieInfoMap) {
365365
}
366-
366+
367367
/**
368368
* Replace some bookie to adhering placement policy. If the all kinds of replacement
369369
* didn't adhere placement policy, return empty map.

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerChecker.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import io.netty.buffer.ByteBuf;
2323

24-
import java.util.Collections;
2524
import java.util.HashMap;
2625
import java.util.HashSet;
2726
import java.util.List;
@@ -372,7 +371,7 @@ public void checkLedger(final LedgerHandle lh,
372371
final GenericCallback<Set<LedgerFragment>> cb) {
373372
checkLedger(lh, cb, 0L);
374373
}
375-
374+
376375
public void checkLedger(final LedgerHandle lh,
377376
final GenericCallback<Set<LedgerFragment>> cb,
378377
long percentageOfLedgerFragmentToBeVerified) {
@@ -457,7 +456,7 @@ public void operationComplete(int rc, Boolean result) {
457456
}
458457
checkFragments(fragments, cb, percentageOfLedgerFragmentToBeVerified);
459458
}
460-
459+
461460
private void checkFragments(Set<LedgerFragment> fragments,
462461
GenericCallback<Set<LedgerFragment>> cb,
463462
long percentageOfLedgerFragmentToBeVerified) {

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragment.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public LedgerFragment(LedgerFragment lf, Set<Integer> subset) {
6666
this.schedule = lf.schedule;
6767
this.isLedgerClosed = lf.isLedgerClosed;
6868
}
69-
69+
7070
/**
7171
* Return a ledger fragment contains subset of bookies.
7272
*
@@ -217,11 +217,11 @@ public boolean isStoredEntryId(long entryId, int bookieIndex) {
217217
public List<BookieId> getEnsemble() {
218218
return this.ensemble;
219219
}
220-
220+
221221
public ReplicateType getReplicateType() {
222222
return replicateType;
223223
}
224-
224+
225225
public void setReplicateType(ReplicateType replicateType) {
226226
this.replicateType = replicateType;
227227
}
@@ -233,7 +233,10 @@ public String toString() {
233233
getFirstStoredEntryId(), lastKnownEntryId, getLastStoredEntryId(),
234234
getAddresses(), isLedgerClosed);
235235
}
236-
236+
237+
/**
238+
* ReplicateType.
239+
*/
237240
public enum ReplicateType {
238241
DATA_LOSS,
239242
DATA_NOT_ADHERING_PLACEMENT

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/client/TopologyAwareEnsemblePlacementPolicy.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@ public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<Booki
809809
for (int i = 0; i < ensemble.size(); i++) {
810810
bookieIndex.put(ensemble.get(i), i);
811811
}
812-
812+
813813
Map<BookieId, BookieNode> clone = new HashMap<>(knownBookies);
814-
814+
815815
Map<String, List<BookieNode>> toPlaceGroup = new HashMap<>();
816816
for (BookieId bookieId : ensemble) {
817817
//If the bookieId shutdown, put it to inactive.
@@ -825,14 +825,14 @@ public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<Booki
825825
list.add(bookieNode);
826826
}
827827
}
828-
828+
829829
Map<String, List<BookieNode>> knowsGroup = clone.values().stream()
830830
.collect(Collectors.groupingBy(NodeBase::getNetworkLocation));
831-
831+
832832
for (String key : toPlaceGroup.keySet()) {
833833
knowsGroup.remove(key);
834834
}
835-
835+
836836
if (knowsGroup.isEmpty()) {
837837
return Collections.emptyMap();
838838
}
@@ -855,9 +855,10 @@ public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<Booki
855855
}
856856
return targetBookieAddresses;
857857
}
858-
859-
private void doReplaceNotAdhering(Map<String, List<BookieNode>> toPlaceGroup, Map<String, List<BookieNode>> knowsGroup,
860-
Map<Integer, BookieId> targetBookieAddresses, Map<BookieId, Integer> bookieIndex) {
858+
859+
private void doReplaceNotAdhering(Map<String, List<BookieNode>> toPlaceGroup,
860+
Map<String, List<BookieNode>> knowsGroup, Map<Integer, BookieId> targetBookieAddresses,
861+
Map<BookieId, Integer> bookieIndex) {
861862
if (knowsGroup.isEmpty()) {
862863
return;
863864
}
@@ -877,27 +878,29 @@ private void doReplaceNotAdhering(Map<String, List<BookieNode>> toPlaceGroup, Ma
877878
doReplace(beReplaced, toPlaceGroup, knowsGroup, targetBookieAddresses, bookieIndex);
878879
return;
879880
}
880-
881+
881882
Map.Entry<String, List<BookieNode>> entry = toPlaceEntry.get();
882883
BookieNode beReplaced = entry.getValue().remove(entry.getValue().size() - 1);
883884
doReplace(beReplaced, toPlaceGroup, knowsGroup, targetBookieAddresses, bookieIndex);
884885
}
885886

886-
private void doReplace(BookieNode beReplaced, Map<String, List<BookieNode>> toPlaceGroup, Map<String, List<BookieNode>> knowsGroup,
887-
Map<Integer, BookieId> targetBookieAddresses, Map<BookieId, Integer> bookieIndex) {
887+
private void doReplace(BookieNode beReplaced, Map<String, List<BookieNode>> toPlaceGroup,
888+
Map<String, List<BookieNode>> knowsGroup, Map<Integer, BookieId> targetBookieAddresses,
889+
Map<BookieId, Integer> bookieIndex) {
888890
Integer index = bookieIndex.get(beReplaced.getAddr());
889-
891+
890892
Iterator<Map.Entry<String, List<BookieNode>>> iterator = knowsGroup.entrySet().iterator();
891893
if (iterator.hasNext()) {
892894
Map.Entry<String, List<BookieNode>> next = iterator.next();
893895
List<BookieNode> list = toPlaceGroup.computeIfAbsent(next.getKey(), k -> new ArrayList<>());
894-
BookieNode toReplaced = new BookieNode(next.getValue().get(0).getAddr(), next.getValue().get(0).getNetworkLocation());
896+
BookieNode toReplaced = new BookieNode(next.getValue().get(0).getAddr(),
897+
next.getValue().get(0).getNetworkLocation());
895898
list.add(toReplaced);
896899
targetBookieAddresses.put(index, toReplaced.getAddr());
897900
iterator.remove();
898901
}
899902
}
900-
903+
901904
protected BookieNode createBookieNode(BookieId addr) {
902905
return new BookieNode(addr, resolveNetworkLocation(addr));
903906
}

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ public class ServerConfiguration extends AbstractConfiguration<ServerConfigurati
202202
protected static final String AUDITOR_PERIODIC_BOOKIE_CHECK_INTERVAL = "auditorPeriodicBookieCheckInterval";
203203
protected static final String AUDITOR_PERIODIC_PLACEMENT_POLICY_CHECK_INTERVAL =
204204
"auditorPeriodicPlacementPolicyCheckInterval";
205-
protected static final String REPAIRED_PLACEMENT_POLICY_NOT_ADHERING_BOOKIE_ENABLED = "repairedPlacementPolicyNotAdheringBookieEnabled";
205+
protected static final String REPAIRED_PLACEMENT_POLICY_NOT_ADHERING_BOOKIE_ENABLED =
206+
"repairedPlacementPolicyNotAdheringBookieEnabled";
206207
protected static final String AUDITOR_LEDGER_VERIFICATION_PERCENTAGE = "auditorLedgerVerificationPercentage";
207208
protected static final String AUTO_RECOVERY_DAEMON_ENABLED = "autoRecoveryDaemonEnabled";
208209
protected static final String LOST_BOOKIE_RECOVERY_DELAY = "lostBookieRecoveryDelay";
@@ -215,7 +216,7 @@ public class ServerConfiguration extends AbstractConfiguration<ServerConfigurati
215216
protected static final String AUDITOR_ACQUIRE_CONCURRENT_OPEN_LEDGER_OPERATIONS_TIMEOUT_MSEC =
216217
"auditorAcquireConcurrentOpenLedgerOperationsTimeOutMSec";
217218
protected static final String IN_FLIGHT_READ_ENTRY_NUM_IN_LEDGER_CHECKER = "inFlightReadEntryNumInLedgerChecker";
218-
219+
219220

220221
// Worker Thread parameters.
221222
protected static final String NUM_ADD_WORKER_THREADS = "numAddWorkerThreads";
@@ -2575,11 +2576,11 @@ public void setAuditorPeriodicPlacementPolicyCheckInterval(long interval) {
25752576
public long getAuditorPeriodicPlacementPolicyCheckInterval() {
25762577
return getLong(AUDITOR_PERIODIC_PLACEMENT_POLICY_CHECK_INTERVAL, 0);
25772578
}
2578-
2579+
25792580
public void setRepairedPlacementPolicyNotAdheringBookieEnable(boolean enabled) {
25802581
setProperty(REPAIRED_PLACEMENT_POLICY_NOT_ADHERING_BOOKIE_ENABLED, enabled);
25812582
}
2582-
2583+
25832584
public boolean getRepairedPlacementPolicyNotAdheringBookieEnable() {
25842585
return getBoolean(REPAIRED_PLACEMENT_POLICY_NOT_ADHERING_BOOKIE_ENABLED, false);
25852586
}

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -385,16 +385,13 @@ public void processResult(int rc, String path, Object ctx) {
385385
return promise;
386386
}
387387

388-
//thread 2 registerLedgerMetadataListener (1, watcher2)
389-
//thread 3 register (1, watcher3)
390388
@Override
391389
public void registerLedgerMetadataListener(long ledgerId, LedgerMetadataListener listener) {
392390
if (null != listener) {
393391
if (LOG.isDebugEnabled()) {
394392
LOG.debug("Registered ledger metadata listener {} on ledger {}.", listener, ledgerId);
395393
}
396394
Set<LedgerMetadataListener> listenerSet = listeners.get(ledgerId);
397-
//set(watcher1, watcher2)
398395
if (listenerSet == null) {
399396
Set<LedgerMetadataListener> newListenerSet = new HashSet<LedgerMetadataListener>();
400397
Set<LedgerMetadataListener> oldListenerSet = listeners.putIfAbsent(ledgerId, newListenerSet);
@@ -404,37 +401,26 @@ public void registerLedgerMetadataListener(long ledgerId, LedgerMetadataListener
404401
listenerSet = newListenerSet;
405402
}
406403
}
407-
//set(watcher 2)
408404
synchronized (listenerSet) {
409405
listenerSet = listeners.computeIfAbsent(ledgerId, k -> new HashSet<>());
410406
listenerSet.add(listener);
411407
}
412408
new ReadLedgerMetadataTask(ledgerId).run();
413409
}
414410
}
415-
416-
//1 -> set(watcher 2)
417411

418-
//1 -> set<watcher 1>
419-
//thread 1 unregisterLedgerMetadataListener (1, watcher1)
420412
@Override
421413
public void unregisterLedgerMetadataListener(long ledgerId, LedgerMetadataListener listener) {
422414
Set<LedgerMetadataListener> listenerSet = listeners.get(ledgerId);
423-
//set(watcher1)
424415
if (listenerSet != null) {
425-
//set(watcher1, watcher2)
426-
427416
synchronized (listenerSet) {
428417
if (listenerSet.remove(listener)) {
429418
if (LOG.isDebugEnabled()) {
430419
LOG.debug("Unregistered ledger metadata listener {} on ledger {}.", listener, ledgerId);
431420
}
432421
}
433-
//set()
434422
if (listenerSet.isEmpty()) {
435423
listeners.remove(ledgerId, listenerSet);
436-
//1 -> set()
437-
//listeners empty map
438424
}
439425
}
440426
}

‎bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,8 @@ public void process(Long ledgerId, AsyncCallback.VoidCallback iterCallback) {
14511451
Collections.emptyList()).whenComplete((res, e) -> {
14521452
if (e != null) {
14531453
LOG.error("For ledger: {}, the placement policy not adhering bookie "
1454-
+ "storage, mark it to under replication manager failed.", ledgerId, e);
1454+
+ "storage, mark it to under replication manager failed.",
1455+
ledgerId, e);
14551456
return;
14561457
}
14571458
if (LOG.isDebugEnabled()) {

0 commit comments

Comments
 (0)