incubator-geode git commit: GEODE-2136: Don't duplicate cookies in the http response
Repository: incubator-geode
Updated Branches:
refs/heads/develop 1fabe4903 -> 03715a63e
GEODE-2136: Don't duplicate cookies in the http response
We had some code that copied cookies from the request to the response.
That caused us to include a potentially stale cookie value in the
response.
Adding a unit test that we don't screw up the users cookies. I had to
bring in a dependency on httpunit, because the HttpTester with jetty is
not correctly parsing multiple Set-Cookie headers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/03715a63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/03715a63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/03715a63
Branch: refs/heads/develop
Commit: 03715a63eee5f20453f0dc0ec01311b11d7548af
Parents: 1fabe49
Author: Dan Smith
Authored: Tue Nov 22 10:53:11 2016 -0800
Committer: Dan Smith
Committed: Tue Nov 22 11:37:14 2016 -0800
--
extensions/geode-modules-session/build.gradle | 3 ++
.../session/filter/SessionCachingFilter.java| 12 -
.../SessionReplicationIntegrationJUnitTest.java | 52
3 files changed, 55 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03715a63/extensions/geode-modules-session/build.gradle
--
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index f068dde..3063772 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -27,6 +27,9 @@ dependencies {
}
testCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version:
project.'jetty.version', classifier: 'tests')
testCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version:
project.'jetty.version', classifier: 'tests')
+ testCompile ('org.httpunit:httpunit:' + project.'httpunit.version') {
+exclude group: 'javax.servlet'
+ }
testCompile project(path: ':geode-junit')
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03715a63/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
--
diff --git
a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
index 71aa768..25e22bb 100644
---
a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
+++
b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
@@ -224,19 +224,7 @@ public class SessionCachingFilter implements Filter {
Cookie cookie = new Cookie(manager.getSessionCookieName(),
session.getId());
cookie.setPath("".equals(getContextPath()) ? "/" : getContextPath());
- // Clear out all old cookies and just set ours
response.addCookie(cookie);
-
- // Replace all other cookies which aren't JSESSIONIDs
- if (cookies != null) {
-for (Cookie c : cookies) {
- if (manager.getSessionCookieName().equals(c.getName())) {
-continue;
- }
- response.addCookie(c);
-}
- }
-
}
private String getCookieString(Cookie c) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03715a63/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
--
diff --git
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 76ecab3..50bc0ad 100644
---
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -47,6 +47,11 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
/**
* In-container testing using Jetty. This allows us to test context listener
events as well
incubator-geode git commit: GEODE-1509: replacing HashSet of recipient gateways with IntOpenHashSet
Repository: incubator-geode
Updated Branches:
refs/heads/develop 115a2f82c -> ea0ef97ae
GEODE-1509: replacing HashSet of recipient gateways with IntOpenHashSet
This closes #292
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ea0ef97a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ea0ef97a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ea0ef97a
Branch: refs/heads/develop
Commit: ea0ef97ae9983f44f4a733d0db72d1d81d2df3cb
Parents: 115a2f8
Author: Amey Barve
Authored: Thu Nov 17 18:04:07 2016 +0530
Committer: Dan Smith
Committed: Tue Nov 29 09:55:04 2016 -0800
--
.../wan/GatewaySenderEventCallbackArgument.java | 11 +++---
.../sanctionedDataSerializables.txt | 40 ++--
2 files changed, 26 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea0ef97a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index 193360a..4a3f398 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.cache.wan;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.internal.DataSerializableFixedID;
@@ -53,7 +54,7 @@ public final class GatewaySenderEventCallbackArgument extends
WrappedCallbackArg
* GatewayReceiver s don't resend the event to the same
* GatewayReceivers.
*/
- private Set receipientDSIds;
+ private IntOpenHashSet receipientDSIds;
/**
* No arg constructor for DataSerializable.
@@ -75,7 +76,7 @@ public final class GatewaySenderEventCallbackArgument extends
WrappedCallbackArg
// _originalEventId = geca._originalEventId;
originatingDSId = geca.originatingDSId;
if (geca.receipientDSIds != null) {
- receipientDSIds = new HashSet(geca.receipientDSIds);
+ receipientDSIds = new IntOpenHashSet(geca.receipientDSIds);
}
}
@@ -119,7 +120,7 @@ public final class GatewaySenderEventCallbackArgument
extends WrappedCallbackArg
*
* @return the list of Gateway s to which the event has been
sent
*/
- public Set getRecipientDSIds() {
+ public IntOpenHashSet getRecipientDSIds() {
return this.receipientDSIds;
}
@@ -129,7 +130,7 @@ public final class GatewaySenderEventCallbackArgument
extends WrappedCallbackArg
* @param originalGatewaysReceivers The original recipient
Gateways.
*/
public void initializeReceipientDSIds(List
originalGatewaysReceivers) {
-this.receipientDSIds = new HashSet();
+this.receipientDSIds = new IntOpenHashSet(2);
for (Integer id : originalGatewaysReceivers) {
this.receipientDSIds.add(id);
}
@@ -157,7 +158,7 @@ public final class GatewaySenderEventCallbackArgument
extends WrappedCallbackArg
public void fromData(DataInput in) throws IOException,
ClassNotFoundException {
super.fromData(in);
this.originatingDSId = DataSerializer.readInteger(in);
-this.receipientDSIds = new HashSet();
+this.receipientDSIds = new IntOpenHashSet(2);
int numberOfRecipientGateways = in.readInt();
for (int i = 0; i < numberOfRecipientGateways; i++) {
this.receipientDSIds.add(in.readInt());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea0ef97a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
--
diff --git
a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 23162e5..29d62db 100644
---
a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++
b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -199,9 +199,9 @@
fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ecfb50002b1
toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1
org/apache/geode/distributed/internal/StartupMessage,3
-fromDataProblem,38,2ab40039c7000e2abb006759b70068b500392ab400392bb60069572ab40039126ab6006957b1
-fromData,293,2a2bb7006b2a2bb8006cb500092a2bb
incubator-geode git commit: GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-2157 [created] cbb113f2a
GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException
Adding the serialVersionUID from the old version of this class to
PutAllPartialResultException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cbb113f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cbb113f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cbb113f2
Branch: refs/heads/feature/GEODE-2157
Commit: cbb113f2a66b1c8d1d5d2ecfd4b4a910e1793861
Parents: ea0ef97
Author: Dan Smith
Authored: Wed Nov 30 11:13:23 2016 -0800
Committer: Dan Smith
Committed: Wed Nov 30 11:13:23 2016 -0800
--
.../apache/geode/internal/cache/PutAllPartialResultException.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cbb113f2/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index fa906cd..883b34b 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -31,6 +31,7 @@ import java.util.*;
*/
public class PutAllPartialResultException extends GemFireException {
+ private static final long serialVersionUID = 2411654400733621071L;
private PutAllPartialResult result;
Constructors
[1/2] incubator-geode git commit: GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException
Repository: incubator-geode
Updated Branches:
refs/heads/develop 918e6cfd5 -> ef7bb3216
GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException
Adding the serialVersionUID from the old version of this class to
PutAllPartialResultException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/be1d5e31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/be1d5e31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/be1d5e31
Branch: refs/heads/develop
Commit: be1d5e31aa0aa41212e269a739cdbeada9e87310
Parents: 918e6cf
Author: Dan Smith
Authored: Wed Nov 30 11:13:23 2016 -0800
Committer: Dan Smith
Committed: Wed Nov 30 11:52:29 2016 -0800
--
.../apache/geode/internal/cache/PutAllPartialResultException.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be1d5e31/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index fa906cd..883b34b 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -31,6 +31,7 @@ import java.util.*;
*/
public class PutAllPartialResultException extends GemFireException {
+ private static final long serialVersionUID = 2411654400733621071L;
private PutAllPartialResult result;
Constructors
[2/2] incubator-geode git commit: Removing unused ClientHelper test class
Removing unused ClientHelper test class
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ef7bb321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ef7bb321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ef7bb321
Branch: refs/heads/develop
Commit: ef7bb3216e700a9b0ddd9d0b8dc174ed6602564d
Parents: be1d5e3
Author: Dan Smith
Authored: Thu Nov 17 10:55:16 2016 -0800
Committer: Dan Smith
Committed: Wed Nov 30 11:54:39 2016 -0800
--
.../org/apache/geode/cache/ClientHelper.java| 68
1 file changed, 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef7bb321/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
--
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
b/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
deleted file mode 100644
index 66ce495..000
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
- */
-package org.apache.geode.cache;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.geode.cache.DynamicRegionFactory.Config;
-import org.apache.geode.cache.client.internal.PoolImpl;
-import org.apache.geode.cache.client.internal.ServerProxy;
-import org.apache.geode.internal.cache.LocalRegion;
-
-/**
- * Provides methods for getting at the bridge client and connection proxies
used by a region.
- *
- *
- */
-public class ClientHelper {
-
- public static PoolImpl getPool(Region region) {
-ServerProxy proxy = ((LocalRegion) region).getServerProxy();
-if (proxy == null) {
- return null;
-} else {
- return (PoolImpl) proxy.getPool();
-}
- }
-
- public static Set getActiveServers(Region region) {
-return new HashSet(getPool(region).getCurrentServers());
- }
-
- // public static Set getDeadServers(Region region) {
- // }
-
- private ClientHelper() {
-
- }
-
- public static int getRetryInterval(Region region) {
-return (int) (getPool(region).getPingInterval());
- }
-
- /**
- * @param region
- */
- public static void release(Region region) {
-
-PoolImpl pool = getPool(region);
-if (pool != null) {
- pool.releaseThreadLocalConnection();
-}
- }
-
-}
incubator-geode git commit: GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx
Repository: incubator-geode Updated Branches: refs/heads/develop 890e6c784 -> 423e04f9d GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/423e04f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/423e04f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/423e04f9 Branch: refs/heads/develop Commit: 423e04f9d86962cb183b38612b8eb21afe91e1cd Parents: 890e6c7 Author: Dan Smith Authored: Wed Nov 30 16:46:23 2016 -0800 Committer: Dan Smith Committed: Wed Nov 30 16:47:29 2016 -0800 -- .../org/apache/geode/codeAnalysis/sanctionedSerializables.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/423e04f9/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt -- diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt index 8167ed3..7ab7c4e 100644 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt @@ -292,7 +292,7 @@ org/apache/geode/internal/cache/PartitionedRegionException,true,5113786059279106 org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator$MemberResultsList,false,isLastChunkReceived:boolean org/apache/geode/internal/cache/PartitionedRegionStatus,true,-6755318987122602065,numberOfLocalEntries:int org/apache/geode/internal/cache/PrimaryBucketException,true,1 -org/apache/geode/internal/cache/PutAllPartialResultException,false,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult +org/apache/geode/internal/cache/PutAllPartialResultException,true,2411654400733621071,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult,false,firstCauseOfFailure:java/lang/Exception,firstFailedKey:java/lang/Object,succeededKeys:org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,totalMapSize:int org/apache/geode/internal/cache/RegionClearedException,true,1266503771775907997 org/apache/geode/internal/cache/RegionQueueException,true,4159307586325821105
incubator-geode git commit: GEODE-1978: Waiting for the queue to drain in testReplicatedSerialProp...
Repository: incubator-geode
Updated Branches:
refs/heads/develop 27f491af1 -> 6aced1947
GEODE-1978: Waiting for the queue to drain in testReplicatedSerialProp...
Waiting to the queue to drain in this test. The test had an assertion
that the queue was not empty. But really, in the background the
dispatcher was draining the queue as fast as it good. The actually
expected behavior is that the queue will become empty if the remote side
destroys a region.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6aced194
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6aced194
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6aced194
Branch: refs/heads/develop
Commit: 6aced1947590aa1829b7c9a65dbb11683544065b
Parents: 27f491a
Author: Dan Smith
Authored: Thu Dec 1 17:14:00 2016 -0800
Committer: Dan Smith
Committed: Fri Dec 2 09:30:44 2016 -0800
--
.../geode/internal/cache/wan/WANTestBase.java | 17 ++--
.../ConcurrentWANPropagation_1_DUnitTest.java | 21 ++--
2 files changed, 16 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6aced194/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
--
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 6351933..fd1d4c9 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -3317,23 +3317,18 @@ public class WANTestBase extends
JUnit4DistributedTestCase {
}
}
- public static void verifyRegionQueueNotEmptyForConcurrentSender(String
senderId) {
+ public static void waitForConcurrentSerialSenderQueueToDrain(String
senderId) {
Set senders = cache.getGatewaySenders();
-GatewaySender sender = null;
-for (GatewaySender s : senders) {
- if (s.getId().equals(senderId)) {
-sender = s;
-break;
- }
-}
+GatewaySender sender =
+senders.stream().filter(s ->
s.getId().equals(senderId)).findFirst().get();
-if (!sender.isParallel()) {
+Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> {
Set queues =
((AbstractGatewaySender)
sender).getQueuesForConcurrentSerialGatewaySender();
for (RegionQueue q : queues) {
-assertTrue(q.size() > 0);
+assertEquals(0, q.size());
}
-}
+});
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6aced194/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
--
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
index fd9a9c9..ba8d349 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
@@ -337,10 +337,10 @@ public class ConcurrentWANPropagation_1_DUnitTest extends
WANTestBase {
() -> WANTestBase.createReplicatedRegion(getTestMethodName() +
"_RR_1", "ln", isOffHeap()));
// senders are created on local site
-vm4.invoke(() -> WANTestBase.createConcurrentSender("ln", 2, false, 100,
500, false, false,
-null, true, 5, OrderPolicy.KEY));
-vm5.invoke(() -> WANTestBase.createConcurrentSender("ln", 2, false, 100,
500, false, false,
-null, true, 5, OrderPolicy.KEY));
+vm4.invoke(() -> WANTestBase.createConcurrentSender("ln", 2, false, 100,
10, false, false, null,
+true, 5, OrderPolicy.KEY));
+vm5.invoke(() -> WANTestBase.createConcurrentSender("ln", 2, false, 100,
10, false, false, null,
+true, 5, OrderPolicy.KEY));
// start the senders on local site
startSenderInVMs("ln", vm4, vm5);
@@ -350,7 +350,7 @@ public class ConcurrentWANPropagation_1_DUnitTest extends
WANTestBase {
// start puts in RR_1 in another thread
AsyncInvocation inv1 =
-vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() +
"_RR_1", 1));
+vm4.invokeAsync(() -> WANTestBase.doPuts(getTestMethodName() +
"_RR_1", 100));
// destroy RR_1 in remote site
vm2.invoke(() -> WANTestBase.destroyRegion(getTestMethodName() + "_RR_1"));
@@ -362,12 +362,1
[1/2] geode git commit: Removing a bogus import of a javafx class.
Repository: geode Updated Branches: refs/heads/develop 9dd4205da -> 033d14f58 Removing a bogus import of a javafx class. This import failed on openjdk. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/033d14f5 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/033d14f5 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/033d14f5 Branch: refs/heads/develop Commit: 033d14f585bafc142a0cf9183fe3350b59e8a112 Parents: 05c2388 Author: Dan Smith Authored: Tue Dec 6 11:22:36 2016 -0800 Committer: Dan Smith Committed: Tue Dec 6 16:53:20 2016 -0800 -- .../query/functional/TestNewFunctionSSorRSIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/033d14f5/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java index 6723243..957ec29 100755 --- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java @@ -19,7 +19,6 @@ */ package org.apache.geode.cache.query.functional; -import static javafx.scene.input.KeyCode.Q; import static org.junit.Assert.*; import java.util.ArrayList;
[2/2] geode git commit: GEODE-1862: Invoke getAllDurableCqsFromServer on the primary queue server
GEODE-1862: Invoke getAllDurableCqsFromServer on the primary queue server
Invoking this method on a server that does not have the queue will
return the wrong results.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/05c2388f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/05c2388f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/05c2388f
Branch: refs/heads/develop
Commit: 05c2388f5add287aa07a43ca08a85776f8b9f43b
Parents: 9dd4205
Author: Barry Oglesby
Authored: Thu Sep 1 17:40:03 2016 -0700
Committer: Dan Smith
Committed: Tue Dec 6 16:53:20 2016 -0800
--
.../cache/client/internal/ConnectionStats.java | 4 +
.../cache/client/internal/GetDurableCQsOp.java | 2 +-
.../sockets/DurableClientSimpleDUnitTest.java | 248 ---
3 files changed, 159 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/05c2388f/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
index c2229c1..d91719d 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
@@ -3344,6 +3344,10 @@ public class ConnectionStats implements MessageStats {
return this.stats.getLong(executeFunctionDurationId);
}
+ public int getGetDurableCqs() {
+return this.stats.getInt(getDurableCQsId);
+ }
+
/**
* Records that the specified GetClientPRMetadata operation is starting
*
http://git-wip-us.apache.org/repos/asf/geode/blob/05c2388f/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
--
diff --git
a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
index b520c5d..814931c 100755
---
a/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
+++
b/geode-cq/src/main/java/org/apache/geode/cache/client/internal/GetDurableCQsOp.java
@@ -43,7 +43,7 @@ public class GetDurableCQsOp {
*/
public static List execute(ExecutablePool pool) {
AbstractOp op = new GetDurableCQsOpImpl();
-return (List) pool.execute(op);
+return (List) pool.executeOnPrimary(op);
}
private GetDurableCQsOp() {
http://git-wip-us.apache.org/repos/asf/geode/blob/05c2388f/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
--
diff --git
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 68c397d..0ea7050 100644
---
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -16,12 +16,15 @@ package org.apache.geode.internal.cache.tier.sockets;
import static
org.apache.geode.internal.cache.tier.sockets.CacheServerTestUtil.TYPE_CREATE;
import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.geode.cache.CacheException;
@@ -31,6 +34,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.ServerRefusedConnectionException;
+import org.apache.geode.cache.client.internal.ConnectionStats;
import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.query.CqAttributes;
import org.apache.geode.cache.query.CqAttributesFactory;
@@ -42,6 +46,7 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geo
geode git commit: GEODE-2179 - Checking for disconnected connection in GatewaySenderMBean
Repository: geode
Updated Branches:
refs/heads/develop 1d34eeb9f -> 0494b31ca
GEODE-2179 - Checking for disconnected connection in GatewaySenderMBean
Making sure that the mbean returns false for isConnected if the gateway
is not actually connected to the remote side.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0494b31c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0494b31c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0494b31c
Branch: refs/heads/develop
Commit: 0494b31caf6f43cec85660fd8d939f2b1c6739c2
Parents: 1d34eeb
Author: Dan Smith
Authored: Fri Dec 2 15:47:13 2016 -0800
Committer: Dan Smith
Committed: Wed Dec 7 15:14:28 2016 -0800
--
.../wan/GatewaySenderEventRemoteDispatcher.java | 2 +-
.../management/WANManagementDUnitTest.java | 40 +++-
2 files changed, 24 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/0494b31c/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
--
diff --git
a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 16b1965..8da5613 100644
---
a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++
b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -802,7 +802,7 @@ public class GatewaySenderEventRemoteDispatcher implements
GatewaySenderEventDis
@Override
public boolean isConnectedToRemote() {
-return connection != null;
+return connection != null && !connection.isDestroyed();
}
public void stop() {
http://git-wip-us.apache.org/repos/asf/geode/blob/0494b31c/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
--
diff --git
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
index 9a6cc10..3cc37eb 100644
---
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
@@ -19,12 +19,14 @@ import org.junit.Test;
import static org.junit.Assert.*;
+import com.jayway.awaitility.Awaitility;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -60,7 +62,17 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
}
@Test
- public void testMBeanCallback() throws Exception {
+ public void testMBeanCallbackSerial() throws Exception {
+testMBeanCallback(false);
+ }
+
+ @Test
+ public void testMBeanCallbackParallel() throws Exception {
+testMBeanCallback(true);
+
+ }
+
+ public void testMBeanCallback(boolean parallel) throws Exception {
VM nyLocator = getManagedNodeList().get(0);
VM nyReceiver = getManagedNodeList().get(1);
@@ -103,10 +115,8 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
puneSender.invoke(() -> WANTestBase.waitForSenderRunningState("pn"));
managing.invoke(() -> WANTestBase.waitForSenderRunningState("pn"));
-
-
-checkSenderMBean(puneSender, getTestMethodName() + "_PR");
-checkSenderMBean(managing, getTestMethodName() + "_PR");
+checkSenderMBean(puneSender, getTestMethodName() + "_PR", true);
+checkSenderMBean(managing, getTestMethodName() + "_PR", true);
checkReceiverMBean(nyReceiver);
@@ -119,6 +129,10 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
checkProxySender(managing, puneMember);
checkSenderNavigationAPIS(managing, puneMember);
+nyReceiver.invoke(() -> WANTestBase.stopReceivers());
+
+checkSenderMBean(puneSender, getTestMethodName() + "_PR", false);
+checkSenderMBean(managing, getTestMethodName() + "_PR", false);
}
@Category(FlakyTest.class) // GEODE-1603
@@ -159,8 +173,7 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
managing.invoke(() -> WANTestBase.createManagementCache(nyPort));
startManagingNode(managing);
-
-checkSenderMBean(puneSender, getTestMethodName() + "_PR");
+checkSenderMBean(puneSender, getTestMe
geode git commit: GEODE-2186: Changing the gateway status to only looking running status
Repository: geode
Updated Branches:
refs/heads/develop adfd41f43 -> 09184881a
GEODE-2186: Changing the gateway status to only looking running status
Gateway senders may or may not be connected, depending on what is going
on with the underlying queue. If a sender is a secondary, it may be
disconnected because it doesn't need to send anything. Even primaries
may be disconnected for periods of time if the connection is lost when
there is nothing in the queue.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/09184881
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/09184881
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/09184881
Branch: refs/heads/develop
Commit: 09184881aec9250fdf2e96f4fced4dedaac0bda7
Parents: adfd41f
Author: Dan Smith
Authored: Tue Dec 6 16:52:24 2016 -0800
Committer: Dan Smith
Committed: Fri Dec 9 11:11:26 2016 -0800
--
.../internal/beans/DistributedSystemBridge.java | 4 +---
.../geode/management/WANManagementDUnitTest.java| 16 +++-
2 files changed, 8 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/09184881/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index 3016277..5b8c115 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -1566,10 +1566,8 @@ public class DistributedSystemBridge {
GatewaySenderMXBean bean = it.next();
Integer dsId = bean.getRemoteDSId();
if (dsId != null) {
- senderMap.put(dsId.toString(), bean.isConnected());
+ senderMap.merge(dsId.toString(), bean.isRunning(),
Boolean::logicalAnd);
}
-
-
}
return senderMap;
http://git-wip-us.apache.org/repos/asf/geode/blob/09184881/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
--
diff --git
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
index 3cc37eb..dc801be 100644
---
a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
+++
b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
@@ -54,9 +53,6 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
private static final long serialVersionUID = 1L;
-
- public static MBeanServer mbeanServer = MBeanJMXAdapter.mbeanServer;
-
public WANManagementDUnitTest() throws Exception {
super();
}
@@ -91,6 +87,7 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
managing.invoke(() -> WANTestBase.createManagementCache(punePort));
startManagingNode(managing);
+
// keep a larger batch to minimize number of exception occurrences in the
// log
puneSender
@@ -104,6 +101,7 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
managing.invoke(() ->
WANTestBase.createPartitionedRegion(getTestMethodName() + "_PR", "pn", 1,
100, false));
+
nyReceiver.invoke(() -> WANTestBase.createCache(nyPort));
nyReceiver.invoke(() ->
WANTestBase.createPartitionedRegion(getTestMethodName() + "_PR", null,
1, 100, false));
@@ -314,11 +312,11 @@ public class WANManagementDUnitTest extends
ManagementTestBase {
if (service.isManager()) {
DistributedSystemMXBean dsBean =
service.getDistributedSystemMXBean();
- Map dsMap = dsBean.viewRemoteClusterStatus();
-
- LogWriterUtils.getLogWriter()
- .info(" Ds Map is: " + dsMap +
" ");
-
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> {
+Map dsMap = dsBean.viewRemoteClusterStatus();
+dsMap.entrySet().stream()
+.forEach(entry -> assertTrue("Should be true " +
entry.getKey(), entry.getValue()));
+ });
}
}
[1/2] geode git commit: GEODE-2216: Throwing an exception if index creation fails.
Repository: geode
Updated Branches:
refs/heads/develop 284bed968 -> 341a359e0
GEODE-2216: Throwing an exception if index creation fails.
Making sure index creation always throws an exception and cleans up the
index if the index creation fails. Adding a test that causes index
creation failure by failing to deserialize entries.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/83121963
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/83121963
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/83121963
Branch: refs/heads/develop
Commit: 831219635b66da79acdbd4849f921104e004ac96
Parents: 284bed9
Author: Dan Smith
Authored: Wed Dec 14 16:59:51 2016 -0800
Committer: Dan Smith
Committed: Mon Dec 19 15:31:45 2016 -0800
--
.../geode/internal/cache/PartitionedRegion.java | 16 +++-
.../cache/PartitionedRegionQueryDUnitTest.java | 78 +++-
2 files changed, 89 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/83121963/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 7c3f19b..6a67b59 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -8738,7 +8738,7 @@ public class PartitionedRegion extends LocalRegion
// First step is creating all the defined indexes.
// Do not send the IndexCreationMsg to remote nodes now.
-throwException =
+throwException |=
createEmptyIndexes(indexDefinitions, remotelyOriginated, indexes,
exceptionsMap);
// If same indexes are created locally and also being created by a remote
index creation msg
@@ -8751,18 +8751,26 @@ public class PartitionedRegion extends LocalRegion
// Second step is iterating over REs and populating all the created indexes
if (unpopulatedIndexes != null && unpopulatedIndexes.size() > 0) {
- throwException = populateEmptyIndexes(unpopulatedIndexes, exceptionsMap);
+ throwException |= populateEmptyIndexes(unpopulatedIndexes,
exceptionsMap);
}
// Third step is to send the message to remote nodes
// Locally originated create index request.
// Send create request to other PR nodes.
-throwException =
+throwException |=
sendCreateIndexesMessage(remotelyOriginated, indexDefinitions,
indexes, exceptionsMap);
// If exception is throw in any of the above steps
if (throwException) {
- throw new MultiIndexCreationException(exceptionsMap);
+ try {
+for (String indexName : exceptionsMap.keySet()) {
+ Index index = indexManager.getIndex(indexName);
+ indexManager.removeIndex(index);
+ removeIndex(index, remotelyOriginated);
+}
+ } finally {
+throw new MultiIndexCreationException(exceptionsMap);
+ }
}
// set the populate flag for all the created PR indexes
http://git-wip-us.apache.org/repos/asf/geode/blob/83121963/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
index 0196542..a14e9ee 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.internal.cache;
+import java.io.IOException;
+
+import org.apache.geode.DataSerializable;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.test.dunit.DUnitEnv;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -23,6 +29,9 @@ import
org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.io.Serializable;
import java.sql.Date;
import java.util.Arrays;
@@ -31,6 +40,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.concurrent.CancellationException;
import java.util.concurrent.atomic.Atomic
[2/2] geode git commit: GEODE-1272 Don't deserialize PDX objects when creating an index
GEODE-1272 Don't deserialize PDX objects when creating an index
Setting the flag to prevent deserialization of PDX objects while
populating an index that is defined on a partitioned region. We were
setting this flag in the member that initially created the index, but
not in other members that receive the IndexCreationMessage.
This closes #318
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/341a359e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/341a359e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/341a359e
Branch: refs/heads/develop
Commit: 341a359e00a9ba2f9c74e1dc4fee38fc53f78b3c
Parents: 8312196
Author: Dan Smith
Authored: Wed Dec 14 17:08:36 2016 -0800
Committer: Dan Smith
Committed: Mon Dec 19 15:32:03 2016 -0800
--
.../query/internal/index/IndexManager.java | 3 +
.../cache/PartitionedRegionQueryDUnitTest.java | 177 +--
2 files changed, 163 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/341a359e/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index 27f239e..6cf9a3f 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -891,6 +891,8 @@ public class IndexManager {
}
boolean throwException = false;
HashMap exceptionsMap = new HashMap();
+boolean oldReadSerialized = DefaultQuery.getPdxReadSerialized();
+DefaultQuery.setPdxReadSerialized(true);
try {
Iterator entryIter = ((LocalRegion) region).getBestIterator(true);
while (entryIter.hasNext()) {
@@ -931,6 +933,7 @@ public class IndexManager {
throw new MultiIndexCreationException(exceptionsMap);
}
} finally {
+ DefaultQuery.setPdxReadSerialized(oldReadSerialized);
notifyAfterUpdate();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/341a359e/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
index a14e9ee..eb918bc 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryDUnitTest.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.internal.cache;
-import java.io.IOException;
-
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.query.Struct;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.dunit.DUnitEnv;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.junit.experimental.categories.Category;
@@ -26,20 +27,22 @@ import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
-import java.sql.Date;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
import java.util.stream.IntStream;
import org.apache.geode.cache.Cache;
@@ -66,7 +69,6 @@ import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
@@ -89,9 +91,6 @@ import org.apache.geode.test.dunit.VM;
@Category(DistributedTest.class)
public class
geode git commit: GEODE-2109: Replacing ExecutorService.submit calls with ExecutorService.execute call.
Repository: geode
Updated Branches:
refs/heads/develop 164f04fbd -> eba189bb1
GEODE-2109: Replacing ExecutorService.submit calls with ExecutorService.execute
call.
This will allow exceptions from those threads to be logged.
Refactored DiskStore task for delayed writes, we cannot replace
expensive writes tasks submit call with execute as later we check if
write call is completed or not. Replaced submit call by execute in case
of DiskStore tasks like compactions, creating KRF's.
Replaced submit call for GIITask and RemoveMember tasks. GIITask is used
when adding member or starting managing activity when node becomes
managing node. While adding member we can make the
ExecutorService.execute call. Did not change the call for GIITask when
invoked from managing activity as possible exception is handled.
Added LoggingThreadGroup for SingleHopClientExecutor
This closes #296
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/eba189bb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/eba189bb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/eba189bb
Branch: refs/heads/develop
Commit: eba189bb134dc6f00629492b4a5c00b392b9aa45
Parents: 164f04f
Author: Deepak Dixit
Authored: Wed Nov 23 21:33:14 2016 +0530
Committer: Dan Smith
Committed: Wed Dec 21 12:40:48 2016 -0800
--
.../internal/SingleHopClientExecutor.java | 8 ++-
.../FunctionExecutionPooledExecutor.java| 2 +-
.../distributed/internal/InternalLocator.java | 4 +-
.../geode/internal/cache/DiskStoreImpl.java | 40 -
.../internal/cache/PRHARedundancyProvider.java | 2 +-
.../geode/internal/cache/lru/HeapEvictor.java | 2 +-
.../CustomEntryConcurrentHashMap.java | 2 +-
.../management/internal/FederatingManager.java | 26 ++---
...ientExecutorSubmitTaskWithExceptionTest.java | 61
.../management/MemoryThresholdsDUnitTest.java | 6 ++
.../internal/cache/EvictionStatsDUnitTest.java | 25
.../PartitionedRegionEvictionDUnitTest.java | 7 +++
12 files changed, 169 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/eba189bb/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
index 88a86cf..4d40acd 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/SingleHopClientExecutor.java
@@ -27,6 +27,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.logging.log4j.Logger;
import org.apache.geode.GemFireException;
@@ -57,7 +59,9 @@ public class SingleHopClientExecutor {
AtomicInteger threadNum = new AtomicInteger();
public Thread newThread(final Runnable r) {
- Thread result = new Thread(r, "Function Execution Thread-" +
threadNum.incrementAndGet());
+ Thread result =
+ new
Thread(LoggingThreadGroup.createThreadGroup("FunctionExecutionThreadGroup",
logger),
+ r, "Function Execution Thread-" + threadNum.incrementAndGet());
result.setDaemon(true);
return result;
}
@@ -384,7 +388,7 @@ public class SingleHopClientExecutor {
}
static void submitTask(Runnable task) {
-execService.submit(task);
+execService.execute(task);
}
// Find out what exception to throw?
http://git-wip-us.apache.org/repos/asf/geode/blob/eba189bb/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index 34f1296..a519c0e 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -131,7 +131,7 @@ public class FunctionExecutionPooledExecutor extends
ThreadPoolExecutor {
Runnable task = takeQueue.take();
if (forFnExec) {
if (!putQueue.offer(task, retryFor, TimeUnit.MILLISECONDS))
geode git commit: Revert "GEODE-2243: Adjust path of spotless formatter"
Repository: geode
Updated Branches:
refs/heads/develop c1998d739 -> d30e9abc2
Revert "GEODE-2243: Adjust path of spotless formatter"
This reverts commit c1998d7398b837ee1e699bfd1952719443045d71.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d30e9abc
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d30e9abc
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d30e9abc
Branch: refs/heads/develop
Commit: d30e9abc2ede49054abd7c1ec7835f86567d20ca
Parents: c1998d7
Author: Dan Smith
Authored: Wed Dec 21 17:38:14 2016 -0800
Committer: Dan Smith
Committed: Wed Dec 21 17:38:14 2016 -0800
--
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/d30e9abc/build.gradle
--
diff --git a/build.gradle b/build.gradle
index d788250..360310f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -91,7 +91,7 @@ subprojects {
spotless {
lineEndings = 'unix';
java {
- eclipseFormatFile
"${rootProject.projectDir}/../open/etc/eclipse-java-google-style.xml"
+ eclipseFormatFile
"${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
}
}
}
geode git commit: GEODE-2238: Fix how peers discover locators with cluster config
Repository: geode
Updated Branches:
refs/heads/develop 93d4455d8 -> f097d7a77
GEODE-2238: Fix how peers discover locators with cluster config
Call super.process last in StartupResponseWithVersionMessage, so that
that threads waiting on the response will have the results of
dm.addHostedLocators.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f097d7a7
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f097d7a7
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f097d7a7
Branch: refs/heads/develop
Commit: f097d7a776726ceed7c6a7e72782830989465adf
Parents: 93d4455
Author: Dan Smith
Authored: Tue Dec 20 17:38:47 2016 -0800
Committer: Dan Smith
Committed: Thu Dec 22 09:15:06 2016 -0800
--
.../internal/StartupMessageReplyProcessor.java | 11 ---
.../internal/StartupResponseWithVersionMessage.java | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/f097d7a7/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
index de6e71f..f90f0da 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java
@@ -101,15 +101,4 @@ public class StartupMessageReplyProcessor extends
ReplyProcessor21 {
// }
// }
}
-
- /**
- * overridden from ReplyProcessor21 to allow early-out. If an existing
member accepted or rejected
- * us then we are done.
- */
- @Override
- protected boolean canStopWaiting() {
-return this.receivedAcceptance || this.receivedRejectionMessage;
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/f097d7a7/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
index 6276d63..5bcbb47 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java
@@ -57,7 +57,6 @@ public class StartupResponseWithVersionMessage extends
StartupResponseMessage {
@Override
protected void process(DistributionManager dm) {
-super.process(dm);
if (this.hostedLocators != null) {
dm.addHostedLocators(getSender(), this.hostedLocators,
this.isSharedConfigurationEnabled);
}
@@ -65,6 +64,7 @@ public class StartupResponseWithVersionMessage extends
StartupResponseMessage {
logger.debug("Received StartupResponseWithVersionMessage from a member
with version: {}",
this.version);
}
+super.process(dm);
}
public int getDSFID() {
geode git commit: GEODE-165: Adding support for generated-src in eclipse
Repository: geode
Updated Branches:
refs/heads/develop c5740f208 -> 0b0213080
GEODE-165: Adding support for generated-src in eclipse
Making the eclipse task depend on generating the oql source files, and
making sure that the eclipse task picks up on the generated-src
directory.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0b021308
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0b021308
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0b021308
Branch: refs/heads/develop
Commit: 0b02130808051d3d53daf230cabaa7aff800b8a8
Parents: c5740f2
Author: Dan Smith
Authored: Thu Dec 22 16:22:43 2016 -0800
Committer: Dan Smith
Committed: Thu Dec 22 16:32:04 2016 -0800
--
geode-core/build.gradle | 3 +++
gradle/ide.gradle | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/0b021308/geode-core/build.gradle
--
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 28085be..3bea42c 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -208,3 +208,6 @@ configurations {
dependencies {
classesOutput sourceSets.main.output
}
+
+tasks.eclipse.dependsOn(generateTestGrammarSource)
+
http://git-wip-us.apache.org/repos/asf/geode/blob/0b021308/gradle/ide.gradle
--
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index a42b92b..8d70505 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -36,7 +36,8 @@ subprojects {
entry.path.contains('geode-web/build') ||
entry.path.contains('geode-assembly/build') ||
entry.path.contains('geode-dependencies.jar')) &&
- !entry.path.contains('generated-resources')
+ !entry.path.contains('generated-resources') &&
+ !entry.path.contains('generated-src')
}
//By default, gradle adds the java 1.8 *execution environment*,
which has access restrictions on
geode git commit: GEODE-165: Fixing the eclipse dependence on the grammar source
Repository: geode
Updated Branches:
refs/heads/develop ab075c457 -> ebde0a260
GEODE-165: Fixing the eclipse dependence on the grammar source
The eclipse target needs to depend on generateGrammarSource, not
generateTestGrammarSource
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ebde0a26
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ebde0a26
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ebde0a26
Branch: refs/heads/develop
Commit: ebde0a26084d6d67e8ef3da27088026e8fe4c469
Parents: ab075c4
Author: Dan Smith
Authored: Wed Jan 4 10:37:54 2017 -0800
Committer: Dan Smith
Committed: Wed Jan 4 11:16:45 2017 -0800
--
geode-core/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/ebde0a26/geode-core/build.gradle
--
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 3bea42c..49dd84b 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -209,5 +209,5 @@ dependencies {
classesOutput sourceSets.main.output
}
-tasks.eclipse.dependsOn(generateTestGrammarSource)
+tasks.eclipse.dependsOn(generateGrammarSource)
