Skip to content

Commit df823a2

Browse files
horizonzyhorizonzy
authored
Close the RegistrationManager in the finally block in AuditorPlacementPolicyCheckTest. (#4080)
1 parent f6f1623 commit df823a2

File tree

1 file changed

+50
-51
lines changed

1 file changed

+50
-51
lines changed

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

+50-51
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,13 @@ public void testPlacementPolicyCheckWithBookiesFromDifferentRacks() throws Excep
101101
int numOfBookies = 5;
102102
List<BookieId> bookieAddresses = new ArrayList<>();
103103
BookieSocketAddress bookieAddress;
104-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
105-
// all the numOfBookies (5) are going to be in different racks
106-
for (int i = 0; i < numOfBookies; i++) {
107-
bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
108-
StaticDNSResolver.addNodeToRack(bookieAddress.getHostName(), "/rack" + (i));
109-
bookieAddresses.add(bookieAddress.toBookieId());
110-
regManager.registerBookie(bookieAddress.toBookieId(), false, BookieServiceInfo.EMPTY);
111-
}
104+
RegistrationManager regManager = driver.createRegistrationManager();
105+
// all the numOfBookies (5) are going to be in different racks
106+
for (int i = 0; i < numOfBookies; i++) {
107+
bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
108+
StaticDNSResolver.addNodeToRack(bookieAddress.getHostName(), "/rack" + (i));
109+
bookieAddresses.add(bookieAddress.toBookieId());
110+
regManager.registerBookie(bookieAddress.toBookieId(), false, BookieServiceInfo.EMPTY);
112111
}
113112

114113
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
@@ -208,6 +207,7 @@ public void testPlacementPolicyCheckWithBookiesFromDifferentRacks() throws Excep
208207
if (auditor != null) {
209208
auditor.close();
210209
}
210+
regManager.close();
211211
}
212212
}
213213

@@ -216,12 +216,11 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicy() th
216216
int numOfBookies = 5;
217217
int numOfLedgersNotAdheringToPlacementPolicy = 0;
218218
List<BookieId> bookieAddresses = new ArrayList<>();
219-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
220-
for (int i = 0; i < numOfBookies; i++) {
221-
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
222-
bookieAddresses.add(bookieAddress);
223-
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
224-
}
219+
RegistrationManager regManager = driver.createRegistrationManager();
220+
for (int i = 0; i < numOfBookies; i++) {
221+
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
222+
bookieAddresses.add(bookieAddress);
223+
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
225224
}
226225

227226
// only three racks
@@ -291,6 +290,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicy() th
291290
if (auditor != null) {
292291
auditor.close();
293292
}
293+
regManager.close();
294294
}
295295
}
296296

@@ -300,12 +300,11 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndNo
300300
int numOfBookies = 5;
301301
int numOfLedgersNotAdheringToPlacementPolicy = 0;
302302
List<BookieId> bookieAddresses = new ArrayList<>();
303-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
304-
for (int i = 0; i < numOfBookies; i++) {
305-
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
306-
bookieAddresses.add(bookieAddress);
307-
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
308-
}
303+
RegistrationManager regManager = driver.createRegistrationManager();
304+
for (int i = 0; i < numOfBookies; i++) {
305+
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
306+
bookieAddresses.add(bookieAddress);
307+
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
309308
}
310309

311310
// only three racks
@@ -372,12 +371,11 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndMa
372371
int numOfBookies = 5;
373372
int numOfLedgersNotAdheringToPlacementPolicy = 0;
374373
List<BookieId> bookieAddresses = new ArrayList<>();
375-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
376-
for (int i = 0; i < numOfBookies; i++) {
377-
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
378-
bookieAddresses.add(bookieAddress);
379-
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
380-
}
374+
RegistrationManager regManager = driver.createRegistrationManager();
375+
for (int i = 0; i < numOfBookies; i++) {
376+
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
377+
bookieAddresses.add(bookieAddress);
378+
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
381379
}
382380

