Merge pull request #8550 from jerrinot/fix/wait-notify-wrong-target-e…

…xception/master Delay invocation retry during split brain
hazelcast · Jul 21, 2016 · e7c3122 · e7c3122
2 parents a46aa85 + 821e800
commit e7c3122
Show file tree

Hide file tree

Showing 44 changed files with 340 additions and 74 deletions.
diff --git a/...t/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java b/...t/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllBackupOperation.java
@@ -44,7 +44,7 @@ public AddAllBackupOperation(String name, Map<Long, Data> dataMap) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.addAllBackup(dataMap);
     }
 

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/AddAllOperation.java
@@ -50,7 +50,7 @@ public AddAllOperation(String name, Collection<Data> dataList) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         if (queueContainer.hasEnoughCapacity()) {
             dataMap = queueContainer.addAll(dataList);
             response = true;
@@ -87,7 +87,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getPollWaitNotifyKey();
+        return getContainer().getPollWaitNotifyKey();
     }
 
     @Override

diff --git a/.../src/main/java/com/hazelcast/collection/impl/queue/operations/CheckAndEvictOperation.java b/.../src/main/java/com/hazelcast/collection/impl/queue/operations/CheckAndEvictOperation.java
@@ -34,7 +34,7 @@ public CheckAndEvictOperation(String name) {
 
     @Override
     public void run() throws Exception {
-        final QueueContainer queueContainer = getOrCreateContainer();
+        final QueueContainer queueContainer = getContainer();
         if (queueContainer.isEvictable()) {
             ProxyService proxyService = getNodeEngine().getProxyService();
             proxyService.destroyDistributedObject(getServiceName(), name);

diff --git a/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearBackupOperation.java b/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearBackupOperation.java
@@ -43,7 +43,7 @@ public ClearBackupOperation(String name, Set<Long> itemIdSet) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.clearBackup(itemIdSet);
         response = true;
     }

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ClearOperation.java
@@ -43,7 +43,7 @@ public ClearOperation(String name) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         dataMap = queueContainer.clear();
         response = true;
     }
@@ -74,7 +74,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override

diff --git a/.../java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveBackupOperation.java b/.../java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveBackupOperation.java
@@ -43,7 +43,7 @@ public CompareAndRemoveBackupOperation(String name, Set<Long> keySet) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.compareAndRemoveBackup(keySet);
         response = true;
     }

diff --git a/...c/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java b/...c/main/java/com/hazelcast/collection/impl/queue/operations/CompareAndRemoveOperation.java
@@ -52,7 +52,7 @@ public CompareAndRemoveOperation(String name, Collection<Data> dataList, boolean
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         dataMap = queueContainer.compareAndRemove(dataList, retain);
         response = dataMap.size() > 0;
     }
@@ -85,7 +85,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override

diff --git a/...lcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java b/...lcast/src/main/java/com/hazelcast/collection/impl/queue/operations/ContainsOperation.java
@@ -44,7 +44,7 @@ public ContainsOperation(String name, Collection<Data> dataList) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         response = queueContainer.contains(dataList);
     }
 

diff --git a/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainBackupOperation.java b/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainBackupOperation.java
@@ -44,7 +44,7 @@ public DrainBackupOperation(String name, Set<Long> itemIdSet) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.drainFromBackup(itemIdSet);
     }
 

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/DrainOperation.java
@@ -50,7 +50,7 @@ public DrainOperation(String name, int maxSize) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         dataMap = queueContainer.drain(maxSize);
         response = new SerializableList(new ArrayList<Data>(dataMap.values()));
     }
@@ -81,7 +81,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IsEmptyOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IsEmptyOperation.java
@@ -34,7 +34,7 @@ public IsEmptyOperation(final String name) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         response = queueContainer.size() == 0;
     }
 

diff --git a/...lcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java b/...lcast/src/main/java/com/hazelcast/collection/impl/queue/operations/IteratorOperation.java
@@ -38,7 +38,7 @@ public IteratorOperation(String name) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         List<Data> dataList = queueContainer.getAsDataList();
         response = new SerializableList(dataList);
     }

