Skip to content

[POOL-432] Guard monitor recovery when no adder exists #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dajiaohuang wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −2
Open

[POOL-432] Guard monitor recovery when no adder exists #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/org/apache/commons/pool3/impl/ResilientPooledObjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,10 @@ protected void runChecks() {
// Kill adder thread and set up to true
upStart = Instant.now();
up = true;
adder.kill();
adder = null;
if (adder != null) {
adder.kill();
adder = null;
}
}
}

Expand Down
26 changes: 26 additions & 0 deletions src/test/java/org/apache/commons/pool3/impl/TestResilientPooledObjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
*/
package org.apache.commons.pool3.impl;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.time.Duration;
Expand Down Expand Up @@ -257,6 +259,30 @@ public void run() {
assertFalse(rf.isMonitorRunning());
}

@Test
void testRecoveryWithoutAdderDoesNotThrowWhenFactoryComesBackUp() throws Exception {
final FailingFactory ff = new FailingFactory();
ff.setSilentFail(false);
final ResilientPooledObjectFactory<String, Exception> rf = new ResilientPooledObjectFactory<>(ff,
2, Duration.ofMillis(10), Duration.ofMinutes(10), Duration.ofMillis(10));
final GenericObjectPool<String, Exception> pool = new GenericObjectPool<>(rf);
rf.setPool(pool);

ff.crash();
assertThrows(Exception.class, rf::makeObject);
rf.runChecks();
assertFalse(rf.isUp());
assertFalse(rf.isAdderRunning());

ff.recover();
rf.makeObject();
rf.makeObject();
assertDoesNotThrow(rf::runChecks);
assertTrue(rf.isUp());
assertFalse(rf.isAdderRunning());
pool.close();
}

@Test
void testTransientFailure() throws Exception {
final FailingFactory ff = new FailingFactory();
Expand Down