Skip to content

Commit

Permalink
More on RaftLock operation timeout fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@metanet @mdogan
metanet authored and mdogan committed Feb 1, 2019
1 parent fdd134c commit a871011
Show file tree
Hide file tree
Showing 13 changed files with 210 additions and 139 deletions.
4 changes: 2 additions & 2 deletions ...lcast-raft-client/src/main/java/com/hazelcast/raft/service/lock/client/RaftLockProxy.java
View file
Expand Up @@ -30,7 +30,7 @@
import com.hazelcast.raft.impl.RaftGroupIdImpl; import com.hazelcast.raft.impl.RaftGroupIdImpl;
import com.hazelcast.raft.impl.session.SessionExpiredException; import com.hazelcast.raft.impl.session.SessionExpiredException;
import com.hazelcast.raft.service.lock.RaftLockService; import com.hazelcast.raft.service.lock.RaftLockService;
import com.hazelcast.raft.service.lock.exception.LockRequestCancelledException; import com.hazelcast.raft.service.exception.WaitKeyCancelledException;
import com.hazelcast.raft.service.session.SessionAwareProxy; import com.hazelcast.raft.service.session.SessionAwareProxy;
import com.hazelcast.raft.service.session.SessionManagerProvider; import com.hazelcast.raft.service.session.SessionManagerProvider;
import com.hazelcast.spi.InternalCompletableFuture; import com.hazelcast.spi.InternalCompletableFuture;
Expand Down Expand Up @@ -133,7 +133,7 @@ public boolean tryLock(long time, TimeUnit unit) {
releaseSession(sessionId); releaseSession(sessionId);
} }
return locked; return locked;
} catch (LockRequestCancelledException e) { } catch (WaitKeyCancelledException e) {
return false; return false;
} catch (SessionExpiredException e) { } catch (SessionExpiredException e) {
invalidateSession(sessionId); invalidateSession(sessionId);
Expand Down
4 changes: 2 additions & 2 deletions ...t/src/test/java/com/hazelcast/raft/service/lock/client/RaftFencedLockClientBasicTest.java
View file
Expand Up @@ -6,7 +6,7 @@
import com.hazelcast.raft.impl.session.SessionExpiredException; import com.hazelcast.raft.impl.session.SessionExpiredException;
import com.hazelcast.raft.service.lock.FencedLock; import com.hazelcast.raft.service.lock.FencedLock;
import com.hazelcast.raft.service.lock.RaftFencedLockBasicTest; import com.hazelcast.raft.service.lock.RaftFencedLockBasicTest;
import com.hazelcast.raft.service.lock.exception.LockRequestCancelledException; import com.hazelcast.raft.service.exception.WaitKeyCancelledException;
import com.hazelcast.raft.service.session.AbstractSessionManager; import com.hazelcast.raft.service.session.AbstractSessionManager;
import com.hazelcast.raft.service.session.SessionManagerProvider; import com.hazelcast.raft.service.session.SessionManagerProvider;
import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastSerialClassRunner;
Expand Down Expand Up @@ -34,7 +34,7 @@ protected HazelcastInstance[] createInstances() {
lockInstance = f.newHazelcastClient(); lockInstance = f.newHazelcastClient();
HazelcastClientInstanceImpl client = getClient(lockInstance); HazelcastClientInstanceImpl client = getClient(lockInstance);
SessionExpiredException.register(client.getClientExceptionFactory()); SessionExpiredException.register(client.getClientExceptionFactory());
LockRequestCancelledException.register(client.getClientExceptionFactory()); WaitKeyCancelledException.register(client.getClientExceptionFactory());
return instances; return instances;
} }