diff --git a/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java b/...st/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferBackupOperation.java
@@ -46,7 +46,7 @@ public OfferBackupOperation(String name, Data data, long itemId) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.offerBackup(data, itemId);
         response = true;
     }

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/OfferOperation.java
@@ -50,7 +50,7 @@ public OfferOperation(final String name, final long timeout, final Data data) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         if (queueContainer.hasEnoughCapacity()) {
             itemId = queueContainer.offer(data);
             response = true;
@@ -87,17 +87,17 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getPollWaitNotifyKey();
+        return getContainer().getPollWaitNotifyKey();
     }
 
     @Override
     public WaitNotifyKey getWaitKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override
     public boolean shouldWait() {
-        QueueContainer container = getOrCreateContainer();
+        QueueContainer container = getContainer();
         return getWaitTimeout() != 0 && !container.hasEnoughCapacity();
     }
 

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/PeekOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/PeekOperation.java
@@ -36,7 +36,7 @@ public PeekOperation(final String name) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         QueueItem item = queueContainer.peek();
         response = item != null ? item.getData() : null;
     }

diff --git a/...ast/src/main/java/com/hazelcast/collection/impl/queue/operations/PollBackupOperation.java b/...ast/src/main/java/com/hazelcast/collection/impl/queue/operations/PollBackupOperation.java
@@ -42,7 +42,7 @@ public PollBackupOperation(String name, long itemId) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.pollBackup(itemId);
         response = Boolean.TRUE;
     }

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/PollOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/PollOperation.java
@@ -44,7 +44,7 @@ public PollOperation(String name, long timeoutMillis) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         item = queueContainer.poll();
         if (item != null) {
             response = item.getData();
@@ -79,17 +79,17 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override
     public WaitNotifyKey getWaitKey() {
-        return getOrCreateContainer().getPollWaitNotifyKey();
+        return getContainer().getPollWaitNotifyKey();
     }
 
     @Override
     public boolean shouldWait() {
-        return getWaitTimeout() != 0 && getOrCreateContainer().size() == 0;
+        return getWaitTimeout() != 0 && getContainer().size() == 0;
     }
 
     @Override

diff --git a/...c/main/java/com/hazelcast/collection/impl/queue/operations/QueueBackupAwareOperation.java b/...c/main/java/com/hazelcast/collection/impl/queue/operations/QueueBackupAwareOperation.java
@@ -37,11 +37,11 @@ protected QueueBackupAwareOperation(String name, long timeoutMillis) {
 
     @Override
     public final int getSyncBackupCount() {
-        return getOrCreateContainer().getConfig().getBackupCount();
+        return getContainer().getConfig().getBackupCount();
     }
 
     @Override
     public final int getAsyncBackupCount() {
-        return getOrCreateContainer().getConfig().getAsyncBackupCount();
+        return getContainer().getConfig().getAsyncBackupCount();
     }
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/QueueOperation.java
@@ -62,18 +62,19 @@ protected QueueOperation(String name, long timeoutMillis) {
         setWaitTimeout(timeoutMillis);
     }
 
-    protected final QueueContainer getOrCreateContainer() {
-        if (container == null) {
-            QueueService queueService = getService();
-            try {
-                container = queueService.getOrCreateContainer(name, this instanceof BackupOperation);
-            } catch (Exception e) {
-                throw new RetryableHazelcastException(e);
-            }
-        }
+    protected final QueueContainer getContainer() {
         return container;
     }
 
+    private void initializeContainer() {
+        QueueService queueService = getService();
+        try {
+            container = queueService.getOrCreateContainer(name, this instanceof BackupOperation);
+        } catch (Exception e) {
+            throw new RetryableHazelcastException(e);
+        }
+    }
+
     @Override
     public boolean returnsResponse() {
         return true;
@@ -99,6 +100,7 @@ public void afterRun() throws Exception {
 
     @Override
     public void beforeRun() throws Exception {
+        initializeContainer();
     }
 
     public boolean hasListener() {

diff --git a/.../main/java/com/hazelcast/collection/impl/queue/operations/RemainingCapacityOperation.java b/.../main/java/com/hazelcast/collection/impl/queue/operations/RemainingCapacityOperation.java
@@ -34,7 +34,7 @@ public RemainingCapacityOperation(String name) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         response = queueContainer.getConfig().getMaxSize() - queueContainer.size();
     }
 

diff --git a/...t/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveBackupOperation.java b/...t/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveBackupOperation.java
@@ -42,7 +42,7 @@ public RemoveBackupOperation(String name, long itemId) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.removeBackup(itemId);
         response = true;
     }

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/RemoveOperation.java
@@ -47,7 +47,7 @@ public RemoveOperation(String name, Data data) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         itemId = queueContainer.remove(data);
         response = itemId != -1;
     }
@@ -78,7 +78,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getOfferWaitNotifyKey();
+        return getContainer().getOfferWaitNotifyKey();
     }
 
     @Override

diff --git a/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/SizeOperation.java b/hazelcast/src/main/java/com/hazelcast/collection/impl/queue/operations/SizeOperation.java
@@ -34,7 +34,7 @@ public SizeOperation(String name) {
 
     @Override
     public void run() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         response = queueContainer.size();
     }
 

diff --git a/.../com/hazelcast/collection/impl/txnqueue/operations/QueueTransactionRollbackOperation.java b/.../com/hazelcast/collection/impl/txnqueue/operations/QueueTransactionRollbackOperation.java
@@ -41,7 +41,7 @@ public QueueTransactionRollbackOperation(String name, String transactionId) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.rollbackTransaction(transactionId);
     }
 

diff --git a/...t/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnCommitOperation.java b/...t/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnCommitOperation.java
@@ -91,7 +91,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         if (CollectionTxnUtil.isRemove(shouldNotify)) {
             return queueContainer.getOfferWaitNotifyKey();
         }

diff --git a/.../main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java b/.../main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferBackupOperation.java
@@ -45,7 +45,7 @@ public TxnOfferBackupOperation(String name, long itemId, Data data) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         queueContainer.txnCommitOffer(itemId, data, true);
     }
 

