[geode] branch develop updated: GEODE-6347: Adding better logging around critical threshold state change (#3146)
This is an automated email from the ASF dual-hosted git repository.
mcmellawatt 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 5ee6fdc GEODE-6347: Adding better logging around critical threshold
state change (#3146)
5ee6fdc is described below
commit 5ee6fdc9172f8700aaa65f32bce70b24c2340b1c
Author: Ryan McMahon
AuthorDate: Thu Jan 31 17:57:33 2019 -0800
GEODE-6347: Adding better logging around critical threshold state change
(#3146)
---
.../geode/internal/cache/control/HeapMemoryMonitor.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 3047670..0922b94 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -597,16 +597,14 @@ public class HeapMemoryMonitor implements
NotificationListener, MemoryMonitor {
if (event.getState().isCritical() &&
!event.getPreviousState().isCritical()) {
this.cache.getLogger().error(
- String.format("Member: %s above %s critical threshold. Event
generated via %s.",
- event.getMember(), "heap", eventOrigin));
+ createCriticalThresholdLogMessage(event, eventOrigin, true));
if (!this.cache.isQueryMonitorDisabledForLowMemory()) {
this.cache.getQueryMonitor().setLowMemory(true, event.getBytesUsed());
}
} else if (!event.getState().isCritical() &&
event.getPreviousState().isCritical()) {
this.cache.getLogger().error(
- String.format("Member: %s below %s critical threshold. Event
generated via %s.",
- event.getMember(), "heap", eventOrigin));
+ createCriticalThresholdLogMessage(event, eventOrigin, false));
if (!this.cache.isQueryMonitorDisabledForLowMemory()) {
this.cache.getQueryMonitor().setLowMemory(false, event.getBytesUsed());
}
@@ -844,4 +842,13 @@ public class HeapMemoryMonitor implements
NotificationListener, MemoryMonitor {
public static void setTestBytesUsedForThresholdSet(final long
newTestBytesUsedForThresholdSet) {
testBytesUsedForThresholdSet = newTestBytesUsedForThresholdSet;
}
+
+ private String createCriticalThresholdLogMessage(MemoryEvent event, String
eventOrigin,
+ boolean above) {
+return "Member: " + event.getMember() + " " + (above ? "above" : "below")
++ " heap critical threshold."
++ " Event generated via " + eventOrigin + "."
++ " Used bytes: " + event.getBytesUsed() + "."
++ " Memory thresholds: " + thresholds;
+ }
}
[geode] branch feature/GEODE-6291 updated: SqlToPdxInstance unit tests passing
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-6291
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6291 by this
push:
new 546e811 SqlToPdxInstance unit tests passing
546e811 is described below
commit 546e81120d1a1384341ad65f3ac9e008711cc82f
Author: Jianxia Chen
AuthorDate: Thu Jan 31 16:57:27 2019 -0800
SqlToPdxInstance unit tests passing
---
.../connectors/jdbc/internal/SqlToPdxInstance.java | 4 +-
.../jdbc/internal/SqlToPdxInstanceTest.java| 709 +
2 files changed, 148 insertions(+), 565 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstance.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstance.java
index a66960c..535e24e 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstance.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstance.java
@@ -97,7 +97,7 @@ public class SqlToPdxInstance {
/**
* @throws SQLException if the column value get fails
*/
- private Object getFieldValue(ResultSet resultSet, int columnIndex, FieldType
fieldType,
+ Object getFieldValue(ResultSet resultSet, int columnIndex, FieldType
fieldType,
ResultSetMetaData metaData)
throws SQLException {
switch (fieldType) {
@@ -188,7 +188,7 @@ public class SqlToPdxInstance {
char charValue = 0;
String columnValue = resultSet.getString(columnIndex);
if (columnValue != null && columnValue.length() > 0) {
- charValue = columnValue.toCharArray()[0];
+ charValue = columnValue.charAt(0);
}
return charValue;
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
index 9430ea6..1321984 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceTest.java
@@ -15,20 +15,16 @@
package org.apache.geode.connectors.jdbc.internal;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import java.sql.Blob;
-import java.sql.JDBCType;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.Types;
import java.util.Date;
import junitparams.JUnitParamsRunner;
@@ -40,60 +36,57 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
-import org.apache.geode.connectors.jdbc.internal.configuration.FieldMapping;
-import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
-import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.FieldType;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.pdx.PdxInstanceFactory;
-import org.apache.geode.pdx.internal.PdxField;
-import org.apache.geode.pdx.internal.TypeRegistry;
+import org.apache.geode.pdx.WritablePdxInstance;
@RunWith(JUnitParamsRunner.class)
public class SqlToPdxInstanceTest {
private static final String COLUMN_NAME_1 = "columnName1";
- private static final Object COLUMN_VALUE_1 = "columnValue1";
- private static final Object COLUMN_VALUE_2 = "columnValue2";
private static final String COLUMN_NAME_2 = "columnName2";
- private static final String KEY_COLUMN = "keyColumn";
- private static final String PDX_FIELD_NAME_1 = COLUMN_NAME_1.toLowerCase();
- private static final String PDX_FIELD_NAME_2 = COLUMN_NAME_2.toLowerCase();
+ private static final String PDX_FIELD_NAME_1 = "pdxFieldName1";
+ private static final String PDX_FIELD_NAME_2 = "pdxFieldName2";
+
+ private SqlToPdxInstance sqlToPdxInstance;
+ private final WritablePdxInstance writablePdxInstance =
mock(WritablePdxInstance.class);
- private InternalCache cache;
- private RegionMapping regionMapping;
- private FieldMapping columnMapping = mock(FieldMapping.class);
private ResultSet resultSet;
+ private ResultSetMetaData metaData = mock(ResultSetMetaData.class);
@Rule
public ExpectedException thrown = ExpectedException.none();
@Before
public void setup() throws Exception {
-cache = mock(InternalCache.class);
-regionMapping =
[geode] branch develop updated: GEODE-6329, GEODE-6328: Fix issues with show missing-disk-stores (#3136)
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout 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 8e32605 GEODE-6329, GEODE-6328: Fix issues with show
missing-disk-stores (#3136)
8e32605 is described below
commit 8e32605e8ca026eb28f4c6095dfbcaca5cbd09a1
Author: Dan Smith
AuthorDate: Thu Jan 31 15:23:20 2019 -0800
GEODE-6329, GEODE-6328: Fix issues with show missing-disk-stores (#3136)
* Using consistent logic for finding missing disk stores
The gfsh command for finding missing disk stores was not ignoring
present disk stores. However, the JMX command was. The gfsh command was
also not deduplicating the missing disk stores. Changing the gfsh command to
use the JMX logic.
* Making sure member is removed from persistent view
When we start up a member that has persistent data that it should delete
(due to already established redundancy), the member was not correctly
removing members from it's persistent view in
PersistenceAdvisorImpl.updateMembershipView. This was due to the fact
that the destroyOfflineData method was clearing the recoveredMembers
set, but not the underlying persistentMemberView.
The persistentMemberView probably should be preserved, in case the
member is killed and restarted before it gets a new view. So we should
reset the recoveredMembers set to the correct value.
* Simplifying the logic for reporting present disk stores
The logic for reporting what disk stores were actually running on a
node, for the purposes of not reporting those disk stores as missing,
was overly complicated. Due to that, it only included disk stores that
actually had any persistent regions/buckets on that node, rather than
all disk stores.
Refactoring the code to just list all disk stores.
---
...PersistentPartitionedRegionDistributedTest.java | 44 ++
.../PersistentRecoveryOrderDUnitTest.java | 6 +-
.../geode/management/DiskManagementDUnitTest.java | 10 +-
.../ShowMissingDiskStoreCommandDUnitTest.java | 167 +
.../commands/ShowMissingDiskStoresDUnitTest.java | 152 ---
.../admin/remote/MissingPersistentIDsRequest.java | 7 +-
.../geode/internal/cache/AbstractDiskRegion.java | 2 +-
.../apache/geode/internal/cache/DiskStoreImpl.java | 2 +-
.../geode/internal/cache/PartitionedRegion.java| 2 +-
.../cache/partitioned/RedundancyLogger.java| 2 +-
.../cache/persistence/PersistenceAdvisorImpl.java | 13 +-
.../cache/persistence/PersistentMemberManager.java | 19 ---
.../internal/beans/DistributedSystemBridge.java| 4 +-
.../cli/commands/ShowMissingDiskStoreCommand.java | 60
14 files changed, 262 insertions(+), 228 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index 3466a23..956e44d 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -59,6 +59,7 @@ import org.junit.runner.RunWith;
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.DistributedSystemConfig;
+import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -1269,6 +1270,49 @@ public class PersistentPartitionedRegionDistributedTest
implements Serializable
});
}
+ @Test
+ public void rebalanceWithMembersOfflineDoesNotResultInMissingDiskStores()
throws Exception {
+int numBuckets = 12;
+
+vm0.invoke(() -> createPartitionedRegion(1, -1, numBuckets, true));
+vm1.invoke(() -> createPartitionedRegion(1, -1, numBuckets, true));
+vm2.invoke(() -> createPartitionedRegion(1, -1, numBuckets, true));
+vm3.invoke(() -> createPartitionedRegion(1, -1, numBuckets, true));
+
+vm0.invoke(() -> createData(0, numBuckets, "a"));
+
+// Stop vm0, rebalance, stop vm1, rebalance
+vm0.invoke(() -> getCache().close());
+rebalance(vm3);
+vm1.invoke(() -> getCache().close());
+rebalance(vm3);
+
+// Check missing disk stores (should include vm0 and vm1)
+Set missingMembers = getMissingPersistentMembers(vm3);
+assertThat(missingMembers).hasSize(2);
+
+vm1.invoke(() -> createPartitionedRegion(1, -1, numBuckets,
[geode] branch feature/GEODE-6244b updated: empty commit
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-6244b in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-6244b by this push: new 353a6f6 empty commit 353a6f6 is described below commit 353a6f604424fb1edf97e412568f28c2744cd3c1 Author: Bruce Schuchardt AuthorDate: Thu Jan 31 12:56:00 2019 -0800 empty commit
[geode-benchmarks] branch GEODE-6340 updated: add cli options for metadata
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch GEODE-6340
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/GEODE-6340 by this push:
new ff4ecaf add cli options for metadata
ff4ecaf is described below
commit ff4ecaf28ab1567340f2ce80842cd2cd2f722246
Author: Helena A. Bales
AuthorDate: Thu Jan 31 11:40:12 2019 -0800
add cli options for metadata
---
harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java | 1 -
.../main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
b/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
index 0609f46..337e6ed 100644
--- a/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
+++ b/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
@@ -73,7 +73,6 @@ public class RemoteJVMs implements AutoCloseable {
* Copy results to the provided output directory
*/
public void copyResults(File benchmarkOutput) throws IOException {
-//benchmarkOutput.mkdirs();
for (JVMMapping jvm : jvmMappings) {
infra.copyFromNode(jvm.getNode(), jvm.getOutputDir(),
new File(benchmarkOutput, jvm.getRole() + "-" + jvm.getId()));
diff --git
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
index f104fa8..75d33e2 100644
---
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
+++
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
@@ -73,13 +73,12 @@ public class DefaultTestRunner implements TestRunner {
String metadata = System.getProperty("TEST_METADATA");
if(!(metadata == null) && !metadata.isEmpty()) {
File metadataOutput = new File(outputDir, "metadata.json");
-// metadataOutput.mkdirs();
metadataOutput.createNewFile();
FileWriter metadataWriter = new
FileWriter(metadataOutput.getAbsoluteFile(), true);
String[] metadataEntries = metadata.split(",");
for(String data : metadataEntries) {
-metadataWriter.write(data);
+metadataWriter.write(data + "\n");
}
metadataWriter.flush();
}
[geode-benchmarks] branch GEODE-6340 updated: actually append to file hopefully
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch GEODE-6340
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/GEODE-6340 by this push:
new 773b4c0 actually append to file hopefully
773b4c0 is described below
commit 773b4c05eb979aa60b1f3de99fb4dddf6bc2fc03
Author: Helena A. Bales
AuthorDate: Thu Jan 31 11:23:14 2019 -0800
actually append to file hopefully
---
.../java/org/apache/geode/perftest/runner/DefaultTestRunner.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
index 60ba076..f104fa8 100644
---
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
+++
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
@@ -18,6 +18,7 @@
package org.apache.geode.perftest.runner;
import java.io.File;
+import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
@@ -74,12 +75,13 @@ public class DefaultTestRunner implements TestRunner {
File metadataOutput = new File(outputDir, "metadata.json");
// metadataOutput.mkdirs();
metadataOutput.createNewFile();
- PrintWriter metadataWriter = new PrintWriter(metadataOutput);
+ FileWriter metadataWriter = new
FileWriter(metadataOutput.getAbsoluteFile(), true);
String[] metadataEntries = metadata.split(",");
for(String data : metadataEntries) {
-metadataWriter.println(data);
+metadataWriter.write(data);
}
+ metadataWriter.flush();
}
Map roles = config.getRoles();
[geode] branch feature/GEODE-6273 updated (995a8d5 -> d3651a9)
This is an automated email from the ASF dual-hosted git repository. jchen21 pushed a change to branch feature/GEODE-6273 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 995a8d5 Use "cluster" instead of null for group new d3651a9 Use "cluster" instead of null for group 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 (995a8d5) \ N -- N -- N refs/heads/feature/GEODE-6273 (d3651a9) 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 7278 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: .../geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java | 7 +-- .../apache/geode/connectors/util/DescribeMappingCommandTest.java | 6 -- 2 files changed, 9 insertions(+), 4 deletions(-)
[geode-benchmarks] branch GEODE-6340 updated: HOW MANY TRIES
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch GEODE-6340
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/GEODE-6340 by this push:
new 00d453e HOW MANY TRIES
00d453e is described below
commit 00d453e8fce90ca550f2762fa5ed9583533ed871
Author: Helena A. Bales
AuthorDate: Thu Jan 31 11:09:57 2019 -0800
HOW MANY TRIES
---
.../main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
index 61dee11..60ba076 100644
---
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
+++
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
@@ -72,7 +72,7 @@ public class DefaultTestRunner implements TestRunner {
String metadata = System.getProperty("TEST_METADATA");
if(!(metadata == null) && !metadata.isEmpty()) {
File metadataOutput = new File(outputDir, "metadata.json");
- metadataOutput.mkdirs();
+// metadataOutput.mkdirs();
metadataOutput.createNewFile();
PrintWriter metadataWriter = new PrintWriter(metadataOutput);
[geode-benchmarks] branch GEODE-6340 updated: and again
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch GEODE-6340
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/GEODE-6340 by this push:
new 847188c and again
847188c is described below
commit 847188c88847bb96e33192c4983ada7baed406f6
Author: Helena A. Bales
AuthorDate: Thu Jan 31 11:06:29 2019 -0800
and again
---
harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java | 2 +-
.../main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
b/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
index 317cae3..0609f46 100644
--- a/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
+++ b/harness/src/main/java/org/apache/geode/perftest/jvms/RemoteJVMs.java
@@ -73,7 +73,7 @@ public class RemoteJVMs implements AutoCloseable {
* Copy results to the provided output directory
*/
public void copyResults(File benchmarkOutput) throws IOException {
-benchmarkOutput.mkdirs();
+//benchmarkOutput.mkdirs();
for (JVMMapping jvm : jvmMappings) {
infra.copyFromNode(jvm.getNode(), jvm.getOutputDir(),
new File(benchmarkOutput, jvm.getRole() + "-" + jvm.getId()));
diff --git
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
index 3b9eb8e..61dee11 100644
---
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
+++
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
@@ -67,11 +67,12 @@ public class DefaultTestRunner implements TestRunner {
throw new IllegalStateException(
"Benchmark output directory already exists: " +
benchmarkOutput.getPath());
}
+benchmarkOutput.mkdirs();
String metadata = System.getProperty("TEST_METADATA");
if(!(metadata == null) && !metadata.isEmpty()) {
File metadataOutput = new File(outputDir, "metadata.json");
-// metadataOutput.mkdir();
+ metadataOutput.mkdirs();
metadataOutput.createNewFile();
PrintWriter metadataWriter = new PrintWriter(metadataOutput);
[geode-benchmarks] branch GEODE-6340 updated: try again
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a commit to branch GEODE-6340
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/GEODE-6340 by this push:
new 5b84f3e try again
5b84f3e is described below
commit 5b84f3e146df5e713bad60ab2ed191ad143ca6fc
Author: Helena A. Bales
AuthorDate: Thu Jan 31 11:03:52 2019 -0800
try again
---
.../main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
index 973cb5d..3b9eb8e 100644
---
a/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
+++
b/harness/src/main/java/org/apache/geode/perftest/runner/DefaultTestRunner.java
@@ -71,7 +71,7 @@ public class DefaultTestRunner implements TestRunner {
String metadata = System.getProperty("TEST_METADATA");
if(!(metadata == null) && !metadata.isEmpty()) {
File metadataOutput = new File(outputDir, "metadata.json");
- metadataOutput.mkdir();
+// metadataOutput.mkdir();
metadataOutput.createNewFile();
PrintWriter metadataWriter = new PrintWriter(metadataOutput);
[geode] branch develop updated: GEODE-2113 implement SSL over NIO
This is an automated email from the ASF dual-hosted git repository.
bschuchardt 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 588af85 GEODE-2113 implement SSL over NIO
588af85 is described below
commit 588af8522a48b1fcaf045bb9ce028e4e8422dcba
Author: Bruce Schuchardt
AuthorDate: Thu Jan 31 11:04:03 2019 -0800
GEODE-2113 implement SSL over NIO
Removing modifications to ProcessManager that were inadvertently
committed with the SSL implementation code.
---
.../apache/geode/test/dunit/internal/ProcessManager.java | 16 ++--
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
index 9572cf6..32ab6c8 100755
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
@@ -159,22 +159,10 @@ class ProcessManager implements ChildVMLauncher {
private void linkStreams(final String version, final int vmNum, final
ProcessHolder holder,
final InputStream in, final PrintStream out) {
-final String vmName = "[" + VM.getVMName(version, vmNum);
+final String vmName = "[" + VM.getVMName(version, vmNum) + "] ";
Thread ioTransport = new Thread() {
@Override
public void run() {
-StringBuffer sb = new StringBuffer();
-// use low four bytes for backward compatibility
-long time = System.currentTimeMillis() & 0xL;
-for (int i = 0; i < 4; i++) {
- String hex = Integer.toHexString((int) (time & 0xff));
- if (hex.length() < 2) {
-sb.append('0');
- }
- sb.append(hex);
- time = time / 0x100;
-}
-String uniqueString = vmName + ", 0x" + sb.toString() + "] ";
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
try {
String line = reader.readLine();
@@ -182,7 +170,7 @@ class ProcessManager implements ChildVMLauncher {
if (line.length() == 0) {
out.println();
} else {
- out.print(uniqueString);
+ out.print(vmName);
out.println(line);
}
line = reader.readLine();
[geode-native] branch origin/release/1.8 deleted (was daca765)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a change to branch origin/release/1.8 in repository https://gitbox.apache.org/repos/asf/geode-native.git. was daca765 Restore accidental modification to license text This change permanently discards the following revisions: discard daca765 Restore accidental modification to license text discard 0328a9b Repair some bad links
[geode] branch feature/GEODE-6273 updated: Use "cluster" instead of null for group
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-6273
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6273 by this
push:
new 995a8d5 Use "cluster" instead of null for group
995a8d5 is described below
commit 995a8d558ae4851eca79f2e45ab78145cefc04ae
Author: Jianxia Chen
AuthorDate: Thu Jan 31 10:38:17 2019 -0800
Use "cluster" instead of null for group
Authored-by: Jianxia Chen
---
.../jdbc/internal/cli/DescribeMappingCommand.java | 27 ++
.../util/DescribeMappingCommandTest.java | 4 ++--
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
index 8144778..e8a42f1 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
@@ -56,7 +56,7 @@ public class DescribeMappingCommand extends GfshCommand {
private static final String DESCRIBE_MAPPING__REGION_NAME__HELP =
"Region name of the JDBC mapping to be described.";
private static final String CREATE_MAPPING__GROUPS_NAME__HELP =
- "Server Group of the JDBC mapping to be described.";
+ "Server Group(s) of the JDBC mapping to be described.";
public static final String RESULT_SECTION_NAME = "MappingDescription";
@@ -77,17 +77,14 @@ public class DescribeMappingCommand extends GfshCommand {
try {
ConfigurationPersistenceService configService =
checkForClusterConfiguration();
- if (groups != null) {
-for (String group : groups) {
- CacheConfig cacheConfig = getCacheConfig(configService, group);
- RegionConfig regionConfig = checkForRegion(regionName, cacheConfig,
group);
- describeMappingResults
- .addAll(getMappingsFromRegionConfig(cacheConfig, regionConfig,
group));
-}
- } else {
-CacheConfig cacheConfig = getCacheConfig(configService, null);
-RegionConfig regionConfig = checkForRegion(regionName, cacheConfig,
null);
-describeMappingResults.addAll(getMappingsFromRegionConfig(cacheConfig,
regionConfig, null));
+ if (groups == null) {
+groups = new String[] {ConfigurationPersistenceService.CLUSTER_CONFIG};
+ }
+ for (String group : groups) {
+CacheConfig cacheConfig = getCacheConfig(configService, group);
+RegionConfig regionConfig = checkForRegion(regionName, cacheConfig,
group);
+describeMappingResults
+.addAll(getMappingsFromRegionConfig(cacheConfig, regionConfig,
group));
}
} catch (PreconditionException ex) {
return ResultModel.createError(ex.getMessage());
@@ -108,7 +105,7 @@ public class DescribeMappingCommand extends GfshCommand {
CacheConfig result = configService.getCacheConfig(group);
if (result == null) {
throw new PreconditionException(
- "Cache Configuration not found" + ((group == null) ? "." : " for
group " + group + "."));
+ "Cache Configuration not found" +
((group.equals(ConfigurationPersistenceService.CLUSTER_CONFIG)) ? "." : " for
group " + group + "."));
}
return result;
}
@@ -162,7 +159,7 @@ public class DescribeMappingCommand extends GfshCommand {
for (int i = 0; i < describeMappingResult.size(); i++) {
DataResultModel sectionModel = resultModel.addData(RESULT_SECTION_NAME +
String.valueOf(i));
DescribeMappingResult result = describeMappingResult.get(i);
- if (result.getGroupName() != null) {
+ if
(!result.getGroupName().equals(ConfigurationPersistenceService.CLUSTER_CONFIG))
{
sectionModel.addData("Mapping for group", result.getGroupName());
}
result.getAttributeMap().forEach(sectionModel::addData);
@@ -184,7 +181,7 @@ public class DescribeMappingCommand extends GfshCommand {
RegionConfig regionConfig = findRegionConfig(cacheConfig, regionName);
if (regionConfig == null) {
String groupClause = "A region named " + regionName + " must already
exist"
- + (groupName != null ? " for group " + groupName + "." : ".");
+ + (!groupName.equals(ConfigurationPersistenceService.CLUSTER_CONFIG)
? " for group " + groupName + "." : ".");
throw new PreconditionException(groupClause);
}
return regionConfig;
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/org/apache/geode/connectors/util/DescribeMappingCommandTest.java
index 798c226..147f5e7
[geode] branch feature/GEODE-6344 deleted (was 7d4b74c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. was 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (1a6ca26 -> 366bcca)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1a6ca26 GEODE-6339: centralize thread name string (#3139) add 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver new 366bcca Merge pull request #3141 from apache/feature/GEODE-6344 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: .../cache/tier/sockets/CacheClientNotifier.java| 36 +- .../cache/wan/CacheClientNotifierDUnitTest.java| 26 ++-- .../cache/wan/Simple2CacheServerDUnitTest.java | 2 ++ 3 files changed, 32 insertions(+), 32 deletions(-)
[geode] branch develop updated: GEODE-6339: centralize thread name string (#3139)
This is an automated email from the ASF dual-hosted git repository.
jasonhuynh 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 1a6ca26 GEODE-6339: centralize thread name string (#3139)
1a6ca26 is described below
commit 1a6ca26e89c3d3d413b22f6090467fb39db51ebb
Author: Bill Burcham
AuthorDate: Thu Jan 31 09:46:07 2019 -0800
GEODE-6339: centralize thread name string (#3139)
---
.../org/apache/geode/distributed/internal/DistributionMessage.java | 2 +-
.../src/main/java/org/apache/geode/internal/tcp/Connection.java | 5 +++--
.../src/main/java/org/apache/geode/internal/util/PluckStacks.java| 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index d2d441c..7a9e3d7 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -496,7 +496,7 @@ public abstract class DistributionMessage implements
DataSerializableFixedID, Cl
if (pid != 0) {
procId = " processorId=" + pid;
}
- if (Thread.currentThread().getName().startsWith("P2P message reader")) {
+ if
(Thread.currentThread().getName().startsWith(Connection.THREAD_KIND_IDENTIFIER))
{
sender = procId;
} else {
sender = "sender=" + getSender() + procId;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 941bd55..7f182d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -90,6 +90,7 @@ import
org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
*/
public class Connection implements Runnable {
private static final Logger logger = LogService.getLogger();
+ public static final String THREAD_KIND_IDENTIFIER = "P2P message reader";
private static int P2P_CONNECT_TIMEOUT;
private static boolean IS_P2P_CONNECT_TIMEOUT_INITIALIZED = false;
@@ -1602,7 +1603,7 @@ public class Connection implements Runnable {
private String p2pReaderName() {
StringBuilder sb = new StringBuilder(64);
if (this.isReceiver) {
- sb.append("P2P message reader@");
+ sb.append(THREAD_KIND_IDENTIFIER + "@");
} else if (this.handshakeRead) {
sb.append("P2P message sender@");
} else {
@@ -3348,7 +3349,7 @@ public class Connection implements Runnable {
}
private void setThreadName(int dominoNumber) {
-Thread.currentThread().setName("P2P message reader for " + this.remoteAddr
+ " "
+Thread.currentThread().setName(THREAD_KIND_IDENTIFIER + " for " +
this.remoteAddr + " "
+ (this.sharedResource ? "" : "un") + "shared" + " " +
(this.preserveOrder ? "" : "un")
+ "ordered" + " uid=" + this.uniqueId + (dominoNumber > 0 ? (" dom #"
+ dominoNumber) : "")
+ " port=" + this.socket.getPort());
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
b/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
index 4663436..28201f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/PluckStacks.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.zip.GZIPInputStream;
+import org.apache.geode.internal.tcp.Connection;
import
org.apache.geode.management.internal.cli.commands.ExportStackTraceCommand;
/**
@@ -264,7 +265,7 @@ public class PluckStacks {
// thread.get(2));
return (stackSize == 8 &&
thread.get(2).contains("SocketChannelImpl.accept"));
}
-if (threadName.startsWith("P2P message reader")) {
+if (threadName.startsWith(Connection.THREAD_KIND_IDENTIFIER)) {
return (stackSize <= 14 &&
(thread.getFirstFrame().contains("FileDispatcherImpl.read")
|| thread.getFirstFrame().contains("FileDispatcher.read")
|| thread.getFirstFrame().contains("SocketDispatcher.read")));
[geode] branch feature/GEODE-6344 updated (70bb309 -> 7d4b74c)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 70bb309 GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver new 9fa4dc2 GEODE-6293: Fix fire & forget functions in gfsh (#3138) new 8e3c9d7 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs new bbf78d4 Merge pull request #3140 from apache/feature/GEODE-6342 new 7d4b74c GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver 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 (70bb309) \ N -- N -- N refs/heads/feature/GEODE-6344 (7d4b74c) 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 7310 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: .../commands/ExecuteFunctionCommandDUnitTest.java | 66 - .../ExecuteFunctionCommandSecurityTest.java| 11 +- .../cache/execute/CoreFunctionSecurityTest.java| 6 +- .../wan/AbstractGatewaySenderEventProcessor.java | 3 + .../internal/monitoring/ThreadsMonitoring.java | 6 + .../internal/monitoring/ThreadsMonitoringImpl.java | 8 + .../monitoring/ThreadsMonitoringImplDummy.java | 3 + .../cli/commands/ExecuteFunctionCommand.java | 7 +- .../cli/functions/UserFunctionExecution.java | 171 +++ .../monitoring/ThreadsMonitoringImplJUnitTest.java | 28 +- .../cli/functions/UserFunctionExecutionTest.java | 328 + ...xecuteFunctionCommandWithSecurityDUnitTest.java | 4 +- 12 files changed, 546 insertions(+), 95 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/UserFunctionExecutionTest.java
[geode] branch feature/GEODE-6244b updated (087b68b -> 93edcaa)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6244b in repository https://gitbox.apache.org/repos/asf/geode.git. discard 087b68b additional change that IntelliJ hadn't saved discard 352695f GEODE-6244 Healthy member kicked out by Sick member when final-check fails new a8bc0a3 GEODE-6287: Cleaned up FilterProfile clientMap when client disconnects normally new e82693f GEODE-6287: Removed inadvertent log messages new 1e5e7dc GEODE-6326 versionTestConcurrentEventsOnEmptyRegion fails in CI in multiple configurations new 19edb37 GEODE-6294 Document new disable-jmx property new 4d23f68 GEODE-6294 Better wording for disable-jmx property description new 9ab7ffe GEODE-6294 Empty commit to cause re-run of failed CI tests new f8007e4 GEODE-6294 Empty commit to re-run failing tests unassociated with this PR new 68608a9 GEODE-6294 Document new disable-jmx property (#3128) new 3493e8c GEODE-6185: management rest end point returns correct status code and message new c97edf9 GEODE-6174: change refid to type and make the default type to be PARTITION (#3130) new 5a20ec0 GEODE-6314 Only rolling build-version semver at build time (#3113) new 33077b3 GEODE-2113 Implement SSL over NIO new 556ac6e GEODE-6325: Clarify start time assertion new 054687a Merge pull request #3133 from demery-pivotal/feature/GEODE-6325 new 546abdd GEODE-6304: Refactor memory monitor to properly reset tolerance counter (#3102) new 6e7527c GEODE-6339: Breadcrumbs match P2P messaging header new d78b1bf GEODE-6330: Return a TransactionException when tx closed new 75585bc GEODE-6333: Adding the jetty-server dependency to geode-core. (#3135) new 2f277f6 GEODE-6334: Create CachePerfStatsTest and cleanup CachePerfStats (#3137) new 9c35fc7 GEODE-6174: more error handling in LocatorClusterConfigurationService (#3134) new 9fa4dc2 GEODE-6293: Fix fire & forget functions in gfsh (#3138) new 8e3c9d7 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs new bbf78d4 Merge pull request #3140 from apache/feature/GEODE-6342 new e8cfe3a GEODE-6244 Healthy member kicked out by Sick member when final-check fails new 93edcaa additional change that IntelliJ hadn't saved 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 (087b68b) \ N -- N -- N refs/heads/feature/GEODE-6244b (93edcaa) 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 7311 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: .../src/test/resources/expected-pom.xml|5 + ci/pipelines/geode-build/jinja.template.yml| 40 +- extensions/geode-modules-session/build.gradle |4 +- ...ClusterManagementLocatorReconnectDunitTest.java |2 +- .../internal/rest/RegionManagementDunitTest.java | 91 +- ...ionTest.java => DisabledClusterConfigTest.java} | 38 +- .../internal/HttpServiceIntegrationTest.java | 55 +- .../internal/RegionManagementIntegrationTest.java |2 +- .../RegionManagementSecurityIntegrationTest.java | 23 +- geode-assembly/src/test/resources/expected-pom.xml |5 + geode-common/src/test/resources/expected-pom.xml |5 + .../src/test/resources/expected-pom.xml|5 + .../src/test/resources/expected-pom.xml|5 + geode-core/build.gradle|1 + .../geode/ClusterCommunicationsDUnitTest.java | 420 .../CacheServerSSLConnectionDUnitTest.java | 101 +- ...tServerHostNameVerificationDistributedTest.java |5 + .../management/MemoryThresholdsDUnitTest.java | 136 +- .../ResourceManagerWithQueryMonitorDUnitTest.java | 10 +- .../internal/CacheConfigDAODUnitTest.java |2 +- ...ToDataThrowsRuntimeExceptionRegressionTest.java |3 - .../internal/cache/ConcurrentMapOpsDUnitTest.java |1 - .../cache/PartitionedRegionEvictionDUnitTest.java |5 +- .../internal/cache/eviction/EvictionDUnitTest.java |2 +- ...ientServerConnectDisconnectDistributedTest.java | 116 +- .../internal/api/RegionAPIDUnitTest.java | 90 +-
[geode] branch feature/GEODE-6342 deleted (was 8e3c9d7)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6342 in repository https://gitbox.apache.org/repos/asf/geode.git. was 8e3c9d7 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] 01/01: Merge pull request #3140 from apache/feature/GEODE-6342
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit bbf78d4e4a1cc1a16d0876838ebea154b2e87a92 Merge: 9fa4dc2 8e3c9d7 Author: Bruce Schuchardt AuthorDate: Thu Jan 31 08:17:57 2019 -0800 Merge pull request #3140 from apache/feature/GEODE-6342 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs .../wan/AbstractGatewaySenderEventProcessor.java | 3 +++ .../internal/monitoring/ThreadsMonitoring.java | 6 + .../internal/monitoring/ThreadsMonitoringImpl.java | 8 +++ .../monitoring/ThreadsMonitoringImplDummy.java | 3 +++ .../monitoring/ThreadsMonitoringImplJUnitTest.java | 28 ++ 5 files changed, 44 insertions(+), 4 deletions(-)
[geode] branch develop updated (9fa4dc2 -> bbf78d4)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 9fa4dc2 GEODE-6293: Fix fire & forget functions in gfsh (#3138) add 8e3c9d7 GEODE-6342 ThreadsMonitor prints many warnings in gateway sender logs new bbf78d4 Merge pull request #3140 from apache/feature/GEODE-6342 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: .../wan/AbstractGatewaySenderEventProcessor.java | 3 +++ .../internal/monitoring/ThreadsMonitoring.java | 6 + .../internal/monitoring/ThreadsMonitoringImpl.java | 8 +++ .../monitoring/ThreadsMonitoringImplDummy.java | 3 +++ .../monitoring/ThreadsMonitoringImplJUnitTest.java | 28 ++ 5 files changed, 44 insertions(+), 4 deletions(-)
[geode] branch feature/GEODE-6344 updated (0ca2d39 -> 70bb309)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6344 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 0ca2d39 GEODE-6344: should revert GEODE-1183 before a better fix new 70bb309 GEODE-6344: should revert GEODE-1183 before a better fix GEODE-6344: fix CacheClientNotifierDUnitTest to remove the 2nd cacheserver 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 (0ca2d39) \ N -- N -- N refs/heads/feature/GEODE-6344 (70bb309) 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 7307 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: .../cache/wan/CacheClientNotifierDUnitTest.java| 26 +- 1 file changed, 16 insertions(+), 10 deletions(-)
[geode] branch develop updated: GEODE-6293: Fix fire & forget functions in gfsh (#3138)
This is an automated email from the ASF dual-hosted git repository.
jjramos 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 9fa4dc2 GEODE-6293: Fix fire & forget functions in gfsh (#3138)
9fa4dc2 is described below
commit 9fa4dc25c3f1dd9e470729eb707b3fe81fd7fc7e
Author: Juan José Ramos
AuthorDate: Thu Jan 31 08:35:02 2019 +
GEODE-6293: Fix fire & forget functions in gfsh (#3138)
* GEODE-6293: Fix fire & forget functions in gfsh
- Fixed minor warnings.
- Refactored class `UserFunctionExecution`.
- Added unit tests for class `UserFunctionExecution`.
- Class `UserFunctionExecution` now supports the execution of functions
that don't return any results.
---
.../commands/ExecuteFunctionCommandDUnitTest.java | 66 -
.../ExecuteFunctionCommandSecurityTest.java| 11 +-
.../cache/execute/CoreFunctionSecurityTest.java| 6 +-
.../cli/commands/ExecuteFunctionCommand.java | 7 +-
.../cli/functions/UserFunctionExecution.java | 171 +++
.../cli/functions/UserFunctionExecutionTest.java | 328 +
...xecuteFunctionCommandWithSecurityDUnitTest.java | 4 +-
7 files changed, 502 insertions(+), 91 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
index 2296fd4..276c852 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.cli.commands;
import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +31,7 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.RegionFunctionContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
@@ -39,7 +39,7 @@ import
org.apache.geode.test.junit.assertions.TabularResultModelAssert;
import org.apache.geode.test.junit.categories.GfshTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category({GfshTest.class})
+@Category(GfshTest.class)
public class ExecuteFunctionCommandDUnitTest {
@ClassRule
public static ClusterStartupRule cluster = new ClusterStartupRule();
@@ -47,22 +47,23 @@ public class ExecuteFunctionCommandDUnitTest {
@ClassRule
public static GfshCommandRule gfsh = new GfshCommandRule();
- private static MemberVM locator, server1, server2, server3;
private static final String functionId = "genericFunctionId";
-
private static String command = "execute function --id=" + functionId + " ";
@BeforeClass
public static void setUpClass() throws Exception {
-locator = cluster.startLocatorVM(0);
+MemberVM locator = cluster.startLocatorVM(0);
gfsh.connectAndVerify(locator);
-server1 = cluster.startServerVM(1, "group1", locator.getPort());
-server2 = cluster.startServerVM(2, "group1", locator.getPort());
-server3 = cluster.startServerVM(3, "group2", locator.getPort());
-MemberVM.invokeInEveryMember(() -> {
- FunctionService.registerFunction(new GenericFunctionOp(functionId));
-}, server1, server2, server3);
+MemberVM server1 = cluster.startServerVM(1, "group1", locator.getPort());
+MemberVM server2 = cluster.startServerVM(2, "group1", locator.getPort());
+MemberVM server3 = cluster.startServerVM(3, "group2", locator.getPort());
+MemberVM.invokeInEveryMember(
+() -> FunctionService.registerFunction(new
GenericFunctionOp(functionId)), server1, server2,
+server3);
+MemberVM.invokeInEveryMember(
+() -> FunctionService.registerFunction(new FireAndForgetFunction()),
server1, server2,
+server3);
// create a partitioned region on only group1
gfsh.executeAndAssertThat(
@@ -73,7 +74,9 @@ public class ExecuteFunctionCommandDUnitTest {
locator.waitUntilRegionIsReadyOnExactlyThisManyServers("/regionA", 2);
server1.invoke(() -> {
- Region region = ClusterStartupRule.getCache().getRegion("/regionA");
+ InternalCache cache = ClusterStartupRule.getCache();
+ assertThat(cache).isNotNull();
+ Region region = cache.getRegion("/regionA");
