[geode] branch develop updated: GEODE-5069: Reduce direct exposure of GfJsonObject from CommandResult (#1795)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 b52492c GEODE-5069: Reduce direct exposure of GfJsonObject from
CommandResult (#1795)
b52492c is described below
commit b52492c43de7d220a90c9cd914ef710ab331546e
Author: Jens Deppe
AuthorDate: Mon Apr 16 06:43:13 2018 -0700
GEODE-5069: Reduce direct exposure of GfJsonObject from CommandResult
(#1795)
- Methods getGfJsonObject() and getTableContent() are now private.
- getContent() is still public but only used by CommandResponseBuilder. This
will change in subsequent PRs.
---
.../management/internal/cli/json/GfJsonObject.java | 15
.../internal/cli/result/CommandResult.java | 75 +++--
.../commands/CreateDefinedIndexesCommandTest.java | 8 +-
.../cli/commands/CreateIndexCommandTest.java | 14 ++--
.../cli/commands/CreateRegionCommandTest.java | 22 ++---
.../cli/commands/DescribeRegionDUnitTest.java | 66 +++
.../cli/commands/DescribeRegionJUnitTest.java | 56 +++--
.../commands/ListJndiBindingCommandDUnitTest.java | 16 ++--
.../cli/commands/ShowMetricsJUnitTest.java | 6 +-
.../GfshStatusCommandsIntegrationTest.java | 8 +-
.../internal/cli/result/ResultBuilderTest.java | 93 ++
.../ClusterConfigImportDUnitTest.java | 6 +-
.../security/GfshCommandsSecurityTest.java | 10 +--
.../internal/security/MultiGfshDUnitTest.java | 2 +-
.../geode/test/junit/rules/GfshCommandRule.java| 13 ++-
15 files changed, 235 insertions(+), 175 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
index 900b3e0..78e466f 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonObject.java
@@ -14,10 +14,12 @@
*/
package org.apache.geode.management.internal.cli.json;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.json.JSONArray;
@@ -307,6 +309,19 @@ public class GfJsonObject {
}
}
+ public List getArrayValues(String key) {
+List result = new ArrayList<>();
+if (jsonObject.has(key)) {
+ JSONArray jsonArray = jsonObject.getJSONArray(key);
+
+ for (int i = 0; i < jsonArray.length(); i++) {
+result.add(jsonArray.getString(i));
+ }
+}
+
+return result;
+ }
+
private static Object extractInternalForGfJsonOrReturnSame(Object value) {
Object returnedValue = value;
if (value instanceof GfJsonObject) {
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
index f13cfc0..b6e8903 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/CommandResult.java
@@ -18,13 +18,16 @@ import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.Vector;
import java.util.stream.Collectors;
import java.util.zip.DataFormatException;
import org.apache.logging.log4j.Logger;
import org.json.JSONArray;
+import org.json.JSONObject;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.Result;
@@ -88,7 +91,7 @@ public class CommandResult implements Result {
return ResultBuilder.getReadOnlyResultData(resultData);
}
- GfJsonObject getGfJsonObject() {
+ private GfJsonObject getGfJsonObject() {
return gfJsonObject;
}
@@ -442,14 +445,74 @@ public class CommandResult implements Result {
return gfJsonObject.getJSONObject(ResultData.RESULT_CONTENT);
}
+ public String getContentAsString() {
+return getContent().toString();
+ }
+
+ public String getMessageFromContent() {
+return getContent().getString("message");
+ }
+
+ public String getValueFromContent(String key) {
+return getContent().get(key).toString();
+ }
+
+ public List getListFromContent(String key) {
+return getContent().getArrayValues(key);
+ }
+
+ public List getColumnFromTableContent(String column, int...
sectionAndTableIDs) {
+List ids =
+
Arrays.stream(sectionAndTableIDs).mapToObj(Integer::toString).collect(Collectors.toList());
+return CommandResul
[geode] branch release/1.6.0 updated: GEODE-5068: bump Jackson version. (#1796) (#1801)
This is an automated email from the ASF dual-hosted git repository. gosullivan pushed a commit to branch release/1.6.0 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/release/1.6.0 by this push: new 7dcc313 GEODE-5068: bump Jackson version. (#1796) (#1801) 7dcc313 is described below commit 7dcc313271fc4e58fdee6f6994b32b5b17500d74 Author: Galen O'Sullivan AuthorDate: Mon Apr 16 09:45:26 2018 -0700 GEODE-5068: bump Jackson version. (#1796) (#1801) GEODE-5068: bump Jackson version to 2.9.5. --- geode-assembly/src/main/dist/NOTICE | 2 +- geode-pulse/src/main/webapp/META-INF/NOTICE | 2 +- geode-web-api/src/main/webapp/META-INF/NOTICE | 2 +- gradle/dependency-versions.properties | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE index 18b276c..84b48ac 100644 --- a/geode-assembly/src/main/dist/NOTICE +++ b/geode-assembly/src/main/dist/NOTICE @@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@ * Brian Langel -Jackson Core 2.9.4 +Jackson Core 2.9.5 # Jackson JSON processor diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE index 3abc660..5699a9e 100644 --- a/geode-pulse/src/main/webapp/META-INF/NOTICE +++ b/geode-pulse/src/main/webapp/META-INF/NOTICE @@ -20,7 +20,7 @@ Copyright 2016 AddThis This product includes software developed by the MX4J project (http://mx4j.sourceforge.net). -Jackson Core 2.9.4 +Jackson Core 2.9.5 # Jackson JSON processor diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE index b09a4ea..bea2469 100644 --- a/geode-web-api/src/main/webapp/META-INF/NOTICE +++ b/geode-web-api/src/main/webapp/META-INF/NOTICE @@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@ * Brian Langel -Jackson Core 2.9.4 +Jackson Core 2.9.5 # Jackson JSON processor diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties index 40cda59..d22a670 100644 --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@ -43,8 +43,8 @@ hamcrest-all.version = 1.3 httpclient.version = 4.5.3 httpcore.version = 4.4.6 httpunit.version = 1.7.2 -jackson.version = 2.9.4 -jackson-module-scala_2.10.version = 2.9.4 +jackson.version = 2.9.5 +jackson-module-scala_2.10.version = 2.9.5 jansi.version = 1.17 javassist.version = 3.21.0-GA javax.ejb-api.version = 3.0 -- To stop receiving notification emails like this one, please contact gosulli...@apache.org.
[geode] branch release/1.6.0 updated: GEODE-5046: Handle RegionDestroyedException in RemotePutMessage to re… (#1773)
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch release/1.6.0
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.6.0 by this push:
new e6e820d GEODE-5046: Handle RegionDestroyedException in
RemotePutMessage to re… (#1773)
e6e820d is described below
commit e6e820df0caca4bfc5369725c2bff0cb2c6381f2
Author: pivotal-eshu
AuthorDate: Thu Apr 12 09:50:26 2018 -0700
GEODE-5046: Handle RegionDestroyedException in RemotePutMessage to re…
(#1773)
cherry-pick 2203273307a8695dafc3b617cac9979ff0305f9b
---
.../geode/internal/cache/tx/RemotePutMessage.java | 6 +-
.../internal/cache/tx/RemotePutMessageTest.java| 69 ++
2 files changed, 73 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutMessage.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutMessage.java
index 06418da..843034a 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutMessage.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemotePutMessage.java
@@ -33,6 +33,7 @@ import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.EntryExistsException;
import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.TransactionDataNotColocatedException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
@@ -311,10 +312,11 @@ public class RemotePutMessage extends
RemoteOperationMessageWithDirectReply
}
successful = true; // not a cancel-exception, so don't complain any
more about it
- } catch (RemoteOperationException e) {
+ } catch (RegionDestroyedException | RemoteOperationException e) {
if (logger.isTraceEnabled(LogMarker.DM_VERBOSE)) {
logger.trace(LogMarker.DM_VERBOSE,
- "RemotePutMessage caught an unexpected exception during
distribution", e);
+ "RemotePutMessage caught an exception during distribution;
retrying to another member",
+ e);
}
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
new file mode 100644
index 000..63bab9a
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.internal.cache.tx;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import org.apache.geode.cache.RegionDestroyedException;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.CacheDistributionAdvisor;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.RemoteOperationException;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+@PowerMockIgnore("*.UnitTest")
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(RemotePutMessage.class)
+public class RemotePutMessageTest {
+ @Test
+ public void testDistributeNotFailWithRegionDestroyedException() throws
RemoteOperationException {
+EntryEventImpl event = mock(EntryEventImpl.class);
+DistributedRegion region = mock(DistributedRegion.class);
+CacheDistributionAdvisor advisor = mock(CacheDistri
[geode] branch feature/GEODE-5081 created (now 948ca60)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-5081 in repository https://gitbox.apache.org/repos/asf/geode.git. at 948ca60 GEODE-5081 ClientCacheFactory is missing the setPoolSubscriptionTimeoutMultiplier() This branch includes the following new commits: new 948ca60 GEODE-5081 ClientCacheFactory is missing the setPoolSubscriptionTimeoutMultiplier() The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact bschucha...@apache.org.
[geode] 01/01: GEODE-5081 ClientCacheFactory is missing the setPoolSubscriptionTimeoutMultiplier()
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5081
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 948ca6038cddda8381c61598a96c9fa8ded78d27
Author: Bruce Schuchardt
AuthorDate: Mon Apr 16 09:58:31 2018 -0700
GEODE-5081 ClientCacheFactory is missing the
setPoolSubscriptionTimeoutMultiplier()
Added the missing method & a test for it
---
.../geode/cache/client/ClientCacheFactory.java | 15
.../cache/client/ClientCacheFactoryJUnitTest.java | 87 --
.../cache/tier/sockets/CacheServerTestUtil.java| 1 +
3 files changed, 65 insertions(+), 38 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
index 4da8e77..efd4efb 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/ClientCacheFactory.java
@@ -537,6 +537,21 @@ public class ClientCacheFactory {
}
/**
+ * A server has an inactivity monitor that ensures a message is sent to a
client at least once a
+ * minute (60,000 milliseconds). If a subscription timeout multipler is set
in the client it
+ * enables timing out of the subscription feed with failover to another
server.
+ *
+ * A value of zero (the default) disables timeouts
+ *
+ * The resulting timeout will be multiplied by 1.25 in order to avoid race
conditions with the
+ * server sending its "ping" message.
+ */
+ public ClientCacheFactory setPoolSubscriptionTimeoutMultiplier(int
multiplier) {
+getPoolFactory().setSubscriptionTimeoutMultiplier(multiplier);
+return this;
+ }
+
+ /**
* Sets the messageTrackingTimeout attribute which is the time-to-live
period, in milliseconds,
* for subscription events the client has received from the server. It's
used to minimize
* duplicate events. Entries that have not been modified for this amount of
time are expired from
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index c352a6c..6b65df2 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -68,13 +68,14 @@ import
org.apache.geode.test.junit.categories.IntegrationTest;
@Category({IntegrationTest.class, ClientServerTest.class})
public class ClientCacheFactoryJUnitTest {
- private ClientCache cc;
+ private ClientCache clientCache;
private File tmpFile;
@After
public void tearDown() throws Exception {
-if (this.cc != null && !this.cc.isClosed()) {
- cc.close();
+System.out.println("tearDown");
+if (this.clientCache != null && !this.clientCache.isClosed()) {
+ clientCache.close();
}
if (tmpFile != null && tmpFile.exists()) {
tmpFile.delete();
@@ -91,10 +92,10 @@ public class ClientCacheFactoryJUnitTest {
@Test
public void test000Defaults() throws Exception {
-this.cc = new ClientCacheFactory().create();
-GemFireCacheImpl gfc = (GemFireCacheImpl) this.cc;
+this.clientCache = new ClientCacheFactory().create();
+GemFireCacheImpl gfc = (GemFireCacheImpl) this.clientCache;
assertEquals(true, gfc.isClient());
-Properties dsProps = this.cc.getDistributedSystem().getProperties();
+Properties dsProps =
this.clientCache.getDistributedSystem().getProperties();
assertEquals("0", dsProps.getProperty(MCAST_PORT));
assertEquals("", dsProps.getProperty(LOCATORS));
Pool defPool = gfc.getDefaultPool();
@@ -107,8 +108,8 @@ public class ClientCacheFactoryJUnitTest {
assertEquals(PoolFactory.DEFAULT_SOCKET_CONNECT_TIMEOUT,
defPool.getSocketConnectTimeout());
ClientCache cc2 = new ClientCacheFactory().create();
-if (cc2 != this.cc) {
- fail("expected cc2 and cc to be == " + cc2 + this.cc);
+if (cc2 != this.clientCache) {
+ fail("expected cc2 and cc to be == " + cc2 + this.clientCache);
}
try {
@@ -131,10 +132,11 @@ public class ClientCacheFactoryJUnitTest {
URL url = ClientCacheFactoryJUnitTest.class
.getResource("ClientCacheFactoryJUnitTest_single_pool.xml");;
FileUtils.copyFile(new File(url.getFile()), this.tmpFile);
-this.cc = new ClientCacheFactory().set(CACHE_XML_FILE,
this.tmpFile.getAbsolutePath()).create();
-GemFireCacheImpl gfc = (GemFireCacheImpl) this.cc;
+this.clientCache =
+new ClientCacheFactory().set(CACHE_XML_FILE,
this.tmpFile.getAbsolutePath()).create();
+GemFireCacheImpl gfc = (GemFireCacheImpl) this.clientCache;
assertEquals(true, gfc.isClient());
-Properties dsProps = this.cc.getDistributedSystem().g
[geode] branch feature/GEODE-5057 deleted (was 3291e7d)
This is an automated email from the ASF dual-hosted git repository. agingade pushed a change to branch feature/GEODE-5057 in repository https://gitbox.apache.org/repos/asf/geode.git. was 3291e7d Merge branch 'develop' into feature/GEODE-5057 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact aging...@apache.org.
[geode] branch develop updated: GEODE-5057: Removed experimental tag from Jdbc connector code base (#1789)
This is an automated email from the ASF dual-hosted git repository.
agingade 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 4e249f7 GEODE-5057: Removed experimental tag from Jdbc connector code
base (#1789)
4e249f7 is described below
commit 4e249f7c2f834a056a85b14de8728bce60d73e27
Author: agingade
AuthorDate: Mon Apr 16 10:23:09 2018 -0700
GEODE-5057: Removed experimental tag from Jdbc connector code base (#1789)
* GEODE-5057: Removed experimental tag from Jdbc connector
---
geode-connectors/build.gradle | 3 ++-
.../org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java | 6 +++---
.../geode/connectors/jdbc/JdbcConnectorException.java | 8
.../java/org/apache/geode/connectors/jdbc/JdbcLoader.java | 3 +--
.../java/org/apache/geode/connectors/jdbc/JdbcWriter.java | 3 +--
.../connectors/jdbc/internal/AbstractJdbcCallback.java | 3 +--
.../jdbc/internal/ConnectionConfigExistsException.java | 3 ---
.../jdbc/internal/ConnectionConfigNotFoundException.java | 3 ---
.../connectors/jdbc/internal/JdbcConnectorService.java | 3 +--
.../connectors/jdbc/internal/JdbcConnectorServiceImpl.java | 3 +--
.../jdbc/internal/RegionMappingExistsException.java| 3 ---
.../jdbc/internal/RegionMappingNotFoundException.java | 3 ---
.../apache/geode/connectors/jdbc/internal/SqlHandler.java | 3 +--
.../connectors/jdbc/internal/SqlToPdxInstanceCreator.java | 3 +--
.../jdbc/internal/cli/AlterConnectionCommand.java | 8 ++--
.../jdbc/internal/cli/AlterConnectionFunction.java | 4 ++--
.../connectors/jdbc/internal/cli/AlterMappingCommand.java | 9 ++---
.../connectors/jdbc/internal/cli/AlterMappingFunction.java | 3 +--
.../jdbc/internal/cli/CreateConnectionCommand.java | 11 ++-
.../jdbc/internal/cli/CreateConnectionFunction.java| 3 +--
.../connectors/jdbc/internal/cli/CreateMappingCommand.java | 6 ++
.../jdbc/internal/cli/CreateMappingFunction.java | 2 --
.../jdbc/internal/cli/DescribeConnectionCommand.java | 11 +++
.../jdbc/internal/cli/DescribeMappingCommand.java | 12 +++-
.../jdbc/internal/cli/DestroyConnectionCommand.java| 9 ++---
.../jdbc/internal/cli/DestroyConnectionFunction.java | 3 +--
.../jdbc/internal/cli/DestroyMappingCommand.java | 6 ++
.../jdbc/internal/cli/DestroyMappingFunction.java | 3 +--
.../connectors/jdbc/internal/cli/JdbcCliFunction.java | 2 --
.../jdbc/internal/cli/ListConnectionCommand.java | 11 ---
.../connectors/jdbc/internal/cli/ListMappingCommand.java | 10 --
.../jdbc/internal/configuration/ConnectorService.java | 2 --
.../connectors/jdbc/JdbcAsyncWriterIntegrationTest.java| 11 +--
.../geode/connectors/jdbc/JdbcConnectorExceptionTest.java | 2 +-
.../geode/connectors/jdbc/internal/SqlHandlerTest.java | 1 -
.../jdbc/internal/cli/AlterConnectionCommandDUnitTest.java | 12 +++-
.../jdbc/internal/cli/AlterConnectionFunctionTest.java | 10 +-
.../jdbc/internal/cli/AlterMappingFunctionTest.java| 10 +-
.../cli/CreateConnectionCommandIntegrationTest.java| 14 --
.../internal/cli/CreateMappingCommandIntegrationTest.java | 14 --
.../internal/cli/DescribeConnectionCommandDUnitTest.java | 3 +--
.../jdbc/internal/cli/DescribeMappingCommandDUnitTest.java | 3 +--
.../jdbc/internal/cli/ListConnectionCommandTest.java | 4 ++--
.../jdbc/internal/cli/ListMappingCommandTest.java | 4 ++--
44 files changed, 117 insertions(+), 136 deletions(-)
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f4dbb5e..c5423b9 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -17,7 +17,8 @@
repositories {
maven {
-url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule
is published on bintray
+url 'https://dl.bintray.com/palantir/releases'
+// docker-compose-rule is published on bintray
}
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
index e36469d..169e65d 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CopyHelper;
-import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventL
[geode-native] branch develop updated: GEODE-4410: Move StatisticsManager from DistributedSystem to Cache. (#273)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new e8b9cb1 GEODE-4410: Move StatisticsManager from DistributedSystem to
Cache. (#273)
e8b9cb1 is described below
commit e8b9cb1beb91cf93d0c317c7e358ebb5533ee80d
Author: Michael Martell
AuthorDate: Mon Apr 16 13:11:51 2018 -0700
GEODE-4410: Move StatisticsManager from DistributedSystem to Cache. (#273)
---
cppcache/include/geode/DistributedSystem.hpp | 2 --
cppcache/src/AdminRegion.cpp | 6 +-
cppcache/src/CacheImpl.cpp | 18 +-
cppcache/src/CacheImpl.hpp | 6 ++
cppcache/src/DistributedSystem.cpp | 4
cppcache/src/DistributedSystemImpl.cpp | 17 -
cppcache/src/DistributedSystemImpl.hpp | 5 -
cppcache/src/LocalRegion.cpp | 6 ++
cppcache/src/RemoteQueryService.cpp | 5 ++---
cppcache/src/ThinClientPoolDM.cpp| 12
cppcache/src/statistics/PoolStatsSampler.cpp | 5 ++---
11 files changed, 34 insertions(+), 52 deletions(-)
diff --git a/cppcache/include/geode/DistributedSystem.hpp
b/cppcache/include/geode/DistributedSystem.hpp
index c4822ac..0242219 100644
--- a/cppcache/include/geode/DistributedSystem.hpp
+++ b/cppcache/include/geode/DistributedSystem.hpp
@@ -97,8 +97,6 @@ class APACHE_GEODE_EXPORT DistributedSystem {
*/
const std::string& getName() const;
- statistics::StatisticsManager* getStatisticsManager() const;
-
protected:
/**
* @brief constructors
diff --git a/cppcache/src/AdminRegion.cpp b/cppcache/src/AdminRegion.cpp
index e2610e7..9a4bdf0 100644
--- a/cppcache/src/AdminRegion.cpp
+++ b/cppcache/src/AdminRegion.cpp
@@ -39,11 +39,7 @@ std::shared_ptr AdminRegion::create(CacheImpl*
cache,
if (!distMan) {
adminRegion->m_distMngr =
new
ThinClientCacheDistributionManager(*adminRegion->m_connectionMgr);
- auto mngr = cache->getDistributedSystem().getStatisticsManager();
- if (mngr) {
-// Register it with StatisticsManager
-mngr->RegisterAdminRegion(adminRegion);
- }
+ cache->getStatisticsManager().RegisterAdminRegion(adminRegion);
} else {
adminRegion->m_distMngr = distMan;
}
diff --git a/cppcache/src/CacheImpl.cpp b/cppcache/src/CacheImpl.cpp
index b475ba3..330933c 100644
--- a/cppcache/src/CacheImpl.cpp
+++ b/cppcache/src/CacheImpl.cpp
@@ -52,6 +52,7 @@ CacheImpl::CacheImpl(Cache* c, DistributedSystem&&
distributedSystem,
m_readPdxSerialized(readPdxSerialized),
m_expiryTaskManager(
std::unique_ptr(new ExpiryTaskManager())),
+ m_statisticsManager(nullptr),
m_closed(false),
m_initialized(false),
m_distributedSystem(std::move(distributedSystem)),
@@ -72,6 +73,7 @@ CacheImpl::CacheImpl(Cache* c, DistributedSystem&&
distributedSystem,
m_threadPool(new ThreadPool(
m_distributedSystem.getSystemProperties().threadPoolSize())),
m_authInitialize(authInitialize) {
+
m_cacheTXManager = std::shared_ptr(
new InternalCacheTransactionManager2PCImpl(this));
@@ -89,6 +91,19 @@ CacheImpl::CacheImpl(Cache* c, DistributedSystem&&
distributedSystem,
m_initialized = true;
m_pdxTypeRegistry = std::make_shared(this);
m_poolManager = std::unique_ptr(new PoolManager(this));
+
+ try {
+m_statisticsManager =
+std::unique_ptr(new StatisticsManager(
+prop.statisticsArchiveFile().c_str(),
+prop.statisticsSampleInterval(), prop.statisticsEnabled(), this,
+prop.statsFileSizeLimit(), prop.statsDiskSpaceLimit()));
+m_cacheStats =
+new CachePerfStats(m_statisticsManager->getStatisticsFactory());
+ } catch (const NullPointerException&) {
+Log::close();
+throw;
+ }
}
void CacheImpl::initServices() {
@@ -220,7 +235,8 @@ const std::string& CacheImpl::getName() const {
bool CacheImpl::isClosed() const { return m_closed; }
-void CacheImpl::setAttributes(const std::shared_ptr&
attributes) {
+void CacheImpl::setAttributes(
+const std::shared_ptr& attributes) {
if (m_attributes == nullptr && attributes != nullptr) {
m_attributes = attributes;
}
diff --git a/cppcache/src/CacheImpl.hpp b/cppcache/src/CacheImpl.hpp
index 7308a89..efeb409 100644
--- a/cppcache/src/CacheImpl.hpp
+++ b/cppcache/src/CacheImpl.hpp
@@ -273,6 +273,10 @@ class APACHE_GEODE_EXPORT CacheImpl : private NonCopyable,
return m_authInitialize;
}
+ statistics::StatisticsManager& getStatisticsManager() const {
+return *(m_statisticsManager.get());
+ }
+
virtual std::unique_ptr createDataOutput() const;
virtual std::unique_ptr createDataOutput(Pool* pool) const;
@@ -297,6 +301,8 @@ class APACHE_GEODE_EXPORT CacheImpl : private
[geode] 01/01: GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4647
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 613aae452a8e3067bd85a77fdfce6b963b9e23e3
Author: zhouxh
AuthorDate: Wed Feb 21 21:31:07 2018 -0800
GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in
secondary
gateway sender queue
---
.../asyncqueue/internal/AsyncEventQueueStats.java | 3 +
.../internal/cache/AbstractBucketRegionQueue.java | 8 ++
.../geode/internal/cache/AbstractRegionMap.java| 12 ++
.../apache/geode/internal/cache/BucketAdvisor.java | 2 +
.../geode/internal/cache/BucketRegionQueue.java| 2 +
.../internal/cache/wan/AbstractGatewaySender.java | 1 +
.../internal/cache/wan/GatewaySenderStats.java | 61 +
.../wan/parallel/ParallelGatewaySenderQueue.java | 8 +-
.../wan/parallel/ParallelQueueRemovalMessage.java | 3 +
.../SerialAsyncEventQueueImplJUnitTest.java| 3 +
.../cache/wan/AsyncEventQueueTestBase.java | 18 ++-
.../asyncqueue/AsyncEventListenerDUnitTest.java| 8 +-
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 48 +--
.../ParallelQueueRemovalMessageJUnitTest.java | 12 ++
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 2 -
.../geode/internal/cache/wan/WANTestBase.java | 79 +--
.../parallel/ParallelWANConflationDUnitTest.java | 56 ++--
.../wan/parallel/ParallelWANStatsDUnitTest.java| 150 +
.../serial/SerialGatewaySenderQueueDUnitTest.java | 12 +-
.../wan/serial/SerialWANConflationDUnitTest.java | 73 +-
.../wan/serial/SerialWANPropagationDUnitTest.java | 1 +
21 files changed, 517 insertions(+), 45 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
index 2f3029a..8d68cee 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
@@ -42,6 +42,8 @@ public class AsyncEventQueueStats extends GatewaySenderStats {
f.createLongCounter(EVENT_QUEUE_TIME, "Total time spent queueing
events.",
"nanoseconds"),
f.createIntGauge(EVENT_QUEUE_SIZE, "Size of the event queue.",
"operations", false),
+f.createIntGauge(EVENT_SECONDARY_QUEUE_SIZE, "Size of the
secondary event queue.",
+"operations", false),
f.createIntGauge(TMP_EVENT_QUEUE_SIZE, "Size of the temporary
events queue.",
"operations", false),
f.createIntCounter(EVENTS_NOT_QUEUED_CONFLATED,
@@ -108,6 +110,7 @@ public class AsyncEventQueueStats extends
GatewaySenderStats {
eventsNotQueuedConflatedId = type.nameToId(EVENTS_NOT_QUEUED_CONFLATED);
eventQueueTimeId = type.nameToId(EVENT_QUEUE_TIME);
eventQueueSizeId = type.nameToId(EVENT_QUEUE_SIZE);
+eventSecondaryQueueSizeId = type.nameToId(EVENT_SECONDARY_QUEUE_SIZE);
eventTmpQueueSizeId = type.nameToId(TMP_EVENT_QUEUE_SIZE);
eventsDistributedId = type.nameToId(EVENTS_DISTRIBUTED);
eventsExceedingAlertThresholdId =
type.nameToId(EVENTS_EXCEEDING_ALERT_THRESHOLD);
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index af62f74..2406b18 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -220,6 +220,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.decQueueSize(size);
}
+ public void decSecondaryQueueSize(int size) {
+this.gatewaySenderStats.decSecondaryQueueSize(size);
+ }
+
public void decQueueSize() {
this.gatewaySenderStats.decQueueSize();
}
@@ -228,6 +232,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.incQueueSize(size);
}
+ public void incSecondaryQueueSize(int size) {
+this.gatewaySenderStats.incSecondaryQueueSize(size);
+ }
+
public void incQueueSize() {
this.gatewaySenderStats.incQueueSize();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 2c57182..0b2e68c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -635,6 +635,10 @@ public abstract class AbstractRegionMap
tombst
[geode] branch feature/GEODE-4647 updated (059cb70 -> 613aae4)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-4647 in repository https://gitbox.apache.org/repos/asf/geode.git. omit 059cb70 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue add 634cd85 GEODE-4858: pulling JaxbService out of InternalClusterConfigurationSe… (#1754) add a9c4a0a GEODE-4909: Additional lucene reindex tests with security add 8ca39e9 GEODE-3237: Loading cluster configuration from a dir that does not ha… (#1746) add bdbc0e3 GEODE-4919: Update the PRConfig (#1666) add c62846d GEODE-5039: Change AbstractRegion to correctly construct EvictionAttributesMutator (#1766) add 51660e6 GEODE-4385 Add documentation of gfsh list jndi-binding command (#1772) add 2203273 GEODE-5046: Handle RegionDestroyedException in RemotePutMessage to re… (#1773) add 65b52f2 GEODE-4957: fix race in concurrent create on region (#1750) add cd74f9f GEODE-5056: set testParallelPropagationSenderStartAfterStop_Scenario2 to be flaky add 3f503ce GEODE-4874: Inconsistency in gfsh help for create jndi-binding (doc update) add b71b79f GEODE-3926: handle new lucene indexing exception add 3468fb5 GEODE-4962: Fix typo and output format from 'list gateways' gfsh command (#1778) add 34fdc32 GEODE-4874: Inconsistency in gfsh help for create jndi-binding (#1777) add cfcae6b Updated version to 1.7 add 46ee1c8 GEODE-5065: Add awaitability to testServerUpFirstClientLater (#1792) add 3b930b4 GEODE-4952: Remove usused imports from non-geode-core files. (#1724) add a442283 GEODE-4952: Remove unused imports from geode-core:internal. (#1725) add 5307968 GEODE-4952: Remove unused imports from geode-core, excluding geode-core:internal. (#1726) add b94bf44 GEODE-4952: Remove unused imports from test files. (#1723) add e6c7126 GEODE-5051: Improve gfsh destroy jndi-binding help prose (#1775) add 757e8f9 GEODE-5044: Correctly log stack trace on the protobuf server add 865a7c7 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core tests (#1782) add e27691f GEODE-4952: Spotless will now remove unused imports. (#1727) add d4a3689 GEODE-4990: Cluster Config StartUp Race Condition (#1730) add f7bb77c GEODE-5056: when found the dropped events at primary sender, send (#1794) add f984c95 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal.cache add 130ed6e GEODE-5035: Explicitly pass java.io.tmpdir to JVMs invoked by Gradle. (#1779) add 6097e3d GEODE-5064: Removed unused code in LocalRegion (#1790) add ad45baa GEODE-4856: Public API for retrieving/persisting Cluster Configuration (#1791) add 2ecb372 GEODE-4863: refactor jdbc commands to use this public cluster configuration api (#1776) add f280247 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal (#1784) add ca98d86 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: non geode-core modules (#1787) add 83c667b GEODE-3926: Catching exception from lucene query computing thread (#1774) add ac7db5b GEODE-4384 Add docs for gfsh destroy jndi-binding command (#1780) add 5707de5 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: non geode-core module tests (#1788) add 5057348 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core (#1786) add 1a2a438 GEODE_3926: applying spotless due to spotless changes occuring after PR add 82092e8 GEODE-5068: bump Jackson version. (#1796) add 4bc6c5a GEODE-4863: refactor jdbc commands to use this public cluster configuration api (#1802) add b52492c GEODE-5069: Reduce direct exposure of GfJsonObject from CommandResult (#1795) add 4e249f7 GEODE-5057: Removed experimental tag from Jdbc connector code base (#1789) new 613aae4 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (059cb70) \ N -- N -- N refs/heads/feature/GEODE-4647 (613aae4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and
[geode] branch feature/GEODE-4791 updated (e09c409 -> 22905ee)
This is an automated email from the ASF dual-hosted git repository. udo pushed a change to branch feature/GEODE-4791 in repository https://gitbox.apache.org/repos/asf/geode.git. from e09c409 GEODE-4791: backing out upgrade to 4.5.1 due to an incompatibility with dockerized-test library, which only supports gradle 4.2 new 9c60b5f GEODE-4791: fixing extensions module project name references new 3c00fd0 WIP fixing up more gradle 4.x issues new 22905ee GEODE-4791: WIP The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 2 ++ build.gradle | 8 ++--- extensions/geode-modules-assembly/build.gradle | 40 ++ .../geode-modules-session-internal/build.gradle| 2 +- extensions/geode-modules-session/build.gradle | 3 +- extensions/geode-modules-tomcat7/build.gradle | 4 +-- extensions/geode-modules-tomcat8/build.gradle | 6 ++-- geode-assembly/build.gradle| 12 +++ gradle.properties | 2 +- gradle/rat.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle| 15 12 files changed, 48 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact u...@apache.org.
[geode] 03/03: GEODE-4791: WIP
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 22905ee4bac13664bf7ea9e01445aa765248e552
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 14:47:07 2018 -0700
GEODE-4791: WIP
---
geode-assembly/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 09665c8..f7872c7 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -420,7 +420,7 @@ distributions {
}
into ('tools/Modules') {
-from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
+from
(project(':extensions:geode-modules-assembly').configurations.archives.allArtifacts.files)
}
}
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
[geode] 02/03: WIP fixing up more gradle 4.x issues
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3c00fd0c2a402327fde21c13c3790306d284bd4a
Author: Udo Kohlmeyer
AuthorDate: Wed Apr 11 11:03:29 2018 -0700
WIP fixing up more gradle 4.x issues
---
.gitignore | 2 ++
build.gradle | 6 +++---
extensions/geode-modules-assembly/build.gradle | 8 +++-
geode-assembly/build.gradle| 8
gradle.properties | 2 +-
gradle/rat.gradle | 1 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index af317b8..0bda1ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ out/
*.orig
geode-pulse/screenshots/
/jpf.properties
+
+.gradletasknamecache
diff --git a/build.gradle b/build.gradle
index 1850d89..cbacc43 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,12 @@ buildscript {
}
dependencies {
-classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
+classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
-classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
-classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.5"
+classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
+classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
}
}
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index 2bd2d3d..48d54f8 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -17,11 +17,6 @@
import org.apache.tools.ant.filters.ReplaceTokens
-configurations {
- slf4jDeps
- moduleDistOutputs
-}
-
jar.enabled = true
extraArchive {
sources = false
@@ -32,6 +27,9 @@ extraArchive {
disableMavenPublishing()
disableSigning()
+project.configurations.create('slf4jDeps')
+project.configurations.create('moduleDistOutputs')
+
def getJarArtifact(module) {
project(module).configurations.archives.artifacts.findAll {
it instanceof PublishArtifact && it.type == 'jar' && it.classifier == ''
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 9b4ed67..09665c8 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -419,9 +419,9 @@ distributions {
from
(project(":geode-pulse").configurations.archives.allArtifacts.files)
}
-// into ('tools/Modules') {
-//from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
-// }
+ into ('tools/Modules') {
+from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
+ }
}
}
}
@@ -444,7 +444,7 @@ flakyTest dependOnInstalledProduct
build.dependsOn installDist
installDist.dependsOn ':extensions:geode-modules-assembly:dist'
-distributedTest.dependsOn ':extensions/session-testing-war:war'
+distributedTest.dependsOn ':extensions:session-testing-war:war'
distributedTest.dependsOn ':geode-old-versions:build'
/**Print the names of all jar files in a fileTree */
diff --git a/gradle.properties b/gradle.properties
index 30c92af..c8d8ed9 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,7 +46,7 @@ org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.workers.max=4
-minimumGradleVersion = 4.2.1
+minimumGradleVersion = 4.6
# Set this on the command line with -P or in ~/.gradle/gradle.properties
# to change the buildDir location. Use an absolute path.
buildRoot=
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index b0012af..74ae2f9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -39,6 +39,7 @@ rat {
'**/build/**',
'**/build-*/**',
'.buildinfo',
+'.gradletasknamecache',
// Geode examples
'geode-examples/.idea/**',
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 4516ad8..dcb0cb1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
[geode] 01/03: GEODE-4791: fixing extensions module project name references
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9c60b5ff7fb49e235f4a19e6fff241ccfb5be888
Author: Udo Kohlmeyer
AuthorDate: Tue Apr 10 15:39:13 2018 -0700
GEODE-4791: fixing extensions module project name references
---
build.gradle | 2 +-
extensions/geode-modules-assembly/build.gradle | 32 +++---
.../geode-modules-session-internal/build.gradle| 2 +-
extensions/geode-modules-session/build.gradle | 3 +-
extensions/geode-modules-tomcat7/build.gradle | 4 +--
extensions/geode-modules-tomcat8/build.gradle | 6 ++--
geode-assembly/build.gradle| 14 +-
settings.gradle| 15 +-
8 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/build.gradle b/build.gradle
index 56005a2..1850d89 100755
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ apply from: "${scriptDir}/dependency-resolution.gradle"
apply from: "${scriptDir}/test.gradle"
apply from: "${scriptDir}/publish.gradle"
apply from: "${scriptDir}/code-analysis.gradle"
-apply from: "${scriptDir}/sonar.gradle"
+//apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/ide.gradle"
apply from: "${scriptDir}/rat.gradle"
apply from: "${scriptDir}/docker.gradle"
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index 6abd47b..2bd2d3d 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -46,9 +46,9 @@ def configureTcServerAssembly = {
// All client-server files
into('geode-cs/lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('geode-cs/bin') {
@@ -79,9 +79,9 @@ def configureTcServerAssembly = {
}
// All peer-to-peer files
into('geode-p2p/lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('geode-p2p/bin') {
@@ -130,15 +130,15 @@ def configureTcServer30Assembly = {
}
}
-task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
+task distTomcat(type: Zip, dependsOn: ':extensions:geode-modules:assemble') {
baseName = moduleBaseName
classifier = "Tomcat"
// All client-server files
into('lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('bin') {
@@ -154,14 +154,14 @@ task distTomcat(type: Zip, dependsOn:
':extensions/geode-modules:assemble') {
}
}
-task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:assemble') {
+task distAppServer(type: Zip, dependsOn:
':extensions:geode-modules-session:assemble') {
baseName = moduleBaseName
classifier = "AppServer"
into('lib') {
-from getJarArtifact(':extensions/geode-modules-session')
-from getJarArtifact(':extensions/geode-modules-session-internal')
-from getJarArtifact(':extensions/geode-modules')
+from getJarArtifact(':extensions:geode-modules-session')
+from getJarArtifact(':extensions:geode-modules-session-internal')
+from getJarArtifact(':extensions:geode-modules')
from configurations.slf4jDeps
}
@@ -187,11 +187,11 @@ task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:asse
}
}
-task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble'] ) {
+task distTcServer(type: Zip, dependsOn: [':extensions:geode-modules:assemble',
':extensions:geode-modules-tomcat7:assemble',
':extensions:geode-modules-tomcat8:assemble'] ) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble']) {
+task dis
[geode] branch feature/GEODE-5085 created (now 75ccfed)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-5085 in repository https://gitbox.apache.org/repos/asf/geode.git. at 75ccfed GEODE-5085 authentication failure when auto-reconnecting This branch includes the following new commits: new 75ccfed GEODE-5085 authentication failure when auto-reconnecting The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact bschucha...@apache.org.
[geode] 01/01: GEODE-5085 authentication failure when auto-reconnecting
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5085
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 75ccfede2e559596cd6e0aedcf4b7e181e954920
Author: Bruce Schuchardt
AuthorDate: Mon Apr 16 15:04:12 2018 -0700
GEODE-5085 authentication failure when auto-reconnecting
Added DistributionConfig security properties to the props used to reconnect
to the distributed system.
Modified the getSecurityProps implementation to stop sharing the internal
state of the configuration object and to convert values into external form.
Security-log-level, for instance, was a number instead of the corresponding
level name.
Added a security manager to all of the ReconnectDUnitTest test cases.
---
.../distributed/internal/DistributionConfigImpl.java| 11 ++-
.../distributed/internal/InternalDistributedSystem.java | 2 ++
.../org/apache/geode/cache30/ReconnectDUnitTest.java| 12 +---
.../test/dunit/internal/JUnit4DistributedTestCase.java | 17 +
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
index 516140f..e146c05 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
@@ -2337,8 +2337,17 @@ public class DistributionConfigImpl extends
AbstractDistributionConfig implement
securityPeerMembershipTimeout = (Integer) value;
}
+ @Override
public Properties getSecurityProps() {
-return security;
+Properties result = new Properties();
+for (Object attName : security.keySet()) {
+ if (attName instanceof String) {
+result.put(attName, getAttribute((String) attName));
+ } else {
+result.put(attName, security.get(attName));
+ }
+}
+return result;
}
public String getSecurity(String attName) {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 5d47d00..371c556 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -2610,6 +2610,8 @@ public class InternalDistributedSystem extends
DistributedSystem
DistributionConfig oldConfig = ids.getConfig();
Properties configProps = getProperties();
+configProps.putAll(getSecurityProperties());
+
int timeOut = oldConfig.getMaxWaitTimeForReconnect();
int maxTries = oldConfig.getMaxNumReconnectTries();
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index e36dabb..f16bf4b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -46,6 +46,7 @@ import org.apache.geode.distributed.internal.ServerLocator;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import
org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
import
org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager;
+import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -111,7 +112,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
finishCacheXml("MyDisconnect");
// Cache cache = getCache();
closeCache();
-getSystem().disconnect();
+basicGetSystem().disconnect();
LogWriterUtils.getLogWriter().fine("Cache Closed ");
}
@@ -127,6 +128,9 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
dsProperties.put(MCAST_PORT, "0");
dsProperties.put(MEMBER_TIMEOUT, "1000");
dsProperties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+ dsProperties.put(SECURITY_MANAGER,
SimpleSecurityManager.class.getName());
+ dsProperties.put("security-username", "clusterManage");
+ dsProperties.put("security-password", "clusterManage");
addDSProps(dsProperties);
}
return dsProperties;
@@ -632,7 +636,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
Assert.fail("IOException during cache.xml generation to " + file, ex);
}
closeCache();
-getSystem().disconnect();
+basicGetSystem().disconnect();
LogWriterUti
[geode] 01/04: GEODE-4791: fixing extensions module project name references
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 38fad9860c236160499ce8faa4a722099bf09190
Author: Udo Kohlmeyer
AuthorDate: Tue Apr 10 15:39:13 2018 -0700
GEODE-4791: fixing extensions module project name references
---
build.gradle | 2 +-
extensions/geode-modules-assembly/build.gradle | 32 +++---
.../geode-modules-session-internal/build.gradle| 2 +-
extensions/geode-modules-session/build.gradle | 3 +-
extensions/geode-modules-tomcat7/build.gradle | 4 +--
extensions/geode-modules-tomcat8/build.gradle | 6 ++--
geode-assembly/build.gradle| 14 +-
settings.gradle| 15 +-
8 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/build.gradle b/build.gradle
index 4adbe99..e2624b8 100755
--- a/build.gradle
+++ b/build.gradle
@@ -90,7 +90,7 @@ apply from: "${scriptDir}/dependency-resolution.gradle"
apply from: "${scriptDir}/test.gradle"
apply from: "${scriptDir}/publish.gradle"
apply from: "${scriptDir}/code-analysis.gradle"
-apply from: "${scriptDir}/sonar.gradle"
+//apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/ide.gradle"
apply from: "${scriptDir}/rat.gradle"
apply from: "${scriptDir}/docker.gradle"
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index ff12c9d..a62109d 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -51,9 +51,9 @@ def configureTcServerAssembly = {
// All client-server files
into('geode-cs/lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('geode-cs/bin') {
@@ -84,9 +84,9 @@ def configureTcServerAssembly = {
}
// All peer-to-peer files
into('geode-p2p/lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('geode-p2p/bin') {
@@ -147,15 +147,15 @@ def configureTcServer30Assembly = {
}
}
-task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
+task distTomcat(type: Zip, dependsOn: ':extensions:geode-modules:assemble') {
baseName = moduleBaseName
classifier = "Tomcat"
// All client-server files
into('lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-tomcat7')
-from getJarArtifact(':extensions/geode-modules-tomcat8')
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
from configurations.slf4jDeps
}
into('bin') {
@@ -171,14 +171,14 @@ task distTomcat(type: Zip, dependsOn:
':extensions/geode-modules:assemble') {
}
}
-task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:assemble') {
+task distAppServer(type: Zip, dependsOn:
':extensions:geode-modules-session:assemble') {
baseName = moduleBaseName
classifier = "AppServer"
into('lib') {
-from getJarArtifact(':extensions/geode-modules-session')
-from getJarArtifact(':extensions/geode-modules-session-internal')
-from getJarArtifact(':extensions/geode-modules')
+from getJarArtifact(':extensions:geode-modules-session')
+from getJarArtifact(':extensions:geode-modules-session-internal')
+from getJarArtifact(':extensions:geode-modules')
from configurations.slf4jDeps
}
@@ -204,11 +204,11 @@ task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:asse
}
}
-task distTcServer(type: Zip, dependsOn: [':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble'] ) {
+task distTcServer(type: Zip, dependsOn: [':extensions:geode-modules:assemble',
':extensions:geode-modules-tomcat7:assemble',
':extensions:geode-modules-tomcat8:assemble'] ) {
configure(configureTcServerAssembly)
}
-task distTcServer30(type: Zip, dependsOn:
[':extensions/geode-modules:assemble',
':extensions/geode-modules-tomcat7:assemble',
':extensions/geode-modules-tomcat8:assemble']) {
+task dis
[geode] 04/04: WIP updating rebase with develop
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 439a38d62561792eb34394f88273223fd391fceb
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 15:25:31 2018 -0700
WIP updating rebase with develop
---
build.gradle | 2 +-
extensions/geode-modules-assembly/build.gradle | 273 +
2 files changed, 138 insertions(+), 137 deletions(-)
diff --git a/build.gradle b/build.gradle
index 65ddf55..db21bba 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
-classpath "com.diffplug.gradle.spotless:spotless:3.10.0"
+classpath "com.diffplug.gradle.spotless:spotless-plugin-gradle:3.10.0"
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6-SNAPSHOT"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index 78f2f5e..f83303d 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -24,9 +24,9 @@ configurations {
jar.enabled = true
extraArchive {
- sources = false
- javadoc = false
- tests = false
+sources = false
+javadoc = false
+tests = false
}
disableMavenPublishing()
@@ -36,89 +36,89 @@ project.configurations.create('slf4jDeps')
project.configurations.create('moduleDistOutputs')
def getJarArtifact(module) {
- project(module).configurations.archives.artifacts.findAll {
-it instanceof PublishArtifact && it.type == 'jar' && it.classifier == ''
- }.collect { it.file }
+project(module).configurations.archives.artifacts.findAll {
+it instanceof PublishArtifact && it.type == 'jar' && it.classifier ==
''
+}.collect { it.file }
}
def moduleBaseName = "Apache_Geode_Modules"
def configureTcServerAssembly = {
- baseName = moduleBaseName
- classifier = "tcServer"
-
- // All client-server files
- into('geode-cs/lib') {
-from getJarArtifact(':extensions:geode-modules')
-from getJarArtifact(':extensions:geode-modules-tomcat7')
-from getJarArtifact(':extensions:geode-modules-tomcat8')
-from configurations.slf4jDeps
- }
- into('geode-cs/bin') {
-from('release/scripts') {
- include '*'
-}
- }
- into('geode-cs/conf') {
-from('release/conf') {
- exclude 'cache-peer.xml'
-}
-from('release/tcserver/geode-cs') {
- include 'context-fragment.xml'
- include 'server-fragment.xml'
+baseName = moduleBaseName
+classifier = "tcServer"
+
+// All client-server files
+into('geode-cs/lib') {
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
+from configurations.slf4jDeps
+}
+into('geode-cs/bin') {
+from('release/scripts') {
+include '*'
+}
+}
+into('geode-cs/conf') {
+from('release/conf') {
+exclude 'cache-peer.xml'
+}
+from('release/tcserver/geode-cs') {
+include 'context-fragment.xml'
+include 'server-fragment.xml'
+}
+}
+into('geode-cs') {
+from('release/tcserver/geode-cs') {
+include 'configuration-prompts.properties'
+}
+}
+
+// Tomncat 7 specifics
+into('geode-cs-tomcat-7/conf') {
+from('release/tcserver/geode-cs-tomcat-7') {
+include 'context-fragment.xml'
+}
+}
+// All peer-to-peer files
+into('geode-p2p/lib') {
+from getJarArtifact(':extensions:geode-modules')
+from getJarArtifact(':extensions:geode-modules-tomcat7')
+from getJarArtifact(':extensions:geode-modules-tomcat8')
+from configurations.slf4jDeps
+}
+into('geode-p2p/bin') {
+from('release/scripts') {
+include 'gemfire.*'
+include 'setenv.properties'
+}
+}
+into('geode-p2p/conf') {
+from('release/conf') {
+include 'cache-peer.xml'
+}
+from('release/tcserver/geode-p2p') {
+include 'context-fragment.xml'
+include 'server-fragment.xml'
+}
+}
+into('geode-p2p') {
+from('release/tcserver/geode-p2p') {
+include 'configuration-prompts.properties'
+}
+}
+
+// Tomncat 7 specifics
+into('geode-p2p-tomcat-7/conf') {
+from('release/tcserver/geode-p2p-tomcat-7') {
+include 'context-fragment.xml'
+}
}
- }
- into('
[geode] 02/04: WIP fixing up more gradle 4.x issues
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0167fdfe9901f6b17fb27569f6a34387a96cc4ea
Author: Udo Kohlmeyer
AuthorDate: Wed Apr 11 11:03:29 2018 -0700
WIP fixing up more gradle 4.x issues
---
.gitignore | 2 ++
build.gradle | 8
extensions/geode-modules-assembly/build.gradle | 10 +-
geode-assembly/build.gradle| 8
gradle.properties | 6 +-
gradle/rat.gradle | 1 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
7 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index ddb360b..ae1f32a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ geode-pulse/screenshots/
/jpf.properties
.git-together
+
+.gradletasknamecache
diff --git a/build.gradle b/build.gradle
index e2624b8..65ddf55 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,11 +24,11 @@ buildscript {
}
dependencies {
-classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
+classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
-classpath "com.diffplug.spotless:spotless-plugin-gradle:3.10.0"
-classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
+classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
+classpath "com.diffplug.gradle.spotless:spotless:3.10.0"
+classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6-SNAPSHOT"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
}
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index a62109d..78f2f5e 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -22,11 +22,6 @@ configurations {
moduleDistOutputs
}
-dependencies {
- slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
- slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
-}
-
jar.enabled = true
extraArchive {
sources = false
@@ -37,6 +32,9 @@ extraArchive {
disableMavenPublishing()
disableSigning()
+project.configurations.create('slf4jDeps')
+project.configurations.create('moduleDistOutputs')
+
def getJarArtifact(module) {
project(module).configurations.archives.artifacts.findAll {
it instanceof PublishArtifact && it.type == 'jar' && it.classifier == ''
@@ -214,6 +212,8 @@ task distTcServer30(type: Zip, dependsOn:
[':extensions:geode-modules:assemble',
}
dependencies {
+ slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+ slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
moduleDistOutputs distTcServer.outputs.files
moduleDistOutputs distTcServer30.outputs.files
moduleDistOutputs distAppServer.outputs.files
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 20b7a07..3279708 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -424,9 +424,9 @@ distributions {
from
(project(":geode-pulse").configurations.archives.allArtifacts.files)
}
-// into ('tools/Modules') {
-//from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
-// }
+ into ('tools/Modules') {
+from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
+ }
}
}
}
@@ -458,7 +458,7 @@ flakyTest dependOnInstalledProduct
build.dependsOn installDist
installDist.dependsOn ':extensions:geode-modules-assembly:dist'
-distributedTest.dependsOn ':extensions/session-testing-war:war'
+distributedTest.dependsOn ':extensions:session-testing-war:war'
distributedTest.dependsOn ':geode-old-versions:build'
/**Print the names of all jar files in a fileTree */
diff --git a/gradle.properties b/gradle.properties
index ad3dbce..c8d8ed9 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,7 +42,11 @@ productOrg = Apache Software Foundation (ASF)
org.gradle.daemon = true
org.gradle.jvmargs = -Xmx2048m
-minimumGradleVersion = 3.5.1
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.workers.max=4
+
+minimumGradleVersion = 4.6
# Set this on the command line with -P or in ~/.gradle/gradle.properties
# to change the buildDir location. Use an absolute path.
buildRoot=
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index b0012af..74ae2f9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -39,6 +39,7 @@ rat {
'**/build/**',
'**/build-*/**',
'.buildinfo',
+'.gradletasknamecache',
[geode] 03/04: GEODE-4791: WIP
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e9ff13f96737757913b43e9902480616a9035bfe
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 14:47:07 2018 -0700
GEODE-4791: WIP
---
geode-assembly/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 3279708..35a0c10 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -425,7 +425,7 @@ distributions {
}
into ('tools/Modules') {
-from
(project(':extensions:geode-modules-assembly').configurations.moduleDistOutputs.files)
+from
(project(':extensions:geode-modules-assembly').configurations.archives.allArtifacts.files)
}
}
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
[geode] branch feature/GEODE-4791 updated (22905ee -> 439a38d)
This is an automated email from the ASF dual-hosted git repository. udo pushed a change to branch feature/GEODE-4791 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 22905ee GEODE-4791: WIP discard 3c00fd0 WIP fixing up more gradle 4.x issues discard 9c60b5f GEODE-4791: fixing extensions module project name references add 8672678 GEODE-4751: Modify experimental driver to support function execution. (#1579) add ccc8db8 Revert "GEODE-4791: backing out upgrade to 4.5.1 back to 3.5.1" add 17602ce GEODE-4750: Allow region level authorization for OQL queries (#1570) add b53714c GEODE-4735: get rid of Cache.getInstance call from CliUtils and GfshC… (#1551) add 4143a73 GEODE-4685: Moving of static DefaultQuery.setPdxReadSerialized to the TypeRegistry. Cleaned up the overriding of readSerialized to reset to previous value. Added cache to AbstractJdbcCallback.java so that children classes can access it. Replaced AtomicLong with LongAdder. add 386b92b GEODE-4801 Readme links to "how to contribute" add 0908acb Bug/geode 4798: Add JDBC Connector classes to sanctioned serializables (#1592) add 3939595 GEODE-4772: Enhance new protocol with ability to clear region of all entries. (#1590) add 3079826 GEODE-4716: Added overflow attributes to gateway mbeans add 94586e1 GEODE-4807: Pulse UI tests using locator/cluster rule. (#1584) add 6214a43 GEODE-2999: Add PutIfAbsent to the Protobuf protocol. (#1578) add 8a12c6d GEODE-4818: Remove beSick() from DirectChannel,TcpConduit. (#1591) add a2099c4 GEODE-4825: Lucene Index should reset pdx read serialized (#1598) add 5c85b4d GEODE-4814: Categorized FunctionServiceTest (#1597) add 25aebbe GEODE-4813: Categorize remaining register interest tests (#1586) add a07b67a GEODE-4266: Make JdbcConnectionException safely serializable to clients (#1601) add 2f1fe57 GEODE-4768: Close the socket to the locator in the experimental driver add 9223b16 GEODE-4527: get rid of static getAnyInstance or getInstance call to get the cache. (#1596) add 9e0c8d5 [GEODE-4835] Add python3 to ci docker image. add 963ba03 Merge pull request #1610 from smgoller/GEODE-4835 add 736742d GEODE-4669: Fall back on file controller if mbean controller fails add 2f2a73c GEODE-4384: gfsh command to destroy jndi binding (#1588) add 140118d GEODE-4823: OQL index not updated for tombstone (#1603) add b8d16ee GEODE-4829: Categorized AEQ tests (#1605) add 7c936ca GEODE-4797: Categorized WanTest (#1604) add 29eff01 GEODE-3891: Cannot enable ciphers for REST interface (#1613) add 7a3da49 Revert "GEODE-2999: Add PutIfAbsent to the Protobuf protocol. (#1578)" add 39a81f4 GEODE-4785: Add test category annotation to Pulse tests (#1595) add d621b47 GEODE-4689: Colocation complete listeners added (#1565) add 662fb51 GEODE-4834: Remove the newly added isConcurrencyConflict from GatewaySenderEventImpl (#1609) add d7c46ff GEODE-4831 Update docs for registerInterest API changes (#1607) add 6630f48 GEODE-4824: Categorized Session state tests (#1599) add f7c7451 GEODE-4693: fix JDBCLoader on non-object pdx fields (#1517) add 4a6ac46 GEODE-4803: Mark test as Flaky and adjust timeout add ef2ebd7 GEODE-4816: Add support for authentication to the experimental driver. (#1615) add 5dc08bf GEODE-4844: JdbcWriter and JdbcAsyncWriter will write rows loaded by the JdbcLoader (#1618) add 9aa83fe GEODE-4830: use POJOs to represent cache configuration allowed by cache-1.0.xsd add 7f8eedc GEODE-4830: use CacheConfig to access the jndi list in ListJNDIBindingCommand add 44dc697 GEODE-4870: Categorize AlterAsyncEventQueueCommandDUnitTest as DistributedTest (#1626) add be9d99d GEODE-4769: optional early serialization of EntryEvent key and new value add 076d9ab GEODE-4769: fix tests using non-Serializable value objects add c5b4401 GEODE-4827: CQ not added to cq map on exception (#1602) add d48607d GEODE-4868: depose primary should reduce brq's size in deposePrimaryForColocatedChildren (#1625) add 9655e40 GEODE-4622 Revert jna upgrade add 42ad145 GEODE-4846: fixup javadocs on ExecutorServiceRule add f8bab2a GEODE-4845: make FieldSerializationUtils package-private add ae25c7b GEODE-4789: upgrade system-rules from 1.16.1 to 1.17.1 add 71d1d8a GEODE-4789: add VM count constructor to ClusterStartupRule add 6b56b5f GEODE-4789: fixup tests that use more than 4 VMs with ClusterStarterRule add 8863386 GEODE-4789: fix static usage of DistributedRestoreSystemProperties add 1298f76 GEODE-4821: rename RegisterInterestIntegrationTest as RegisterInterestDistributedTest add 62f83e3 GEODE-4820: use RestoreSystemProperties instead of DistributedRestoreSystemProperties add 6e2a754 GEODE-4782: Add category
[geode] 01/01: Initial commit
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-Lucene-Udo
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b6a75db290e48eae40a2d6846150d98c42c11fc7
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 15:46:40 2018 -0700
Initial commit
---
.../IncompatibleCacheServiceProfileException.java | 23 +++
.../geode/internal/cache/InternalRegion.java | 3 +-
.../apache/geode/internal/cache/LocalRegion.java | 187 -
.../geode/internal/cache/PartitionedRegion.java| 10 ++
.../internal/cache/UpdateAttributesProcessor.java | 46 ++---
.../cache/lucene/internal/LuceneServiceImpl.java | 9 +-
.../LuceneIndexCreationProfileDUnitTest.java | 109
.../LuceneIndexCreationProfileJUnitTest.java | 4 +-
.../cache/lucene/test/LuceneTestUtilities.java | 12 +-
9 files changed, 288 insertions(+), 115 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/IncompatibleCacheServiceProfileException.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/IncompatibleCacheServiceProfileException.java
new file mode 100644
index 000..c9a7435
--- /dev/null
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/IncompatibleCacheServiceProfileException.java
@@ -0,0 +1,23 @@
+/*
+ * 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.internal.cache;
+
+import org.apache.geode.GemFireCheckedException;
+
+public class IncompatibleCacheServiceProfileException extends
GemFireCheckedException {
+ public IncompatibleCacheServiceProfileException(String message) {
+super(message);
+ }
+}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
index 7c5d722..61360d6 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
@@ -142,7 +142,8 @@ public interface InternalRegion extends Region,
HasCachePerfStats, RegionEntryCo
InternalRegionArguments internalRegionArgs)
throws RegionExistsException, TimeoutException, IOException,
ClassNotFoundException;
- void addCacheServiceProfile(CacheServiceProfile profile);
+ void addCacheServiceProfile(CacheServiceProfile profile)
+ throws IncompatibleCacheServiceProfileException;
void setEvictionMaximum(int maximum);
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 3aab945..bb7a03a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -146,7 +146,6 @@ import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionStats;
@@ -709,7 +708,7 @@ public class LocalRegion extends AbstractRegion implements
LoaderHelperFactory,
return new Object();
} else {
return this.fullPath; // avoids creating another sync object - could be
anything unique to
-// this region
+ // this region
}
}
@@ -883,8 +882,9 @@ public class LocalRegion extends AbstractRegion implements
LoaderHelperFactory,
LocalRegion newRegion = null;
try {
- if (getDestroyLock)
+ if (getDestroyLock) {
acquireDestroyLock();
+ }
LocalRegion existing = null;
try {
if (isDestroyed()) {
@@ -1063,7 +1063,7 @@ public class LocalRegion extends AbstractRegion
implements LoaderHelperFactory,
false, // ifOld
null, // expectedOldValue
true // r
[geode] branch feature/GEODE-Lucene-Udo created (now b6a75db)
This is an automated email from the ASF dual-hosted git repository. udo pushed a change to branch feature/GEODE-Lucene-Udo in repository https://gitbox.apache.org/repos/asf/geode.git. at b6a75db Initial commit This branch includes the following new commits: new b6a75db Initial commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact u...@apache.org.
[geode] branch develop updated: GEODE-5086 Clarify docs: we need version 8 Java (#1808)
This is an automated email from the ASF dual-hosted git repository. kmiller 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 2f607ff GEODE-5086 Clarify docs: we need version 8 Java (#1808) 2f607ff is described below commit 2f607ffe4918ff6bab4ea8deee6f10130a96d0fc Author: Karen Miller AuthorDate: Mon Apr 16 16:02:35 2018 -0700 GEODE-5086 Clarify docs: we need version 8 Java (#1808) - Also updated a few places that called out a specific version 8 update, and changed them to use a variable instead of a specific version --- .../getting_started/installation/install_standalone.html.md.erb | 8 .../getting_started/system_requirements/host_machine.html.md.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/geode-docs/getting_started/installation/install_standalone.html.md.erb b/geode-docs/getting_started/installation/install_standalone.html.md.erb index b6d4da9..91d4ebd 100644 --- a/geode-docs/getting_started/installation/install_standalone.html.md.erb +++ b/geode-docs/getting_started/installation/install_standalone.html.md.erb @@ -24,7 +24,7 @@ Build from source or use the ZIP or TAR distribution to install <%=vars.product_ 1. Set the JAVA\_HOME environment variable. ``` pre -JAVA_HOME=/usr/java/jdk1.8.0_60 +JAVA_HOME=/usr/java/jdk1.8.0_<%=vars.min_java_update%> export JAVA_HOME ``` @@ -54,7 +54,7 @@ Build from source or use the ZIP or TAR distribution to install <%=vars.product_ 1. Set the JAVA\_HOME environment variable. For example: ``` pre -$ set JAVA_HOME="C:\Program Files\Java\jdk1.8.0_60" +$ set JAVA_HOME="C:\Program Files\Java\jdk1.8.0_<%=vars.min_java_update%>" ``` 2. Install Gradle, version 2.3 or a more recent version. @@ -97,14 +97,14 @@ Build from source or use the ZIP or TAR distribution to install <%=vars.product_ 3. Set the JAVA\_HOME environment variable. On Linux/Unix platforms: ``` pre -JAVA_HOME=/usr/java/jdk1.8.0_60 +JAVA_HOME=/usr/java/jdk1.8.0_<%=vars.min_java_update%> export JAVA_HOME ``` On Windows platforms: ``` pre -set JAVA_HOME=c:\Program Files\Java\jdk1.8.0_60 +set JAVA_HOME="C:\Program Files\Java\jdk1.8.0_<%=vars.min_java_update%>" ``` 4. Add the <%=vars.product_name%> scripts to your PATH environment variable. On Linux/Unix platforms: diff --git a/geode-docs/getting_started/system_requirements/host_machine.html.md.erb b/geode-docs/getting_started/system_requirements/host_machine.html.md.erb index f754e7a..7232440 100644 --- a/geode-docs/getting_started/system_requirements/host_machine.html.md.erb +++ b/geode-docs/getting_started/system_requirements/host_machine.html.md.erb @@ -24,7 +24,7 @@ Host machines must meet a set of requirements for <%=vars.product_name_long%>. Each machine that will run <%=vars.product_name_long%> must meet the following requirements: -- Java SE Development Kit 8 with update <%=vars.min_java_update%> or a more recent version. +- Java SE Development Kit 8 with update <%=vars.min_java_update%> or a more recent version 8 update. - A system clock set to the correct time and a time synchronization service such as Network Time Protocol (NTP). Correct time stamps permit the following activities: - Logs that are useful for troubleshooting. Synchronized time stamps ensure that log messages from different hosts can be merged to reproduce an accurate chronological history of a distributed run. - Aggregate product-level and application-level time statistics. -- To stop receiving notification emails like this one, please contact kmil...@apache.org.
[geode] branch develop updated: GEODE-5000: fix logging message. (#1763)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao 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 ad11ef0 GEODE-5000: fix logging message. (#1763)
ad11ef0 is described below
commit ad11ef0dd338eb0baf5f36a4d71899fe892ed0d0
Author: jinmeiliao
AuthorDate: Mon Apr 16 16:06:53 2018 -0700
GEODE-5000: fix logging message. (#1763)
---
.../org/apache/geode/internal/cache/ClusterConfigurationLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
index 2ef9b2b..2288f21 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
@@ -83,11 +83,11 @@ public class ClusterConfigurationLoader {
*/
public void deployJarsReceivedFromClusterConfiguration(ConfigurationResponse
response)
throws IOException, ClassNotFoundException {
-logger.info("deploying jars received from cluster configuration");
if (response == null) {
return;
}
+logger.info("deploying jars received from cluster configuration");
List jarFileNames =
response.getJarNames().values().stream().flatMap(Set::stream).collect(Collectors.toList());
--
To stop receiving notification emails like this one, please contact
jinmeil...@apache.org.
[geode] branch feature/GEODE-4791 updated: Cleaning up gradle
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4791 by this
push:
new f1f697f Cleaning up gradle
f1f697f is described below
commit f1f697f8a3b541ad0040bf5a8dd2b8174a7b3595
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 16:28:04 2018 -0700
Cleaning up gradle
---
build.gradle | 2 +-
extensions/geode-modules-assembly/build.gradle | 5 -
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index db21bba..8c20233 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
-classpath "com.diffplug.gradle.spotless:spotless-plugin-gradle:3.10.0"
+classpath "com.diffplug.spotless:spotless-plugin-gradle:3.10.0"
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.6-SNAPSHOT"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index f83303d..e874f80 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -17,11 +17,6 @@
import org.apache.tools.ant.filters.ReplaceTokens
-configurations {
- slf4jDeps
- moduleDistOutputs
-}
-
jar.enabled = true
extraArchive {
sources = false
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
[geode] branch feature/GEODE-4791 updated: GEODE-4791: move metainf in java.gradle
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-4791
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4791 by this
push:
new b5444f8 GEODE-4791: move metainf in java.gradle
b5444f8 is described below
commit b5444f895e1ff6ca61400adacc7c024518262052
Author: Udo Kohlmeyer
AuthorDate: Mon Apr 16 16:50:39 2018 -0700
GEODE-4791: move metainf in java.gradle
---
gradle/java.gradle | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 22fec1c..7f99604 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -54,12 +54,11 @@ subprojects {
"Organization": productOrg
)
}
-
-metaInf {
- from("$rootDir/LICENSE")
- if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
-from("$rootDir/NOTICE")
- }
+ }
+ jar.metaInf {
+from("$rootDir/LICENSE")
+if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+ from("$rootDir/NOTICE")
}
}
}
--
To stop receiving notification emails like this one, please contact
u...@apache.org.
[geode] branch feature/transcoding_experiments updated: Experimenting with buffering the input stream of protobuf
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch feature/transcoding_experiments
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/feature/transcoding_experiments by this push:
new eb37bb4 Experimenting with buffering the input stream of protobuf
eb37bb4 is described below
commit eb37bb44900285adb173c8594a63399728016125
Author: Dan Smith
AuthorDate: Mon Apr 16 17:18:12 2018 -0700
Experimenting with buffering the input stream of protobuf
If protobuf is reading directly from the socket input stream, it's possible
that will increase the overhead.
---
.../geode/internal/cache/tier/sockets/ProtobufServerConnection.java | 6 --
.../java/org/apache/geode/experimental/driver/ProtobufChannel.java | 6 --
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
index cb1d2fc..d6dc58c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtobufServerConnection.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
@@ -41,6 +42,7 @@ import org.apache.geode.internal.security.SecurityService;
public class ProtobufServerConnection extends ServerConnection {
// The new protocol lives in a separate module and gets loaded when this
class is instantiated.
private final ClientProtocolProcessor protocolProcessor;
+ private final BufferedInputStream input;
private boolean cleanedUp;
private ClientProxyMembershipID clientProxyMembershipID;
private final BufferedOutputStream output;
@@ -58,6 +60,7 @@ public class ProtobufServerConnection extends
ServerConnection {
this.protocolProcessor = clientProtocolProcessor;
this.output = new BufferedOutputStream(socket.getOutputStream(),
socketBufferSize);
+this.input = new BufferedInputStream(socket.getInputStream(),
socketBufferSize);
setClientProxyMembershipId();
doHandShake(CommunicationMode.ProtobufClientServerProtocol.getModeNumber(), 0);
@@ -67,12 +70,11 @@ public class ProtobufServerConnection extends
ServerConnection {
protected void doOneMessage() {
Socket socket = this.getSocket();
try {
- InputStream inputStream = socket.getInputStream();
InternalCache cache = getCache();
cache.setReadSerializedForCurrentThread(true);
try {
-protocolProcessor.processMessage(inputStream, output);
+protocolProcessor.processMessage(input, output);
output.flush();
} finally {
cache.setReadSerializedForCurrentThread(false);
diff --git
a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
index b309053..1e5d239 100644
---
a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
+++
b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufChannel.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.experimental.driver;
+import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +42,7 @@ class ProtobufChannel {
final Socket socket;
final BufferedOutputStream output;
private final ValueSerializer serializer;
+ private final BufferedInputStream input;
public ProtobufChannel(final Set locators, String
username, String password,
String keyStorePath, String trustStorePath, String protocols, String
ciphers,
@@ -49,6 +51,7 @@ class ProtobufChannel {
socket = connectToAServer(locators, username, password, keyStorePath,
trustStorePath, protocols,
ciphers);
output = new BufferedOutputStream(socket.getOutputStream(),
socket.getSendBufferSize());
+input = new BufferedInputStream(socket.getInputStream(),
socket.getReceiveBufferSize());
}
public void close() throws IOException {
@@ -212,8 +215,7 @@ class ProtobufChannel {
}
private Message readResponse() throws IOException {
-final InputStream inputStream = socket.getInputStream();
-Message response = ClientProtocol.Message.parseDelimitedFrom(inputStream);
+Message response = ClientProtocol.Message.parseDelimitedFrom(input);
if (response == null) {
throw new IOException("Unable to parse a response message due to EOF");
}
--
To stop receiving notification emails like this one, plea
[geode] branch feature/GEODE-4647 updated (613aae4 -> 3977040)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-4647 in repository https://gitbox.apache.org/repos/asf/geode.git. omit 613aae4 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue add 2f607ff GEODE-5086 Clarify docs: we need version 8 Java (#1808) add ad11ef0 GEODE-5000: fix logging message. (#1763) add 00aa0de GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:cache (#1783) new 3977040 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (613aae4) \ N -- N -- N refs/heads/feature/GEODE-4647 (3977040) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/geode/cache/AttributesFactory.java | 2 - .../org/apache/geode/cache/AttributesMutator.java | 5 - .../main/java/org/apache/geode/cache/Cache.java| 3 - .../geode/cache/CacheTransactionManager.java | 2 - .../java/org/apache/geode/cache/DiskStore.java | 1 - .../geode/cache/DiskWriteAttributesFactory.java| 1 - .../org/apache/geode/cache/EvictionAction.java | 1 - .../apache/geode/cache/PartitionAttributes.java| 2 - .../geode/cache/PartitionAttributesFactory.java| 5 - .../main/java/org/apache/geode/cache/Region.java | 1 - .../geode/cache/TransactionWriterException.java| 3 - .../geode/cache/asyncqueue/AsyncEventQueue.java| 8 - .../cache/asyncqueue/AsyncEventQueueFactory.java | 4 - .../geode/cache/client/ClientRegionFactory.java| 1 - .../geode/cache/client/internal/AbstractOp.java| 1 - .../cache/client/internal/AuthenticateUserOp.java | 4 - .../client/internal/AutoConnectionSourceImpl.java | 1 - .../geode/cache/client/internal/ClientUpdater.java | 3 - .../cache/client/internal/EndpointManager.java | 1 - .../cache/client/internal/EndpointManagerImpl.java | 3 - .../cache/client/internal/ExecutablePool.java | 1 - .../client/internal/ExecuteFunctionNoAckOp.java| 9 - .../geode/cache/client/internal/GetEntryOp.java| 3 - .../geode/cache/client/internal/PoolImpl.java | 2 - .../geode/cache/client/internal/PrimaryAckOp.java | 1 - .../apache/geode/cache/client/internal/PutOp.java | 2 - .../cache/client/internal/QueueStateImpl.java | 1 - .../cache/client/internal/ReadyForEventsOp.java| 1 - .../client/internal/ServerRegionDataAccess.java| 4 - .../cache/client/internal/ServerRegionProxy.java | 5 - .../client/internal/SingleHopClientExecutor.java | 4 - .../internal/SingleHopOperationCallable.java | 4 - .../cache/client/internal/TXSynchronizationOp.java | 5 - .../internal/locator/GetAllServersRequest.java | 5 - .../internal/locator/GetAllServersResponse.java| 4 - .../internal/locator/LocatorListRequest.java | 3 - .../internal/locator/LocatorListResponse.java | 3 - .../internal/locator/SerializationHelper.java | 3 - .../internal/locator/ServerLocationRequest.java| 3 - .../internal/locator/ServerLocationResponse.java | 3 - .../locator/wan/LocatorMembershipListener.java | 1 - .../client/internal/pooling/ConnectionManager.java | 1 - .../internal/pooling/ConnectionManagerImpl.java| 1 - .../geode/cache/configuration/CacheConfig.java | 840 + .../geode/cache/configuration/CacheLoaderType.java | 10 +- .../configuration/CacheTransactionManagerType.java | 30 +- .../geode/cache/configuration/CacheWriterType.java | 10 +- .../configuration/ClassWithParametersType.java | 10 +- .../geode/cache/configuration/DeclarableType.java | 10 +- .../geode/cache/configuration/DiskDirType.java | 20 +- .../geode/cache/configuration/DiskStoreType.java | 110 ++- .../configuration/DynamicRegionFactoryType.java| 40 +- .../configuration/ExpirationAttributesType.java| 40 +- .../cache/configuration/FunctionServiceType.java | 10 +- .../geode/cache/configuration/InitializerType.java | 10 +- .../cache/con
[geode] 01/01: GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4647
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3977040ece878609bfec34f27b15dbba1b403f94
Author: zhouxh
AuthorDate: Wed Feb 21 21:31:07 2018 -0800
GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in
secondary
gateway sender queue
---
.../asyncqueue/internal/AsyncEventQueueStats.java | 3 +
.../internal/cache/AbstractBucketRegionQueue.java | 8 ++
.../geode/internal/cache/AbstractRegionMap.java| 12 ++
.../apache/geode/internal/cache/BucketAdvisor.java | 2 +
.../geode/internal/cache/BucketRegionQueue.java| 2 +
.../internal/cache/wan/AbstractGatewaySender.java | 1 +
.../internal/cache/wan/GatewaySenderStats.java | 61 +
.../wan/parallel/ParallelGatewaySenderQueue.java | 8 +-
.../wan/parallel/ParallelQueueRemovalMessage.java | 3 +
.../SerialAsyncEventQueueImplJUnitTest.java| 3 +
.../cache/wan/AsyncEventQueueTestBase.java | 18 ++-
.../asyncqueue/AsyncEventListenerDUnitTest.java| 8 +-
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 48 +--
.../ParallelQueueRemovalMessageJUnitTest.java | 12 ++
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 2 -
.../geode/internal/cache/wan/WANTestBase.java | 79 +--
.../parallel/ParallelWANConflationDUnitTest.java | 56 ++--
.../wan/parallel/ParallelWANStatsDUnitTest.java| 150 +
.../serial/SerialGatewaySenderQueueDUnitTest.java | 12 +-
.../wan/serial/SerialWANConflationDUnitTest.java | 73 +-
.../wan/serial/SerialWANPropagationDUnitTest.java | 1 +
21 files changed, 517 insertions(+), 45 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
index 2f3029a..8d68cee 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
@@ -42,6 +42,8 @@ public class AsyncEventQueueStats extends GatewaySenderStats {
f.createLongCounter(EVENT_QUEUE_TIME, "Total time spent queueing
events.",
"nanoseconds"),
f.createIntGauge(EVENT_QUEUE_SIZE, "Size of the event queue.",
"operations", false),
+f.createIntGauge(EVENT_SECONDARY_QUEUE_SIZE, "Size of the
secondary event queue.",
+"operations", false),
f.createIntGauge(TMP_EVENT_QUEUE_SIZE, "Size of the temporary
events queue.",
"operations", false),
f.createIntCounter(EVENTS_NOT_QUEUED_CONFLATED,
@@ -108,6 +110,7 @@ public class AsyncEventQueueStats extends
GatewaySenderStats {
eventsNotQueuedConflatedId = type.nameToId(EVENTS_NOT_QUEUED_CONFLATED);
eventQueueTimeId = type.nameToId(EVENT_QUEUE_TIME);
eventQueueSizeId = type.nameToId(EVENT_QUEUE_SIZE);
+eventSecondaryQueueSizeId = type.nameToId(EVENT_SECONDARY_QUEUE_SIZE);
eventTmpQueueSizeId = type.nameToId(TMP_EVENT_QUEUE_SIZE);
eventsDistributedId = type.nameToId(EVENTS_DISTRIBUTED);
eventsExceedingAlertThresholdId =
type.nameToId(EVENTS_EXCEEDING_ALERT_THRESHOLD);
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index af62f74..2406b18 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -220,6 +220,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.decQueueSize(size);
}
+ public void decSecondaryQueueSize(int size) {
+this.gatewaySenderStats.decSecondaryQueueSize(size);
+ }
+
public void decQueueSize() {
this.gatewaySenderStats.decQueueSize();
}
@@ -228,6 +232,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.incQueueSize(size);
}
+ public void incSecondaryQueueSize(int size) {
+this.gatewaySenderStats.incSecondaryQueueSize(size);
+ }
+
public void incQueueSize() {
this.gatewaySenderStats.incQueueSize();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 2c57182..0b2e68c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -635,6 +635,10 @@ public abstract class AbstractRegionMap
tombst
[geode] branch develop updated: GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue
This is an automated email from the ASF dual-hosted git repository.
zhouxj 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 69815f9 GEODE-4647: add a stats eventSecondaryQueueSizeId to track
events in secondary gateway sender queue
69815f9 is described below
commit 69815f90ad22c10b0a9b7236c02f9bf04ec28223
Author: zhouxh
AuthorDate: Wed Feb 21 21:31:07 2018 -0800
GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in
secondary
gateway sender queue
---
.../asyncqueue/internal/AsyncEventQueueStats.java | 3 +
.../internal/cache/AbstractBucketRegionQueue.java | 8 ++
.../geode/internal/cache/AbstractRegionMap.java| 12 ++
.../apache/geode/internal/cache/BucketAdvisor.java | 2 +
.../geode/internal/cache/BucketRegionQueue.java| 2 +
.../internal/cache/wan/AbstractGatewaySender.java | 1 +
.../internal/cache/wan/GatewaySenderStats.java | 61 +
.../wan/parallel/ParallelGatewaySenderQueue.java | 8 +-
.../wan/parallel/ParallelQueueRemovalMessage.java | 3 +
.../SerialAsyncEventQueueImplJUnitTest.java| 3 +
.../cache/wan/AsyncEventQueueTestBase.java | 18 ++-
.../asyncqueue/AsyncEventListenerDUnitTest.java| 8 +-
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 48 +--
.../ParallelQueueRemovalMessageJUnitTest.java | 12 ++
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 2 -
.../geode/internal/cache/wan/WANTestBase.java | 79 +--
.../parallel/ParallelWANConflationDUnitTest.java | 56 ++--
.../wan/parallel/ParallelWANStatsDUnitTest.java| 150 +
.../serial/SerialGatewaySenderQueueDUnitTest.java | 12 +-
.../wan/serial/SerialWANConflationDUnitTest.java | 73 +-
.../wan/serial/SerialWANPropagationDUnitTest.java | 1 +
21 files changed, 517 insertions(+), 45 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
index 2f3029a..8d68cee 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
@@ -42,6 +42,8 @@ public class AsyncEventQueueStats extends GatewaySenderStats {
f.createLongCounter(EVENT_QUEUE_TIME, "Total time spent queueing
events.",
"nanoseconds"),
f.createIntGauge(EVENT_QUEUE_SIZE, "Size of the event queue.",
"operations", false),
+f.createIntGauge(EVENT_SECONDARY_QUEUE_SIZE, "Size of the
secondary event queue.",
+"operations", false),
f.createIntGauge(TMP_EVENT_QUEUE_SIZE, "Size of the temporary
events queue.",
"operations", false),
f.createIntCounter(EVENTS_NOT_QUEUED_CONFLATED,
@@ -108,6 +110,7 @@ public class AsyncEventQueueStats extends
GatewaySenderStats {
eventsNotQueuedConflatedId = type.nameToId(EVENTS_NOT_QUEUED_CONFLATED);
eventQueueTimeId = type.nameToId(EVENT_QUEUE_TIME);
eventQueueSizeId = type.nameToId(EVENT_QUEUE_SIZE);
+eventSecondaryQueueSizeId = type.nameToId(EVENT_SECONDARY_QUEUE_SIZE);
eventTmpQueueSizeId = type.nameToId(TMP_EVENT_QUEUE_SIZE);
eventsDistributedId = type.nameToId(EVENTS_DISTRIBUTED);
eventsExceedingAlertThresholdId =
type.nameToId(EVENTS_EXCEEDING_ALERT_THRESHOLD);
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index af62f74..2406b18 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -220,6 +220,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.decQueueSize(size);
}
+ public void decSecondaryQueueSize(int size) {
+this.gatewaySenderStats.decSecondaryQueueSize(size);
+ }
+
public void decQueueSize() {
this.gatewaySenderStats.decQueueSize();
}
@@ -228,6 +232,10 @@ public abstract class AbstractBucketRegionQueue extends
BucketRegion {
this.gatewaySenderStats.incQueueSize(size);
}
+ public void incSecondaryQueueSize(int size) {
+this.gatewaySenderStats.incSecondaryQueueSize(size);
+ }
+
public void incQueueSize() {
this.gatewaySenderStats.incQueueSize();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 2c57182..0b2e68c 100644
---
a/geode-core/src/main/java/or
[geode] branch develop updated: GEODE-5080: Ensure that reconnect sequence has started (#1805)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 3e49318 GEODE-5080: Ensure that reconnect sequence has started (#1805)
3e49318 is described below
commit 3e4931858487a0b6ae1e23218dbf806c5f9f1359
Author: Jens Deppe
AuthorDate: Mon Apr 16 18:42:27 2018 -0700
GEODE-5080: Ensure that reconnect sequence has started (#1805)
---
.../ClusterConfigLocatorRestartDUnitTest.java | 31 --
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
index a96e3ab..113521c 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
@@ -43,6 +43,20 @@ public class ClusterConfigLocatorRestartDUnitTest {
@Rule
public GfshCommandRule gfsh = new GfshCommandRule();
+ public static class TestDisconnectListener
+ implements InternalDistributedSystem.DisconnectListener {
+static int disconnectCount;
+
+public TestDisconnectListener() {
+ disconnectCount = 0;
+}
+
+@Override
+public void onDisconnect(InternalDistributedSystem sys) {
+ disconnectCount += 1;
+}
+ }
+
@Test
public void serverRestartsAfterLocatorReconnects() throws Exception {
IgnoredException.addIgnoredException("org.apache.geode.ForcedDisconnectException:
for testing");
@@ -54,6 +68,8 @@ public class ClusterConfigLocatorRestartDUnitTest {
rule.startServerVM(1, props, locator0.getPort());
MemberVM server2 = rule.startServerVM(2, props, locator0.getPort());
+addDisconnectListener(locator0);
+
server2.invokeAsync(() -> MembershipManagerHelper
.crashDistributedSystem(InternalDistributedSystem.getConnectedInstance()));
locator0.invokeAsync(() -> MembershipManagerHelper
@@ -100,8 +116,6 @@ public class ClusterConfigLocatorRestartDUnitTest {
server3.invokeAsync(() -> MembershipManagerHelper
.crashDistributedSystem(InternalDistributedSystem.getConnectedInstance()));
-waitForLocatorToReconnect(locator1);
-
rule.startServerVM(4, locator1.getPort(), locator0.getPort());
gfsh.connectAndVerify(locator1);
@@ -111,7 +125,20 @@ public class ClusterConfigLocatorRestartDUnitTest {
.tableHasColumnOnlyWithValues("Name", "locator-1", "server-2",
"server-3", "server-4"));
}
+ private void addDisconnectListener(MemberVM member) {
+member.invoke(() -> {
+ InternalDistributedSystem ds =
+ (InternalDistributedSystem)
InternalLocator.getLocator().getDistributedSystem();
+ ds.addDisconnectListener(new TestDisconnectListener());
+});
+ }
+
private void waitForLocatorToReconnect(MemberVM locator) {
+// Ensure that disconnect/reconnect sequence starts otherwise in the next
await we might end up
+// with the initial locator instead of a newly created one.
+Awaitility.waitAtMost(30, TimeUnit.SECONDS)
+.until(() -> locator.invoke(() ->
TestDisconnectListener.disconnectCount > 0));
+
Awaitility.waitAtMost(30, TimeUnit.SECONDS).until(() -> locator.invoke(()
-> {
InternalLocator intLocator = InternalLocator.getLocator();
return intLocator != null && intLocator.isSharedConfigurationRunning();
--
To stop receiving notification emails like this one, please contact
jensde...@apache.org.