Expand Down
4 changes: 2 additions & 2 deletions ...-client/src/test/java/com/hazelcast/raft/service/lock/client/RaftLockClientBasicTest.java
View file
Expand Up @@ -6,7 +6,7 @@
import com.hazelcast.raft.RaftGroupId; import com.hazelcast.raft.RaftGroupId;
import com.hazelcast.raft.impl.session.SessionExpiredException; import com.hazelcast.raft.impl.session.SessionExpiredException;
import com.hazelcast.raft.service.lock.RaftLockBasicTest; import com.hazelcast.raft.service.lock.RaftLockBasicTest;
import com.hazelcast.raft.service.lock.exception.LockRequestCancelledException; import com.hazelcast.raft.service.exception.WaitKeyCancelledException;
import com.hazelcast.raft.service.session.AbstractSessionManager; import com.hazelcast.raft.service.session.AbstractSessionManager;
import com.hazelcast.raft.service.session.SessionManagerProvider; import com.hazelcast.raft.service.session.SessionManagerProvider;
import com.hazelcast.test.HazelcastSerialClassRunner; import com.hazelcast.test.HazelcastSerialClassRunner;
Expand Down Expand Up @@ -36,7 +36,7 @@ protected HazelcastInstance[] createInstances() {
TestHazelcastFactory f = (TestHazelcastFactory) factory; TestHazelcastFactory f = (TestHazelcastFactory) factory;
client = f.newHazelcastClient(); client = f.newHazelcastClient();
SessionExpiredException.register(getClient(client).getClientExceptionFactory()); SessionExpiredException.register(getClient(client).getClientExceptionFactory());
LockRequestCancelledException.register(getClient(client).getClientExceptionFactory()); WaitKeyCancelledException.register(getClient(client).getClientExceptionFactory());
return instances; return instances;
} }


