Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11373 Silence lock acquisition failures on remote nodes 

(cherry picked from commit 69ba7a50ce)
This commit is contained in:
Radim Vansa 2017-01-06 18:14:39 +01:00 committed by Gail Badner
parent b0040eb3bb
commit 46898c928a
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/LockingInterceptor.java vendored
View File

@ -7,8 +7,12 @@
package org.hibernate.cache.infinispan.access;
import org.infinispan.commands.write.DataWriteCommand;
import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
import org.infinispan.interceptors.locking.NonTransactionalLockingInterceptor;
import org.infinispan.util.concurrent.TimeoutException;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
@ -27,6 +31,9 @@ import java.util.concurrent.CompletionException;
* {@link CompletableFuture} and we'll wait for it here.
*/
public class LockingInterceptor extends NonTransactionalLockingInterceptor {
private static final Log log = LogFactory.getLog(LockingInterceptor.class);
private static final boolean trace = log.isTraceEnabled();
@Override
protected Object visitDataWriteCommand(InvocationContext ctx, DataWriteCommand command) throws Throwable {
Object returnValue = null;
@ -39,6 +46,19 @@ public class LockingInterceptor extends NonTransactionalLockingInterceptor {
returnValue = invokeNextInterceptor(ctx, command);
return returnValue;
}
catch (TimeoutException e) {
if (!ctx.isOriginLocal() && command.hasFlag(Flag.ZERO_LOCK_ACQUISITION_TIMEOUT)) {
// FAIL_SILENTLY flag is not replicated to remote nodes and zero acquisition timeouts cause
// very noisy logs.
if (trace) {
log.tracef("Silently ignoring exception", e);
}
return null;
}
else {
throw e;
}
}
finally {
lockManager.unlockAll(ctx);
if (returnValue instanceof CompletableFuture) {

21
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ExpectingInterceptor.java vendored
View File

@ -38,17 +38,23 @@ public class ExpectingInterceptor extends BaseCustomInterceptor {
}
public synchronized Condition when(BiPredicate<InvocationContext, VisitableCommand> predicate) {
Condition condition = new Condition(predicate, null);
Condition condition = new Condition(predicate, source(), null);
conditions.add(condition);
return condition;
}
public synchronized Condition whenFails(BiPredicate<InvocationContext, VisitableCommand> predicate) {
Condition condition = new Condition(predicate, Boolean.FALSE);
Condition condition = new Condition(predicate, source(), Boolean.FALSE);
conditions.add(condition);
return condition;
}
private static String source() {
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
StackTraceElement ste = stackTrace[3];
return ste.getFileName() + ":" + ste.getLineNumber();
}
@Override
protected Object handleDefault(InvocationContext ctx, VisitableCommand command) throws Throwable {
boolean succeeded = false;
@ -64,7 +70,9 @@ public class ExpectingInterceptor extends BaseCustomInterceptor {
for (Iterator<Condition> iterator = conditions.iterator(); iterator.hasNext(); ) {
Condition condition = iterator.next();
log.tracef("Testing condition %s", condition);
if ((condition.success == null || condition.success == succeeded) && condition.predicate.test(ctx, command)) {
if (condition.success != null && condition.success != succeeded) {
log.trace("Condition test failed, succeeded: " + succeeded);
} else if (condition.predicate.test(ctx, command)) {
assert condition.action != null;
log.trace("Condition succeeded");
toExecute.add(condition.action);
@ -86,12 +94,14 @@ public class ExpectingInterceptor extends BaseCustomInterceptor {
public class Condition {
private final BiPredicate<InvocationContext, VisitableCommand> predicate;
private final String source;
private final Boolean success;
private BooleanSupplier removeCheck;
private Runnable action;
public Condition(BiPredicate<InvocationContext, VisitableCommand> predicate, Boolean success) {
public Condition(BiPredicate<InvocationContext, VisitableCommand> predicate, String source, Boolean success) {
this.predicate = predicate;
this.source = source;
this.success = success;
}
@ -120,7 +130,8 @@ public class ExpectingInterceptor extends BaseCustomInterceptor {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("Condition{");
sb.append("predicate=").append(predicate);
sb.append("source=").append(source);
sb.append(", predicate=").append(predicate);
sb.append(", success=").append(success);
sb.append(", action=").append(action);
sb.append('}');