Skip to content

Commit 64bc687

Browse files
horizonzyhorizonzy
committed
fix checkstyle.
1 parent 3de801e commit 64bc687

File tree

6 files changed

+37
-31
lines changed

6 files changed

+37
-31
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ public String toString() {
233233
getFirstStoredEntryId(), lastKnownEntryId, getLastStoredEntryId(),
234234
getAddresses(), isLedgerClosed);
235235
}
236-
236+
237237
/**
238-
* ReplicateType
238+
* ReplicateType.
239239
*/
240240
public enum ReplicateType {
241241
DATA_LOSS,

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,9 @@ public Map<Integer, BookieId> replaceNotAdheringPlacementPolicyBookie(List<Booki
856856
return targetBookieAddresses;
857857
}
858858

859-
private void doReplaceNotAdhering(Map<String, List<BookieNode>> toPlaceGroup, Map<String, List<BookieNode>> knowsGroup,
860-
Map<Integer, BookieId> targetBookieAddresses, Map<BookieId, Integer> bookieIndex) {
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
}
@@ -883,15 +884,17 @@ private void doReplaceNotAdhering(Map<String, List<BookieNode>> toPlaceGroup, Ma
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());
889891

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();

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ private Set<LedgerFragment> getNeedRepairedPlacementNotAdheringFragments(LedgerH
424424
}
425425
return placementNotAdheringFragments;
426426
}
427-
427+
428428
@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
429429
private boolean rereplicate(long ledgerIdToReplicate) throws InterruptedException, BKException,
430430
UnavailableException {
@@ -583,12 +583,13 @@ private Set<LedgerFragment> getUnderreplicatedFragments(LedgerHandle lh, Long le
583583
return underreplicatedFragments;
584584
}
585585

586-
private Set<LedgerFragment> getDataLossFragments(LedgerHandle lh, Long ledgerVerificationPercentage) throws InterruptedException {
586+
private Set<LedgerFragment> getDataLossFragments(LedgerHandle lh, Long ledgerVerificationPercentage)
587+
throws InterruptedException {
587588
CheckerCallback checkerCb = new CheckerCallback();
588589
ledgerChecker.checkLedger(lh, checkerCb, ledgerVerificationPercentage);
589590
return checkerCb.waitAndGetResult();
590591
}
591-
592+
592593
private boolean checkFragmentRepeat(Set<LedgerFragment> fragments, LedgerFragment needChecked) {
593594
for (LedgerFragment fragment : fragments) {
594595
if (fragment.getLedgerId() == needChecked.getLedgerId()
@@ -599,7 +600,7 @@ private boolean checkFragmentRepeat(Set<LedgerFragment> fragments, LedgerFragmen
599600
}
600601
return false;
601602
}
602-
603+
603604
void scheduleTaskWithDelay(TimerTask timerTask, long delayPeriod) {
604605
pendingReplicationTimer.schedule(timerTask, delayPeriod);
605606
}

‎bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,8 @@ public void testReplaceNotAdheringPlacementPolicyBookie() throws Exception {
14641464
knowsEnsemble, writeQuorum, ackQuorum);
14651465
assertEquals(placementPolicyAdherence, PlacementPolicyAdherence.FAIL);
14661466

1467-
Map<Integer, BookieId> targetBookie = repp.replaceNotAdheringPlacementPolicyBookie(knowsEnsemble, ackQuorum, writeQuorum);
1467+
Map<Integer, BookieId> targetBookie =
1468+
repp.replaceNotAdheringPlacementPolicyBookie(knowsEnsemble, ackQuorum, writeQuorum);
14681469
//should replace two bookie
14691470
assertEquals(targetBookie.size(), 2);
14701471

@@ -1561,7 +1562,8 @@ public void testReplaceNotAdheringPlacementPolicyBookieWithNoMoreRackBookie() th
15611562
knowsEnsemble, writeQuorum, ackQuorum);
15621563
assertEquals(placementPolicyAdherence, PlacementPolicyAdherence.FAIL);
15631564

1564-
Map<Integer, BookieId> targetBookie = repp.replaceNotAdheringPlacementPolicyBookie(knowsEnsemble, ackQuorum, writeQuorum);
1565+
Map<Integer, BookieId> targetBookie =
1566+
repp.replaceNotAdheringPlacementPolicyBookie(knowsEnsemble, ackQuorum, writeQuorum);
15651567
//should not replace
15661568
assertEquals(targetBookie.size(), 0);
15671569

‎bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,10 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicy() th
292292
}
293293
}
294294
}
295-
295+
296296
@Test
297-
public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNotMarkToUnderreplication() throws Exception {
297+
public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNotMarkToUnderreplication()
298+
throws Exception {
298299
int numOfBookies = 5;
299300
int numOfLedgersNotAdheringToPlacementPolicy = 0;
300301
List<BookieId> bookieAddresses = new ArrayList<>();
@@ -305,21 +306,21 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNo
305306
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
306307
}
307308
}
308-
309+
309310
// only three racks
310311
StaticDNSResolver.addNodeToRack("98.98.98.0", "/rack1");
311312
StaticDNSResolver.addNodeToRack("98.98.98.1", "/rack2");
312313
StaticDNSResolver.addNodeToRack("98.98.98.2", "/rack3");
313314
StaticDNSResolver.addNodeToRack("98.98.98.3", "/rack1");
314315
StaticDNSResolver.addNodeToRack("98.98.98.4", "/rack2");
315-
316+
316317
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
317318
LedgerManager lm = mFactory.newLedgerManager();
318319
int ensembleSize = 5;
319320
int writeQuorumSize = 3;
320321
int ackQuorumSize = 2;
321322
int minNumRacksPerWriteQuorumConfValue = 3;
322-
323+
323324
/*
324325
* this closed ledger doesn't adhere to placement policy because there are only
325326
* 3 racks, and the ensembleSize is 5.
@@ -338,7 +339,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNo
338339
.build();
339340
lm.createLedgerMetadata(1L, initMeta).get();
340341
numOfLedgersNotAdheringToPlacementPolicy++;
341-
342+
342343
ServerConfiguration servConf = new ServerConfiguration(confByIndex(0));
343344
servConf.setMinNumRacksPerWriteQuorum(minNumRacksPerWriteQuorumConfValue);
344345
setServerConfigPropertiesForRackPlacement(servConf);
@@ -363,7 +364,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNo
363364
long unnderReplicateLedgerId = underreplicationManager.pollLedgerToRereplicate();
364365
assertEquals(unnderReplicateLedgerId, -1);
365366
}
366-
367+
367368
@Test
368369
public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndMarkToUnderreplication() throws Exception {
369370
int numOfBookies = 5;
@@ -376,21 +377,21 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndMa
376377
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
377378
}
378379
}
379-
380+
380381
// only three racks
381382
StaticDNSResolver.addNodeToRack("98.98.98.0", "/rack1");
382383
StaticDNSResolver.addNodeToRack("98.98.98.1", "/rack2");
383384
StaticDNSResolver.addNodeToRack("98.98.98.2", "/rack3");
384385
StaticDNSResolver.addNodeToRack("98.98.98.3", "/rack1");
385386
StaticDNSResolver.addNodeToRack("98.98.98.4", "/rack2");
386-
387+
387388
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
388389
LedgerManager lm = mFactory.newLedgerManager();
389390
int ensembleSize = 5;
390391
int writeQuorumSize = 3;
391392
int ackQuorumSize = 2;
392393
int minNumRacksPerWriteQuorumConfValue = 3;
393-
394+
394395
/*
395396
* this closed ledger doesn't adhere to placement policy because there are only
396397
* 3 racks, and the ensembleSize is 5.
@@ -409,7 +410,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndMa
409410
.build();
410411
lm.createLedgerMetadata(1L, initMeta).get();
411412
numOfLedgersNotAdheringToPlacementPolicy++;
412-
413+
413414
ServerConfiguration servConf = new ServerConfiguration(confByIndex(0));
414415
servConf.setMinNumRacksPerWriteQuorum(minNumRacksPerWriteQuorumConfValue);
415416
servConf.setRepairedPlacementPolicyNotAdheringBookieEnable(true);

‎bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,8 +1115,8 @@ public void testRepairedNotAdheringPlacementPolicyLedgerFragmentsWithNoMoreRackB
11151115
protected EnsemblePlacementPolicy initializeEnsemblePlacementPolicy(ClientConfiguration conf,
11161116
DNSToSwitchMapping dnsResolver, HashedWheelTimer timer, FeatureProvider featureProvider,
11171117
StatsLogger statsLogger, BookieAddressResolver bookieAddressResolver) throws IOException {
1118-
RackawareEnsemblePlacementPolicy rackawareEnsemblePlacementPolicy
1119-
= new RackawareEnsemblePlacementPolicy() {
1118+
RackawareEnsemblePlacementPolicy rackawareEnsemblePlacementPolicy =
1119+
new RackawareEnsemblePlacementPolicy() {
11201120
@Override
11211121
public String resolveNetworkLocation(BookieId addr) {
11221122
//The first five bookie is /rack1
@@ -1135,7 +1135,7 @@ public String resolveNetworkLocation(BookieId addr) {
11351135

11361136
//This ledger not adhering placement policy, the combine(0,1,2) rack is 1.
11371137
LedgerHandle lh = bkc.createLedger(3, 3, 3, BookKeeper.DigestType.CRC32, TESTPASSWD);
1138-
1138+
11391139
int entrySize = 10;
11401140
for (int i = 0; i < entrySize; i++) {
11411141
lh.addEntry(data);
@@ -1176,8 +1176,8 @@ public String resolveNetworkLocation(BookieId addr) {
11761176
protected EnsemblePlacementPolicy initializeEnsemblePlacementPolicy(ClientConfiguration conf,
11771177
DNSToSwitchMapping dnsResolver, HashedWheelTimer timer, FeatureProvider featureProvider,
11781178
StatsLogger statsLogger, BookieAddressResolver bookieAddressResolver) throws IOException {
1179-
RackawareEnsemblePlacementPolicy rackawareEnsemblePlacementPolicy
1180-
= new RackawareEnsemblePlacementPolicy() {
1179+
RackawareEnsemblePlacementPolicy rackawareEnsemblePlacementPolicy =
1180+
new RackawareEnsemblePlacementPolicy() {
11811181
@Override
11821182
public String resolveNetworkLocation(BookieId addr) {
11831183
//The first five bookie is /rack1
@@ -1232,7 +1232,7 @@ private TestStatsLogger startAuditorAndWaitForPlacementPolicyCheck(ServerConfigu
12321232
TestStatsProvider.TestOpStatsLogger placementPolicyCheckStatsLogger =
12331233
(TestStatsProvider.TestOpStatsLogger) statsLogger
12341234
.getOpStatsLogger(ReplicationStats.PLACEMENT_POLICY_CHECK_TIME);
1235-
1235+
12361236
final AuditorPeriodicCheckTest.TestAuditor auditor = new AuditorPeriodicCheckTest.TestAuditor(
12371237
BookieImpl.getBookieId(servConf).toString(), servConf, bkc, false, statsLogger);
12381238
auditorRef.setValue(auditor);
@@ -1256,5 +1256,4 @@ private TestStatsLogger startAuditorAndWaitForPlacementPolicyCheck(ServerConfigu
12561256
placementPolicyCheckStatsLogger.getSuccessCount());
12571257
return statsLogger;
12581258
}
1259-
12601259
}

0 commit comments

Comments
 (0)