Expand Down
22 changes: 11 additions & 11 deletions ...rvices/src/main/java/com/hazelcast/raft/service/atomiclong/proxy/RaftAtomicLongProxy.java
View file
Expand Up @@ -50,12 +50,12 @@ public class RaftAtomicLongProxy implements IAtomicLong {


private final String name; private final String name;
private final RaftGroupId groupId; private final RaftGroupId groupId;
private final RaftInvocationManager raftInvocationManager; private final RaftInvocationManager invocationManager;


public RaftAtomicLongProxy(RaftInvocationManager invocationManager, RaftGroupId groupId, String name) { public RaftAtomicLongProxy(RaftInvocationManager invocationManager, RaftGroupId groupId, String name) {
this.name = name; this.name = name;
this.groupId = groupId; this.groupId = groupId;
this.raftInvocationManager = invocationManager; this.invocationManager = invocationManager;
} }


@Override @Override
Expand Down Expand Up @@ -105,7 +105,7 @@ public void set(long newValue) {


@Override @Override
public InternalCompletableFuture<Long> addAndGetAsync(final long delta) { public InternalCompletableFuture<Long> addAndGetAsync(final long delta) {
return raftInvocationManager.invoke(groupId, new AddAndGetOp(name, delta)); return invocationManager.invoke(groupId, new AddAndGetOp(name, delta));
} }


@Override @Override
Expand All @@ -120,12 +120,12 @@ public InternalCompletableFuture<Long> decrementAndGetAsync() {


@Override @Override
public InternalCompletableFuture<Boolean> compareAndSetAsync(final long expect, final long update) { public InternalCompletableFuture<Boolean> compareAndSetAsync(final long expect, final long update) {
return raftInvocationManager.invoke(groupId, new CompareAndSetOp(name, expect, update)); return invocationManager.invoke(groupId, new CompareAndSetOp(name, expect, update));
} }


@Override @Override
public InternalCompletableFuture<Long> getAndAddAsync(final long delta) { public InternalCompletableFuture<Long> getAndAddAsync(final long delta) {
return raftInvocationManager.invoke(groupId, new GetAndAddOp(name, delta)); return invocationManager.invoke(groupId, new GetAndAddOp(name, delta));
} }


@Override @Override
Expand All @@ -140,7 +140,7 @@ public InternalCompletableFuture<Long> getAndIncrementAsync() {


@Override @Override
public InternalCompletableFuture<Long> getAndSetAsync(final long newValue) { public InternalCompletableFuture<Long> getAndSetAsync(final long newValue) {
return raftInvocationManager.invoke(groupId, new GetAndSetOp(name, newValue)); return invocationManager.invoke(groupId, new GetAndSetOp(name, newValue));
} }


@Override @Override
Expand Down Expand Up @@ -169,7 +169,7 @@ private long doAlter(IFunction<Long, Long> function, AlterResultType alterResult
} }


private InternalCompletableFuture<Long> doAlterAsync(IFunction<Long, Long> function, AlterResultType alterResultType) { private InternalCompletableFuture<Long> doAlterAsync(IFunction<Long, Long> function, AlterResultType alterResultType) {
return raftInvocationManager.invoke(groupId, new AlterOp(name, function, alterResultType)); return invocationManager.invoke(groupId, new AlterOp(name, function, alterResultType));
} }


@Override @Override
Expand All @@ -195,7 +195,7 @@ public InternalCompletableFuture<Long> getAndAlterAsync(IFunction<Long, Long> fu


@Override @Override
public <R> InternalCompletableFuture<R> applyAsync(final IFunction<Long, R> function) { public <R> InternalCompletableFuture<R> applyAsync(final IFunction<Long, R> function) {
return raftInvocationManager.invoke(groupId, new ApplyOp<R>(name, function)); return invocationManager.invoke(groupId, new ApplyOp<R>(name, function));
} }


public long localGet(QueryPolicy queryPolicy) { public long localGet(QueryPolicy queryPolicy) {
Expand All @@ -210,7 +210,7 @@ public long localGet(QueryPolicy queryPolicy) {
public ICompletableFuture<Long> localGetAsync(final QueryPolicy queryPolicy) { public ICompletableFuture<Long> localGetAsync(final QueryPolicy queryPolicy) {
final SimpleCompletableFuture<Long> resultFuture = new SimpleCompletableFuture<Long>(null, null); final SimpleCompletableFuture<Long> resultFuture = new SimpleCompletableFuture<Long>(null, null);
ICompletableFuture<Long> localFuture = ICompletableFuture<Long> localFuture =
raftInvocationManager.queryOnLocal(groupId, new LocalGetOp(name), queryPolicy); invocationManager.queryOnLocal(groupId, new LocalGetOp(name), queryPolicy);


localFuture.andThen(new ExecutionCallback<Long>() { localFuture.andThen(new ExecutionCallback<Long>() {
@Override @Override
Expand All @@ -220,7 +220,7 @@ public void onResponse(Long response) {


@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
ICompletableFuture<Long> future = raftInvocationManager.query(groupId, new LocalGetOp(name), queryPolicy); ICompletableFuture<Long> future = invocationManager.query(groupId, new LocalGetOp(name), queryPolicy);
future.andThen(new ExecutionCallback<Long>() { future.andThen(new ExecutionCallback<Long>() {
@Override @Override
public void onResponse(Long response) { public void onResponse(Long response) {
Expand Down Expand Up @@ -255,7 +255,7 @@ public String getServiceName() {


@Override @Override
public void destroy() { public void destroy() {
raftInvocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join(); invocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join();
} }


public RaftGroupId getGroupId() { public RaftGroupId getGroupId() {
Expand Down
24 changes: 12 additions & 12 deletions ...services/src/main/java/com/hazelcast/raft/service/atomicref/proxy/RaftAtomicRefProxy.java
View file
Expand Up @@ -43,14 +43,14 @@ public class RaftAtomicRefProxy<T> implements IAtomicReference<T> {


private final String name; private final String name;
private final RaftGroupId groupId; private final RaftGroupId groupId;
private final RaftInvocationManager raftInvocationManager; private final RaftInvocationManager invocationManager;
private final SerializationService serializationService; private final SerializationService serializationService;


public RaftAtomicRefProxy(RaftInvocationManager invocationManager, SerializationService serializationService, public RaftAtomicRefProxy(RaftInvocationManager invocationManager, SerializationService serializationService,
RaftGroupId groupId, String name) { RaftGroupId groupId, String name) {
this.name = name; this.name = name;
this.groupId = groupId; this.groupId = groupId;
this.raftInvocationManager = invocationManager; this.invocationManager = invocationManager;
this.serializationService = serializationService; this.serializationService = serializationService;
} }


Expand Down Expand Up @@ -117,22 +117,22 @@ public <R> R apply(IFunction<T, R> function) {


@Override @Override
public InternalCompletableFuture<Boolean> compareAndSetAsync(T expect, T update) { public InternalCompletableFuture<Boolean> compareAndSetAsync(T expect, T update) {
return raftInvocationManager.invoke(groupId, new CompareAndSetOp(name, toData(expect), toData(update))); return invocationManager.invoke(groupId, new CompareAndSetOp(name, toData(expect), toData(update)));
} }


@Override @Override
public InternalCompletableFuture<T> getAsync() { public InternalCompletableFuture<T> getAsync() {
return raftInvocationManager.invoke(groupId, new GetOp(name)); return invocationManager.invoke(groupId, new GetOp(name));
} }


@Override @Override
public InternalCompletableFuture<Void> setAsync(T newValue) { public InternalCompletableFuture<Void> setAsync(T newValue) {
return raftInvocationManager.invoke(groupId, new SetOp(name, toData(newValue), false)); return invocationManager.invoke(groupId, new SetOp(name, toData(newValue), false));
} }


@Override @Override
public InternalCompletableFuture<T> getAndSetAsync(T newValue) { public InternalCompletableFuture<T> getAndSetAsync(T newValue) {
return raftInvocationManager.invoke(groupId, new SetOp(name, toData(newValue), true)); return invocationManager.invoke(groupId, new SetOp(name, toData(newValue), true));
} }


@Override @Override
Expand All @@ -147,31 +147,31 @@ public InternalCompletableFuture<Void> clearAsync() {


@Override @Override
public InternalCompletableFuture<Boolean> containsAsync(T expected) { public InternalCompletableFuture<Boolean> containsAsync(T expected) {
return raftInvocationManager.invoke(groupId, new ContainsOp(name, toData(expected))); return invocationManager.invoke(groupId, new ContainsOp(name, toData(expected)));
} }


@Override @Override
public InternalCompletableFuture<Void> alterAsync(IFunction<T, T> function) { public InternalCompletableFuture<Void> alterAsync(IFunction<T, T> function) {
checkTrue(function != null, "Function cannot be null"); checkTrue(function != null, "Function cannot be null");
return raftInvocationManager.invoke(groupId, new ApplyOp(name, toData(function), NO_RETURN_VALUE, true)); return invocationManager.invoke(groupId, new ApplyOp(name, toData(function), NO_RETURN_VALUE, true));
} }


@Override @Override
public InternalCompletableFuture<T> alterAndGetAsync(IFunction<T, T> function) { public InternalCompletableFuture<T> alterAndGetAsync(IFunction<T, T> function) {
checkTrue(function != null, "Function cannot be null"); checkTrue(function != null, "Function cannot be null");
return raftInvocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_NEW_VALUE, true)); return invocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_NEW_VALUE, true));
} }


@Override @Override
public InternalCompletableFuture<T> getAndAlterAsync(IFunction<T, T> function) { public InternalCompletableFuture<T> getAndAlterAsync(IFunction<T, T> function) {
checkTrue(function != null, "Function cannot be null"); checkTrue(function != null, "Function cannot be null");
return raftInvocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_OLD_VALUE, true)); return invocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_OLD_VALUE, true));
} }


@Override @Override
public <R> InternalCompletableFuture<R> applyAsync(IFunction<T, R> function) { public <R> InternalCompletableFuture<R> applyAsync(IFunction<T, R> function) {
checkTrue(function != null, "Function cannot be null"); checkTrue(function != null, "Function cannot be null");
return raftInvocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_NEW_VALUE, false)); return invocationManager.invoke(groupId, new ApplyOp(name, toData(function), RETURN_NEW_VALUE, false));
} }


@Override @Override
Expand All @@ -191,7 +191,7 @@ public String getServiceName() {


@Override @Override
public void destroy() { public void destroy() {
raftInvocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join(); invocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join();
} }


public RaftGroupId getGroupId() { public RaftGroupId getGroupId() {
Expand Down
16 changes: 8 additions & 8 deletions ...rc/main/java/com/hazelcast/raft/service/countdownlatch/proxy/RaftCountDownLatchProxy.java
View file
Expand Up @@ -39,10 +39,10 @@ public class RaftCountDownLatchProxy implements ICountDownLatch {


private final RaftGroupId groupId; private final RaftGroupId groupId;
private final String name; private final String name;
private final RaftInvocationManager raftInvocationManager; private final RaftInvocationManager invocationManager;


public RaftCountDownLatchProxy(RaftInvocationManager invocationManager, RaftGroupId groupId, String name) { public RaftCountDownLatchProxy(RaftInvocationManager invocationManager, RaftGroupId groupId, String name) {
this.raftInvocationManager = invocationManager; this.invocationManager = invocationManager;
this.groupId = groupId; this.groupId = groupId;
this.name = name; this.name = name;
} }
Expand All @@ -52,23 +52,23 @@ public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
checkNotNull(unit); checkNotNull(unit);


long timeoutMillis = Math.max(0, unit.toMillis(timeout)); long timeoutMillis = Math.max(0, unit.toMillis(timeout));
return raftInvocationManager.<Boolean>invoke(groupId, new AwaitOp(name, timeoutMillis)).join(); return invocationManager.<Boolean>invoke(groupId, new AwaitOp(name, timeoutMillis)).join();
} }


@Override @Override
public void countDown() { public void countDown() {
int round = raftInvocationManager.<Integer>invoke(groupId, new GetRoundOp(name)).join(); int round = invocationManager.<Integer>invoke(groupId, new GetRoundOp(name)).join();
raftInvocationManager.invoke(groupId, new CountDownOp(name, round, newUnsecureUUID())).join(); invocationManager.invoke(groupId, new CountDownOp(name, round, newUnsecureUUID())).join();
} }


@Override @Override
public int getCount() { public int getCount() {
return raftInvocationManager.<Integer>invoke(groupId, new GetRemainingCountOp(name)).join(); return invocationManager.<Integer>invoke(groupId, new GetRemainingCountOp(name)).join();
} }


@Override @Override
public boolean trySetCount(int count) { public boolean trySetCount(int count) {
return raftInvocationManager.<Boolean>invoke(groupId, new TrySetCountOp(name, count)).join(); return invocationManager.<Boolean>invoke(groupId, new TrySetCountOp(name, count)).join();
} }


@Override @Override
Expand All @@ -92,7 +92,7 @@ public RaftGroupId getGroupId() {


@Override @Override
public void destroy() { public void destroy() {
raftInvocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join(); invocationManager.invoke(groupId, new DestroyRaftObjectOp(getServiceName(), name)).join();
} }


} }
14 changes: 7 additions & 7 deletions ...eption/LockRequestCancelledException.java → .../exception/WaitKeyCancelledException.java
View file
Expand Up @@ -14,36 +14,36 @@
* limitations under the License. * limitations under the License.
*/ */


package com.hazelcast.raft.service.lock.exception; package com.hazelcast.raft.service.exception;


import com.hazelcast.client.impl.protocol.ClientExceptionFactory; import com.hazelcast.client.impl.protocol.ClientExceptionFactory;
import com.hazelcast.core.HazelcastException; import com.hazelcast.core.HazelcastException;


/** /**
* TODO: Javadoc Pending... * TODO: Javadoc Pending...
*/ */
public class LockRequestCancelledException extends HazelcastException { public class WaitKeyCancelledException extends HazelcastException {


// TODO [basri] fixit // TODO [basri] fixit
public static final int ERROR_CODE = 6768; public static final int ERROR_CODE = 6768;




public LockRequestCancelledException() { public WaitKeyCancelledException() {
} }


public LockRequestCancelledException(String message) { public WaitKeyCancelledException(String message) {
super(message); super(message);
} }


public LockRequestCancelledException(String message, Throwable cause) { public WaitKeyCancelledException(String message, Throwable cause) {
super(message, cause); super(message, cause);
} }


public static void register(ClientExceptionFactory factory) { public static void register(ClientExceptionFactory factory) {
factory.register(ERROR_CODE, LockRequestCancelledException.class, new ClientExceptionFactory.ExceptionFactory() { factory.register(ERROR_CODE, WaitKeyCancelledException.class, new ClientExceptionFactory.ExceptionFactory() {
@Override @Override
public Throwable createException(String message, Throwable cause) { public Throwable createException(String message, Throwable cause) {
return new LockRequestCancelledException(message, cause); return new WaitKeyCancelledException(message, cause);
} }
}); });
} }
Expand Down
8 changes: 4 additions & 4 deletions hazelcast-raft-dataservices/src/main/java/com/hazelcast/raft/service/lock/LockRegistry.java
View file
Expand Up @@ -46,7 +46,7 @@ protected RaftLock createNewResource(RaftGroupId groupId, String name) {
AcquireResult acquire(String name, LockEndpoint endpoint, long commitIndex, UUID invocationUid) { AcquireResult acquire(String name, LockEndpoint endpoint, long commitIndex, UUID invocationUid) {
AcquireResult result = getOrInitResource(name).acquire(endpoint, commitIndex, invocationUid, true); AcquireResult result = getOrInitResource(name).acquire(endpoint, commitIndex, invocationUid, true);


for (LockInvocationKey waitKey : result.notifications) { for (LockInvocationKey waitKey : result.cancelled) {
removeWaitKey(waitKey); removeWaitKey(waitKey);
} }


Expand All @@ -58,7 +58,7 @@ AcquireResult tryAcquire(String name, LockEndpoint endpoint, long commitIndex, U
AcquireResult result = getOrInitResource(name).acquire(endpoint, commitIndex, invocationUid, wait); AcquireResult result = getOrInitResource(name).acquire(endpoint, commitIndex, invocationUid, wait);
long fence = result.fence; long fence = result.fence;


for (LockInvocationKey waitKey : result.notifications) { for (LockInvocationKey waitKey : result.cancelled) {
removeWaitKey(waitKey); removeWaitKey(waitKey);
} }


Expand All @@ -72,7 +72,7 @@ AcquireResult tryAcquire(String name, LockEndpoint endpoint, long commitIndex, U
ReleaseResult release(String name, LockEndpoint endpoint, UUID invocationUid) { ReleaseResult release(String name, LockEndpoint endpoint, UUID invocationUid) {
RaftLock lock = getResourceOrNull(name); RaftLock lock = getResourceOrNull(name);
if (lock == null) { if (lock == null) {
return ReleaseResult.NOT_RELEASED; return ReleaseResult.FAILED;
} }


ReleaseResult result = lock.release(endpoint, invocationUid); ReleaseResult result = lock.release(endpoint, invocationUid);
Expand All @@ -86,7 +86,7 @@ ReleaseResult release(String name, LockEndpoint endpoint, UUID invocationUid) {
ReleaseResult forceRelease(String name, long expectedFence, UUID invocationUid) { ReleaseResult forceRelease(String name, long expectedFence, UUID invocationUid) {
RaftLock lock = getResourceOrNull(name); RaftLock lock = getResourceOrNull(name);
if (lock == null) { if (lock == null) {
return ReleaseResult.NOT_RELEASED; return ReleaseResult.FAILED;
} }


ReleaseResult result = lock.forceRelease(expectedFence, invocationUid); ReleaseResult result = lock.forceRelease(expectedFence, invocationUid);
Expand Down

0 comments on commit a871011

Please sign in to comment.