[geode] branch develop updated: GEODE-8779: Register interest only when local cache is enabled. (#5836)
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f53fa75 GEODE-8779: Register interest only when local cache is
enabled. (#5836)
f53fa75 is described below
commit f53fa752e6d322d6fd24237212a3b958a5b882b8
Author: Eric Shu
AuthorDate: Mon Dec 14 17:42:00 2020 -0800
GEODE-8779: Register interest only when local cache is enabled. (#5836)
---
.../internal/common/ClientServerSessionCache.java | 9 --
.../session/catalina/ClientServerSessionCache.java | 12 +---
.../session/catalina/AbstractSessionCacheTest.java | 4 ++-
.../catalina/ClientServerSessionCacheTest.java | 35 --
4 files changed, 51 insertions(+), 9 deletions(-)
diff --git
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
index 603248a..7633f36 100644
---
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
+++
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
@@ -127,7 +128,9 @@ public class ClientServerSessionCache extends
AbstractSessionCache {
LOG.debug("Retrieved session region: " + this.sessionRegion);
// Register interest in case users provide their own client cache region
- sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (sessionRegion.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
}
}
@@ -175,7 +178,9 @@ public class ClientServerSessionCache extends
AbstractSessionCache {
// Create the region
Region region = factory.create(regionName);
-region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+if (enableLocalCache) {
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+}
return region;
}
}
diff --git
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index 107fb32..8f54abd 100644
---
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -20,6 +20,7 @@ import java.util.Set;
import javax.servlet.http.HttpSession;
+import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Region;
@@ -189,7 +190,9 @@ public class ClientServerSessionCache extends
AbstractSessionCache {
sessionRegion.getAttributesMutator().addCacheListener(new
SessionExpirationCacheListener());
}
- sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ if (sessionRegion.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+sessionRegion.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
}
}
@@ -224,10 +227,11 @@ public class ClientServerSessionCache extends
AbstractSessionCache {
Region createLocalSessionRegionWithRegisterInterest() {
Region region = createLocalSessionRegion();
-// register interest are needed for proxy or caching-proxy client:
+// register interest are needed for caching proxy client:
// to get updates from server if local cache is enabled;
-// to get callbacks for listener invocation for proxy client.
-region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+if (region.getAttributes().getDataPolicy() != DataPolicy.EMPTY) {
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+}
return region;
}
diff --git
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheTest.java
b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheTest.java
index 32cecd8..cfc1d6b 100644
---
a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/catalina/AbstractSessionCacheTest.java
+++
[geode] branch feature/introduce-codeowners updated: I volunteered
This is an automated email from the ASF dual-hosted git repository. bross pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new 0da5ec1 I volunteered 0da5ec1 is described below commit 0da5ec17b4b8ae62e3e16da6808404ce8cc128af Author: Ben Ross AuthorDate: Mon Dec 14 16:58:14 2020 -0800 I volunteered --- CODEOWNERS | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 24666fc..5334a6f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -137,8 +137,8 @@ geode-core/**/org/apache/geode/internal/cache/event/** @agingade # # Session State: # -extensions/**@sabbey37 @jdeppe-pivotal -geode-core/**/org/apache/geode/internal/modules/util/** @sabbey37 @jdeppe-pivotal +extensions/**@sabbey37 @jdeppe-pivotal @bross +geode-core/**/org/apache/geode/internal/modules/util/** @sabbey37 @jdeppe-pivotal @bross # # DEV rest API @@ -254,8 +254,8 @@ geode-core/**/org/apache/geode/internal/cache/snapshot/** @agingade # JDBC connector # #geode-connectors/** -geode-core/**/org/apache/geode/datasource/** @agingade -geode-core/**/org/apache/geode/internal/datasource/**@agingade +geode-core/**/org/apache/geode/datasource/** @agingade @bross +geode-core/**/org/apache/geode/internal/datasource/**@agingade @bross #
[geode] branch develop updated: GEODE-8789: Prevent region name from being incorrectly logged twice (#5850)
This is an automated email from the ASF dual-hosted git repository.
donalevans pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 1da2e65 GEODE-8789: Prevent region name from being incorrectly logged
twice (#5850)
1da2e65 is described below
commit 1da2e6558d5ea57c25762e25689c2bede1ca3ed2
Author: Donal Evans
AuthorDate: Mon Dec 14 16:55:19 2020 -0800
GEODE-8789: Prevent region name from being incorrectly logged twice (#5850)
- The String containing the reason for the exception should
not contain the region name
Authored-by: Donal Evans
---
.../org/apache/geode/internal/cache/tier/sockets/BaseCommand.java | 6 +++---
.../geode/internal/cache/tier/sockets/command/CreateRegion.java | 4 +---
.../apache/geode/internal/cache/tier/sockets/command/Destroy.java | 3 +--
.../apache/geode/internal/cache/tier/sockets/command/Destroy65.java | 3 +--
.../geode/internal/cache/tier/sockets/command/DestroyRegion.java| 2 +-
.../org/apache/geode/internal/cache/tier/sockets/command/Get70.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Invalidate.java | 3 +--
.../apache/geode/internal/cache/tier/sockets/command/KeySet.java| 3 +--
.../org/apache/geode/internal/cache/tier/sockets/command/Put.java | 3 +--
.../apache/geode/internal/cache/tier/sockets/command/Request.java | 3 +--
.../org/apache/geode/internal/cache/tier/sockets/command/Size.java | 3 +--
11 files changed, 13 insertions(+), 22 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index e8ccbbc..02ef1a7 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -618,10 +618,10 @@ public abstract class BaseCommand implements Command {
errorMsg.send(serverConnection);
}
- protected static void writeRegionDestroyedEx(Message msg, String regionName,
String title,
+ protected static void writeRegionDestroyedEx(Message msg, String regionName,
String reason,
ServerConnection serverConnection) throws IOException {
-String reason = serverConnection.getName() + ": Region named " +
regionName + title;
-RegionDestroyedException ex = new RegionDestroyedException(reason,
regionName);
+String exceptionMessage = serverConnection.getName() + ": Region named " +
regionName + reason;
+RegionDestroyedException ex = new
RegionDestroyedException(exceptionMessage, regionName);
if (serverConnection.getTransientFlag(REQUIRES_CHUNKED_RESPONSE)) {
writeChunkedException(msg, ex, serverConnection);
} else {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
index 4e40720..6c7aa4c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegion.java
@@ -89,9 +89,7 @@ public class CreateRegion extends BaseCommand {
Region parentRegion =
serverConnection.getCache().getRegion(parentRegionName);
if (parentRegion == null) {
- String reason =
- String.format("%s was not found during subregion creation request",
- parentRegionName);
+ String reason = " was not found during subregion creation request";
writeRegionDestroyedEx(clientMessage, parentRegionName, reason,
serverConnection);
serverConnection.setAsTrue(RESPONDED);
return;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
index d356a5c..b0ecfaa 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy.java
@@ -119,8 +119,7 @@ public class Destroy extends BaseCommand {
LocalRegion region = (LocalRegion)
serverConnection.getCache().getRegion(regionName);
if (region == null) {
- String reason = String.format("%s was not found during destroy request",
- regionName);
+ String reason = " was not found during destroy request";
writeRegionDestroyedEx(clientMessage, regionName, reason,
serverConnection);
serverConnection.setAsTrue(RESPONDED);
return;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65.java
[geode] branch develop updated (bda0d3f -> ee835e3)
This is an automated email from the ASF dual-hosted git repository. donalevans pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from bda0d3f GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache add ee835e3 GEODE-8778: Change conserve-sockets default value to false (#5832) No new revisions were added by this update. Summary of changes: .../internal/ClusterDistributionManagerDUnitTest.java| 4 .../org/apache/geode/internal/tcp/CloseConnectionTest.java | 8 +++- .../apache/geode/distributed/ConfigurationProperties.java| 2 +- .../geode/distributed/internal/DistributionConfig.java | 2 +- geode-docs/managing/logging/logging_categories.html.md.erb | 2 +- .../socket_communication_have_enough_sockets.html.md.erb | 2 +- .../managing/monitor_tune/sockets_and_gateways.html.md.erb | 2 +- geode-docs/reference/topics/gemfire_properties.html.md.erb | 4 ++-- .../topics/memory_requirements_for_cache_data.html.md.erb| 12 ++-- .../setting_up_a_multisite_system.html.md.erb| 2 +- 10 files changed, 25 insertions(+), 15 deletions(-)
[geode-native] branch develop updated (3ac51c8 -> 50a441c)
This is an automated email from the ASF dual-hosted git repository. bbender pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 3ac51c8 GEODE-8713: .NET user guide - API reference links - fix redirects when published on Geode website (#709) add 50a441c GEODE-8152, GEODE-8153: replace ACE sockets with boost/asio (#697) No new revisions were added by this update. Summary of changes: cppcache/CMakeLists.txt| 7 + cppcache/integration-test/DeltaEx.hpp | 4 +- cppcache/integration-test/fw_dunit.cpp | 2 +- .../testXmlCacheCreationWithPools.cpp | 31 +- cppcache/integration/test/SslOneWayTest.cpp| 2 +- cppcache/integration/test/SslTwoWayTest.cpp| 29 +- cppcache/integration/test/ThinClientConflation.cpp | 162 ++ cppcache/src/CacheImpl.cpp | 12 + cppcache/src/Connector.hpp | 77 ++- cppcache/src/DistributedSystem.hpp | 2 - cppcache/src/PoolFactory.cpp | 12 +- cppcache/src/ServerLocation.hpp| 2 +- cppcache/src/TcpConn.cpp | 559 + cppcache/src/TcpConn.hpp | 76 ++- cppcache/src/TcpSslConn.cpp| 240 + cppcache/src/TcpSslConn.hpp| 104 ++-- cppcache/src/TcrConnection.cpp | 459 - cppcache/src/TcrConnection.hpp | 87 +--- cppcache/src/TcrConnectionManager.cpp | 24 +- cppcache/src/TcrConnectionManager.hpp | 19 +- cppcache/src/TcrEndpoint.cpp | 34 +- cppcache/src/TcrEndpoint.hpp | 15 +- cppcache/src/ThinClientBaseDM.hpp | 1 + cppcache/src/ThinClientLocatorHelper.cpp | 48 +- cppcache/src/ThinClientLocatorHelper.hpp | 28 +- cppcache/src/ThinClientPoolDM.cpp | 185 --- cppcache/src/ThinClientPoolDM.hpp | 13 +- cppcache/src/ThinClientPoolHADM.cpp| 5 +- cppcache/src/ThinClientPoolHADM.hpp| 2 +- cppcache/src/ThinClientRedundancyManager.cpp | 31 +- cppcache/src/ThinClientRedundancyManager.hpp | 5 +- examples/cmake/FindGeodeNative.cmake.in| 1 - examples/cpp/sslputget/CMakeLists.txt.in | 2 +- examples/dotnet/sslputget/CMakeLists.txt.in| 2 +- tests/cpp/fwklib/TcpIpc.cpp| 15 - tests/cpp/fwklib/TcpIpc.hpp| 1 - 36 files changed, 1288 insertions(+), 1010 deletions(-) create mode 100644 cppcache/integration/test/ThinClientConflation.cpp
[geode] branch develop updated (d8e1b72 -> bda0d3f)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d8e1b72 GEODE-8577: Re-enable PubSubNativeRedisAcceptanceTest (#5847) add bda0d3f GEODE-8781: Added ReconnectListener to PeerToPeerSessionCache No new revisions were added by this update. Summary of changes: .../modules/session/catalina/DeltaSessionManager.java | 6 +- .../session/catalina/PeerToPeerSessionCache.java | 19 +++ 2 files changed, 24 insertions(+), 1 deletion(-)
[geode] branch develop updated (c766af0 -> d8e1b72)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c766af0 GEODE-8766: reduce collisions during hget in AbstractHashesIntegrationTest (#5841) add d8e1b72 GEODE-8577: Re-enable PubSubNativeRedisAcceptanceTest (#5847) No new revisions were added by this update. Summary of changes: geode-redis/build.gradle | 4 .../pubsub/PubSubNativeRedisAcceptanceTest.java| 2 -- .../java/org/apache/geode/NativeRedisTestRule.java | 6 ++ .../pubsub/AbstractPubSubIntegrationTest.java | 25 ++ 4 files changed, 35 insertions(+), 2 deletions(-)
[geode] branch develop updated (da898d7 -> c766af0)
This is an automated email from the ASF dual-hosted git repository. heybales pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from da898d7 GEODE-8780: Increase the default number of function execution threads. (#5837) add c766af0 GEODE-8766: reduce collisions during hget in AbstractHashesIntegrationTest (#5841) No new revisions were added by this update. Summary of changes: .../hash/AbstractHashesIntegrationTest.java| 110 ++--- 1 file changed, 51 insertions(+), 59 deletions(-)
[geode] branch develop updated (4c00984 -> da898d7)
This is an automated email from the ASF dual-hosted git repository. eshu11 pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 4c00984 GEODE-8765: Fix NullPointerException when group-transaction-events an… (#5829) add da898d7 GEODE-8780: Increase the default number of function execution threads. (#5837) No new revisions were added by this update. Summary of changes: .../distributed/internal/OperationExecutors.java | 2 +- .../apache/geode/internal/cache/properties.html| 2 +- .../internal/ClusterOperationExecutorsTest.java| 62 ++ 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterOperationExecutorsTest.java
[geode] branch feature/introduce-codeowners updated: I volunteered
This is an automated email from the ASF dual-hosted git repository. agingade pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new 659b7e1 I volunteered 659b7e1 is described below commit 659b7e1016b08c61e6f313a8d7d1a0801f11f4cb Author: anilkumar gingade AuthorDate: Mon Dec 14 09:08:48 2020 -0800 I volunteered --- CODEOWNERS | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 8d18fdb..24666fc 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -56,8 +56,8 @@ CODEOWNERS @apache/geode-committers #-- # Client Queues #-- -#geode-core/**/org/apache/geode/internal/cache/ha/** -#geode-core/**/org/apache/geode/internal/cache/tier/CacheClient* +geode-core/**/org/apache/geode/internal/cache/ha/** @agingade +geode-core/**/org/apache/geode/internal/cache/tier/CacheClient* @agingade # # Experimental Protobuf based Client/Server @@ -102,7 +102,7 @@ CODEOWNERS @apache/geode-committers # # Event tracking # -#geode-core/**/org/apache/geode/internal/cache/event/** +geode-core/**/org/apache/geode/internal/cache/event/** @agingade # # Eviction @@ -179,7 +179,7 @@ geode-web-api/** @jdeppe-pivotal # #geode-core/**/org/apache/geode/cache/persistence/** #geode-core/**/org/apache/geode/internal/cache/persistence/** -#geode-core/**/org/apache/geode/internal/cache/backup/** +geode-core/**/org/apache/geode/internal/cache/backup/** @agingade # # Region Version Vectors - used for sychronization on @@ -247,15 +247,15 @@ geode-core/**/org/apache/geode/internal/cache/operations/** @jdeppe-pivotal # # Region Snapshots # -#geode-core/**/org/apache/geode/cache/snapshot/** -#geode-core/**/org/apache/geode/internal/cache/snapshot/** +geode-core/**/org/apache/geode/cache/snapshot/** @agingade +geode-core/**/org/apache/geode/internal/cache/snapshot/**@agingade # # JDBC connector # #geode-connectors/** -#geode-core/**/org/apache/geode/datasource/** -#geode-core/**/org/apache/geode/internal/datasource/** +geode-core/**/org/apache/geode/datasource/** @agingade +geode-core/**/org/apache/geode/internal/datasource/**@agingade #
[geode] branch feature/introduce-codeowners updated: Nominate myself for Redis, Management and Security
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new 4111320 Nominate myself for Redis, Management and Security 4111320 is described below commit 411132015228824e51fdca72b618b34cdcf751b5 Author: Jens Deppe AuthorDate: Mon Dec 14 07:38:50 2020 -0800 Nominate myself for Redis, Management and Security --- CODEOWNERS | 52 ++-- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 029d24f..8d18fdb 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -137,13 +137,13 @@ CODEOWNERS @apache/geode-committers # # Session State: # -#extensions/**@sabbey37 -#geode-core/**/org/apache/geode/internal/modules/util/** @sabbey37 +extensions/**@sabbey37 @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/modules/util/** @sabbey37 @jdeppe-pivotal # # DEV rest API # -#geode-web-api/** +geode-web-api/** @jdeppe-pivotal # # Lucene integration @@ -199,32 +199,32 @@ CODEOWNERS @apache/geode-committers # # Management # -#geode-management/** -#geode-web-management/** -#geode-gfsh/** -#geode-pulse/** -#geode-http-service/** -#geode-web/** -#geode-core/**/org/apache/geode/admin/** -#geode-core/**/org/apache/geode/alerting/** -#geode-core/**/org/apache/geode/management/** -#geode-core/**/org/apache/geode/cache/configuration/** -#geode-core/**/org/apache/geode/internal/admin/** -#geode-core/**/org/apache/geode/internal/cache/xmlcache/** -#geode-core/**/org/apache/geode/internal/cache/extension/** -#geode-core/**/org/apache/geode/internal/config/** -#geode-core/**/org/apache/geode/internal/process/** -#geode-core/**/org/apache/geode/cache/internal/* +geode-management/** @jdeppe-pivotal +geode-web-management/** @jdeppe-pivotal +geode-gfsh/**@jdeppe-pivotal +geode-pulse/** @jdeppe-pivotal +geode-http-service/**@jdeppe-pivotal +geode-web/** @jdeppe-pivotal +geode-core/**/org/apache/geode/admin/** @jdeppe-pivotal +geode-core/**/org/apache/geode/alerting/** @jdeppe-pivotal +geode-core/**/org/apache/geode/management/** @jdeppe-pivotal +geode-core/**/org/apache/geode/cache/configuration/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/admin/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/cache/xmlcache/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/cache/extension/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/config/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/process/** @jdeppe-pivotal +geode-core/**/org/apache/geode/cache/internal/* @jdeppe-pivotal # # Security # -#geode-core/**/org/apache/geode/examples/security/** -#geode-core/**/org/apache/geode/examples/** -#geode-core/**/org/apache/geode/security/** -#geode-core/**/org/apache/geode/internal/security/** -#geode-core/**/org/apache/geode/cache/operations/** -#geode-core/**/org/apache/geode/internal/cache/operations/** +geode-core/**/org/apache/geode/examples/security/** @jdeppe-pivotal +geode-core/**/org/apache/geode/examples/** @jdeppe-pivotal +geode-core/**/org/apache/geode/security/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/security/** @jdeppe-pivotal +geode-core/**/org/apache/geode/cache/operations/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/cache/operations/** @jdeppe-pivotal # # Logging @@ -275,7 +275,7 @@ CODEOWNERS @apache/geode-committers # # Redis API # -geode-redis/** @sabbey37 +geode-redis/**
[geode] branch feature/introduce-codeowners updated: Volunteering for Redis and Session State
This is an automated email from the ASF dual-hosted git repository. sabbey37 pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new 51a97fd Volunteering for Redis and Session State 51a97fd is described below commit 51a97fd67e557ea962a0e9665dad1065648820d0 Author: Sarah AuthorDate: Mon Dec 14 10:21:02 2020 -0500 Volunteering for Redis and Session State --- CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 045fad7..029d24f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -137,8 +137,8 @@ CODEOWNERS @apache/geode-committers # # Session State: # -#extensions/** -#geode-core/**/org/apache/geode/internal/modules/util/** +#extensions/**@sabbey37 +#geode-core/**/org/apache/geode/internal/modules/util/** @sabbey37 # # DEV rest API @@ -275,7 +275,7 @@ CODEOWNERS @apache/geode-committers # # Redis API # -#geode-redis/** +geode-redis/** @sabbey37 # # Build and tooling
[geode] branch feature/introduce-codeowners updated: Revert "Nominate myself for Redis, Management and Security"
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new cf885ec Revert "Nominate myself for Redis, Management and Security" cf885ec is described below commit cf885ecefda57b22fdab60f8808ade7469e1d580 Author: Jens Deppe AuthorDate: Mon Dec 14 07:19:14 2020 -0800 Revert "Nominate myself for Redis, Management and Security" This reverts commit e5b933046cf5da46c17043d55c4600cfc45c3962. --- CODEOWNERS | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 6906283..045fad7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -143,7 +143,7 @@ CODEOWNERS @apache/geode-committers # # DEV rest API # -geode-web-api/** @jdeppe-pivotal +#geode-web-api/** # # Lucene integration @@ -199,22 +199,22 @@ geode-web-api/** @jdeppe-pivotal # # Management # -geode-management/** @jdeppe-pivotal -geode-web-management/** @jdeppe-pivotal -geode-gfsh/**@jdeppe-pivotal -geode-pulse/** @jdeppe-pivotal -geode-http-service/**@jdeppe-pivotal -geode-web/** @jdeppe-pivotal -geode-core/**/org/apache/geode/admin/** @jdeppe-pivotal -geode-core/**/org/apache/geode/alerting/** @jdeppe-pivotal -geode-core/**/org/apache/geode/management/** @jdeppe-pivotal -geode-core/**/org/apache/geode/cache/configuration/**@jdeppe-pivotal -geode-core/**/org/apache/geode/internal/admin/** @jdeppe-pivotal -geode-core/**/org/apache/geode/internal/cache/xmlcache/**@jdeppe-pivotal -geode-core/**/org/apache/geode/internal/cache/extension/** @jdeppe-pivotal -geode-core/**/org/apache/geode/internal/config/**@jdeppe-pivotal -geode-core/**/org/apache/geode/internal/process/** @jdeppe-pivotal -geode-core/**/org/apache/geode/cache/internal/* @jdeppe-pivotal +#geode-management/** +#geode-web-management/** +#geode-gfsh/** +#geode-pulse/** +#geode-http-service/** +#geode-web/** +#geode-core/**/org/apache/geode/admin/** +#geode-core/**/org/apache/geode/alerting/** +#geode-core/**/org/apache/geode/management/** +#geode-core/**/org/apache/geode/cache/configuration/** +#geode-core/**/org/apache/geode/internal/admin/** +#geode-core/**/org/apache/geode/internal/cache/xmlcache/** +#geode-core/**/org/apache/geode/internal/cache/extension/** +#geode-core/**/org/apache/geode/internal/config/** +#geode-core/**/org/apache/geode/internal/process/** +#geode-core/**/org/apache/geode/cache/internal/* # # Security @@ -275,7 +275,7 @@ geode-core/**/org/apache/geode/cache/internal/* @jdeppe-pivotal # # Redis API # -geode-redis/** @jdeppe-pivotal +#geode-redis/** # # Build and tooling
[geode] branch feature/introduce-codeowners updated: Nominate myself for Redis, Management and Security
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch feature/introduce-codeowners in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/introduce-codeowners by this push: new e5b9330 Nominate myself for Redis, Management and Security e5b9330 is described below commit e5b933046cf5da46c17043d55c4600cfc45c3962 Author: Jens Deppe AuthorDate: Mon Dec 14 07:09:42 2020 -0800 Nominate myself for Redis, Management and Security --- CODEOWNERS | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 045fad7..6906283 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -143,7 +143,7 @@ CODEOWNERS @apache/geode-committers # # DEV rest API # -#geode-web-api/** +geode-web-api/** @jdeppe-pivotal # # Lucene integration @@ -199,22 +199,22 @@ CODEOWNERS @apache/geode-committers # # Management # -#geode-management/** -#geode-web-management/** -#geode-gfsh/** -#geode-pulse/** -#geode-http-service/** -#geode-web/** -#geode-core/**/org/apache/geode/admin/** -#geode-core/**/org/apache/geode/alerting/** -#geode-core/**/org/apache/geode/management/** -#geode-core/**/org/apache/geode/cache/configuration/** -#geode-core/**/org/apache/geode/internal/admin/** -#geode-core/**/org/apache/geode/internal/cache/xmlcache/** -#geode-core/**/org/apache/geode/internal/cache/extension/** -#geode-core/**/org/apache/geode/internal/config/** -#geode-core/**/org/apache/geode/internal/process/** -#geode-core/**/org/apache/geode/cache/internal/* +geode-management/** @jdeppe-pivotal +geode-web-management/** @jdeppe-pivotal +geode-gfsh/**@jdeppe-pivotal +geode-pulse/** @jdeppe-pivotal +geode-http-service/**@jdeppe-pivotal +geode-web/** @jdeppe-pivotal +geode-core/**/org/apache/geode/admin/** @jdeppe-pivotal +geode-core/**/org/apache/geode/alerting/** @jdeppe-pivotal +geode-core/**/org/apache/geode/management/** @jdeppe-pivotal +geode-core/**/org/apache/geode/cache/configuration/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/admin/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/cache/xmlcache/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/cache/extension/** @jdeppe-pivotal +geode-core/**/org/apache/geode/internal/config/**@jdeppe-pivotal +geode-core/**/org/apache/geode/internal/process/** @jdeppe-pivotal +geode-core/**/org/apache/geode/cache/internal/* @jdeppe-pivotal # # Security @@ -275,7 +275,7 @@ CODEOWNERS @apache/geode-committers # # Redis API # -#geode-redis/** +geode-redis/** @jdeppe-pivotal # # Build and tooling
[geode] branch develop updated: GEODE-8765: Fix NullPointerException when group-transaction-events an… (#5829)
This is an automated email from the ASF dual-hosted git repository.
mkevo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4c00984 GEODE-8765: Fix NullPointerException when
group-transaction-events an… (#5829)
4c00984 is described below
commit 4c00984eb3c32972b4b03fdbe2b6397decdc177f
Author: Alberto Gomez
AuthorDate: Mon Dec 14 10:56:31 2020 +0100
GEODE-8765: Fix NullPointerException when group-transaction-events an…
(#5829)
* GEODE-8765: Fix NullPointerException when group-transaction-events and
events in and not in transactions are sent.
---
.../wan/parallel/ParallelGatewaySenderQueue.java | 60 +---
.../cache/wan/serial/SerialGatewaySenderQueue.java | 58
.../internal/cache/BucketRegionQueueJUnitTest.java | 41 +++---
.../parallel/ParallelWANPropagationDUnitTest.java | 137 --
...lWANPropagation_PartitionedRegionDUnitTest.java | 160 ++---
5 files changed, 351 insertions(+), 105 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 18c1624..2100d54 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1260,7 +1260,6 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
addPeekedEvents(batch, batchSize == BATCH_BASED_ON_TIME_ONLY ?
DEFAULT_BATCH_SIZE : batchSize);
int bId;
-Map incompleteTransactionsInBatch = new
HashMap<>();
while (batchSize == BATCH_BASED_ON_TIME_ONLY || batch.size() < batchSize) {
if (areLocalBucketQueueRegionsPresent() && ((bId =
getRandomPrimaryBucket(prQ)) != -1)) {
GatewaySenderEventImpl object = (GatewaySenderEventImpl)
peekAhead(prQ, bId);
@@ -1280,13 +1279,6 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
logger.debug("The gatewayEventImpl in peek is {}", object);
}
batch.add(object);
- if (object.getTransactionId() != null) {
-if (object.isLastEventInTransaction()) {
- incompleteTransactionsInBatch.remove(object.getTransactionId());
-} else {
- incompleteTransactionsInBatch.put(object.getTransactionId(),
bId);
-}
- }
peekedEvents.add(object);
} else {
@@ -1316,7 +1308,7 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
}
if (batch.size() > 0) {
- peekEventsFromIncompleteTransactions(batch,
incompleteTransactionsInBatch, prQ);
+ peekEventsFromIncompleteTransactions(batch, prQ);
}
if (isDebugEnabled) {
@@ -1351,12 +1343,14 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
}
private void
peekEventsFromIncompleteTransactions(List batch,
- Map incompleteTransactionIdsInBatch,
PartitionedRegion prQ) {
+ PartitionedRegion prQ) {
if (!mustGroupTransactionEvents()) {
return;
}
-if (areAllTransactionsCompleteInBatch(incompleteTransactionIdsInBatch)) {
+Map incompleteTransactionIdsInBatch =
+getIncompleteTransactionsInBatch(batch);
+if (incompleteTransactionIdsInBatch.size() == 0) {
return;
}
@@ -1389,8 +1383,19 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
}
}
- private boolean areAllTransactionsCompleteInBatch(Map
incompleteTransactions) {
-return (incompleteTransactions.size() == 0);
+ private Map getIncompleteTransactionsInBatch(
+ List batch) {
+Map incompleteTransactionsInBatch = new
HashMap<>();
+for (GatewaySenderEventImpl event : batch) {
+ if (event.getTransactionId() != null) {
+if (event.isLastEventInTransaction()) {
+ incompleteTransactionsInBatch.remove(event.getTransactionId());
+} else {
+ incompleteTransactionsInBatch.put(event.getTransactionId(),
event.getBucketId());
+}
+ }
+}
+return incompleteTransactionsInBatch;
}
@VisibleForTesting
@@ -1472,19 +1477,18 @@ public class ParallelGatewaySenderQueue implements
RegionQueue {
for (int i = 0; i < batchSize || incompleteTransactionsInBatch.size() !=
0; i++) {
GatewaySenderEventImpl event = this.peekedEventsProcessing.remove();
batch.add(event);
- if (event.getTransactionId() != null) {
-if (event.isLastEventInTransaction()) {
- incompleteTransactionsInBatch.remove(event.getTransactionId());
-} else {
- incompleteTransactionsInBatch.add(event.getTransactionId());
+ if (mustGroupTransactionEvents()) {
+if