diff --git a/...st/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java b/...st/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnOfferOperation.java
@@ -48,7 +48,7 @@ public TxnOfferOperation(String name, long itemId, Data data) {
 
     @Override
     public void run() throws Exception {
-        QueueContainer createContainer = getOrCreateContainer();
+        QueueContainer createContainer = getContainer();
         response = createContainer.txnCommitOffer(getItemId(), data, false);
     }
 
@@ -80,7 +80,7 @@ public boolean shouldNotify() {
 
     @Override
     public WaitNotifyKey getNotifiedKey() {
-        return getOrCreateContainer().getPollWaitNotifyKey();
+        return getContainer().getPollWaitNotifyKey();
     }
 
     @Override

diff --git a/...ast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPeekOperation.java b/...ast/src/main/java/com/hazelcast/collection/impl/txnqueue/operations/TxnPeekOperation.java
@@ -46,7 +46,7 @@ public TxnPeekOperation(String name, long timeoutMillis, long itemId, String tra
 
     @Override
     public void run() throws Exception {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         response = queueContainer.txnPeek(itemId, transactionId);
     }
 
@@ -79,14 +79,14 @@ protected void readInternal(ObjectDataInput in) throws IOException {
 
     @Override
     public WaitNotifyKey getWaitKey() {
-        QueueContainer queueContainer = getOrCreateContainer();
+        QueueContainer queueContainer = getContainer();
         return queueContainer.getPollWaitNotifyKey();
     }
 
 
     @Override
     public boolean shouldWait() {
-        final QueueContainer queueContainer = getOrCreateContainer();
+        final QueueContainer queueContainer = getContainer();
         return getWaitTimeout() != 0 && itemId == -1 && queueContainer.size() == 0;
     }