383381
// only three racks
@@ -433,6 +431,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicyAndMa
433431
if (auditor != null) {
434432
auditor.close();
435433
}
434+
regManager.close();
436435
}
437436
LedgerUnderreplicationManager underreplicationManager = mFactory.newLedgerUnderreplicationManager();
438437
long unnderReplicateLedgerId = underreplicationManager.pollLedgerToRereplicate();
@@ -458,12 +457,11 @@ public void testPlacementPolicyCheckWithURLedgers(boolean timeElapsed) throws Ex
458457
int underreplicatedLedgerRecoveryGracePeriod = timeElapsed ? 1 : 1000;
459458
int numOfURLedgersElapsedRecoveryGracePeriod = 0;
460459
List<BookieId> bookieAddresses = new ArrayList<BookieId>();
461-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
462-
for (int i = 0; i < numOfBookies; i++) {
463-
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
464-
bookieAddresses.add(bookieAddress);
465-
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
466-
}
460+
RegistrationManager regManager = driver.createRegistrationManager();
461+
for (int i = 0; i < numOfBookies; i++) {
462+
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
463+
bookieAddresses.add(bookieAddress);
464+
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
467465
}
468466

469467
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
@@ -569,6 +567,7 @@ public void testPlacementPolicyCheckWithURLedgers(boolean timeElapsed) throws Ex
569567
if (auditor != null) {
570568
auditor.close();
571569
}
570+
regManager.close();
572571
}
573572
}
574573

@@ -577,12 +576,11 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPolicyWithMultipleSe
577576
int numOfBookies = 7;
578577
int numOfLedgersNotAdheringToPlacementPolicy = 0;
579578
List<BookieId> bookieAddresses = new ArrayList<>();
580-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
581-
for (int i = 0; i < numOfBookies; i++) {
582-
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
583-
bookieAddresses.add(bookieAddress);
584-
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
585-
}
579+
RegistrationManager regManager = driver.createRegistrationManager();
580+
for (int i = 0; i < numOfBookies; i++) {
581+
BookieId bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181).toBookieId();
582+
bookieAddresses.add(bookieAddress);
583+
regManager.registerBookie(bookieAddress, false, BookieServiceInfo.EMPTY);
586584
}
587585

588586
// only three racks
@@ -673,6 +671,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPolicyWithMultipleSe
673671
if (auditor != null) {
674672
auditor.close();
675673
}
674+
regManager.close();
676675
}
677676
}
678677

@@ -682,19 +681,18 @@ public void testZoneawarePlacementPolicyCheck() throws Exception {
682681
int numOfLedgersNotAdheringToPlacementPolicy = 0;
683682
int numOfLedgersSoftlyAdheringToPlacementPolicy = 0;
684683
List<BookieId> bookieAddresses = new ArrayList<BookieId>();
685-
try (RegistrationManager regManager = driver.createRegistrationManager()) {
686-
/*
687-
* 6 bookies - 3 zones and 2 uds
688-
*/
689-
for (int i = 0; i < numOfBookies; i++) {
690-
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
691-
bookieAddresses.add(bookieAddress.toBookieId());
692-
regManager.registerBookie(bookieAddress.toBookieId(), false, BookieServiceInfo.EMPTY);
693-
String zone = "/zone" + (i % 3);
694-
String upgradeDomain = "/ud" + (i % 2);
695-
String networkLocation = zone + upgradeDomain;
696-
StaticDNSResolver.addNodeToRack(bookieAddress.getHostName(), networkLocation);
697-
}
684+
RegistrationManager regManager = driver.createRegistrationManager();
685+
/*
686+
* 6 bookies - 3 zones and 2 uds
687+
*/
688+
for (int i = 0; i < numOfBookies; i++) {
689+
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
690+
bookieAddresses.add(bookieAddress.toBookieId());
691+
regManager.registerBookie(bookieAddress.toBookieId(), false, BookieServiceInfo.EMPTY);
692+
String zone = "/zone" + (i % 3);
693+
String upgradeDomain = "/ud" + (i % 2);
694+
String networkLocation = zone + upgradeDomain;
695+
StaticDNSResolver.addNodeToRack(bookieAddress.getHostName(), networkLocation);
698696
}
699697

700698
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
@@ -800,6 +798,7 @@ public void testZoneawarePlacementPolicyCheck() throws Exception {
800798
if (auditor != null) {
801799
auditor.close();
802800
}
801+
regManager.close();
803802
}
804803
}
805804

0 commit comments

Comments
 (0)