[geode] branch develop updated (b0d05cf -> 6ed37eb)
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 b0d05cf GEODE-9812: Add Radish tests that kills multiple servers (#7115) add 6ed37eb GEODE-9850: tombstone might not create yet caused getOldestTombstoneTime() return 0 (#7141) No new revisions were added by this update. Summary of changes: .../org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] 01/01: GEODE-9850: tombstone might not create yet caused getOldestTombstoneTime() return 0
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-9850
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b59b3d13f8beb28b24ba95706d915b31689ce11a
Author: zhouxh
AuthorDate: Tue Nov 23 16:48:38 2021 -0800
GEODE-9850: tombstone might not create yet caused getOldestTombstoneTime()
return 0
---
.../org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index a576706..bdf4d9d 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -241,10 +241,10 @@ public class TombstoneDUnitTest implements Serializable {
// Send tombstone gc message to vm1.
for (int i = 0; i < count; i++) {
region.destroy("K" + i);
-assertThat(
+await().untilAsserted(() -> assertThat(
tombstoneSweeper.getOldestTombstoneTime()
+ TombstoneService.REPLICATE_TOMBSTONE_TIMEOUT_DEFAULT -
System.currentTimeMillis())
-.isGreaterThan(0);
+.isGreaterThan(0));
performGC(1);
}
[geode] branch feature/GEODE-9850 created (now b59b3d1)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-9850 in repository https://gitbox.apache.org/repos/asf/geode.git. at b59b3d1 GEODE-9850: tombstone might not create yet caused getOldestTombstoneTime() return 0 This branch includes the following new commits: new b59b3d1 GEODE-9850: tombstone might not create yet caused getOldestTombstoneTime() return 0 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.
[geode] branch develop updated (f56d60a -> b0d05cf)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f56d60a GEODE-9838: Log key info for deserialization issue while index update (#7136) add b0d05cf GEODE-9812: Add Radish tests that kills multiple servers (#7115) No new revisions were added by this update. Summary of changes: .../StringsKillMultipleServersDUnitTest.java | 115 + 1 file changed, 115 insertions(+) create mode 100644 geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/string/StringsKillMultipleServersDUnitTest.java
[geode] branch support/1.12 updated: GEODE-9838: Log key info for deserialization issue while index update (#7136)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new d979357 GEODE-9838: Log key info for deserialization issue while
index update (#7136)
d979357 is described below
commit d979357280b0973a5af360c4a1977d9ed5fa6088
Author: Xiaojian Zhou
AuthorDate: Tue Nov 23 09:22:19 2021 -0800
GEODE-9838: Log key info for deserialization issue while index update
(#7136)
(cherry picked from commit f56d60a6227fc46fbf3e8f3f5ba48d8be453e69e)
---
.../cache/query/internal/index/IndexManagerIntegrationTest.java | 6 +-
.../org/apache/geode/cache/query/internal/index/IndexManager.java | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
index 346049c..de8b384 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
@@ -70,7 +70,8 @@ public class IndexManagerIntegrationTest {
TestQueryObject.throwException = false;
logFile = temporaryFolder.newFile(testName.getMethodName() + ".log");
-serverStarterRule.withProperty("log-file",
logFile.getAbsolutePath()).startServer();
+serverStarterRule.withProperty("log-file", logFile.getAbsolutePath())
+.withProperty("log-level", "debug").startServer();
internalCache = serverStarterRule.getCache();
}
@@ -143,6 +144,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " + newKey);
}
@Test
@@ -170,6 +172,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
@Test
@@ -212,6 +215,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
private static class TestQueryObject implements Serializable {
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index fa8db50..7fbfe17 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -1157,6 +1157,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
@@ -1169,6 +1170,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
[geode] branch support/1.13 updated: GEODE-9838: Log key info for deserialization issue while index update (#7136)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new a6c458d GEODE-9838: Log key info for deserialization issue while
index update (#7136)
a6c458d is described below
commit a6c458d4f435c77794d9a0a83e308ffca51f9fc3
Author: Xiaojian Zhou
AuthorDate: Tue Nov 23 09:22:19 2021 -0800
GEODE-9838: Log key info for deserialization issue while index update
(#7136)
(cherry picked from commit f56d60a6227fc46fbf3e8f3f5ba48d8be453e69e)
---
.../cache/query/internal/index/IndexManagerIntegrationTest.java | 6 +-
.../org/apache/geode/cache/query/internal/index/IndexManager.java | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
index 346049c..de8b384 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
@@ -70,7 +70,8 @@ public class IndexManagerIntegrationTest {
TestQueryObject.throwException = false;
logFile = temporaryFolder.newFile(testName.getMethodName() + ".log");
-serverStarterRule.withProperty("log-file",
logFile.getAbsolutePath()).startServer();
+serverStarterRule.withProperty("log-file", logFile.getAbsolutePath())
+.withProperty("log-level", "debug").startServer();
internalCache = serverStarterRule.getCache();
}
@@ -143,6 +144,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " + newKey);
}
@Test
@@ -170,6 +172,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
@Test
@@ -212,6 +215,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
private static class TestQueryObject implements Serializable {
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index fa8db50..7fbfe17 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -1157,6 +1157,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
@@ -1169,6 +1170,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
[geode] branch support/1.14 updated: GEODE-9838: Log key info for deserialization issue while index update (#7136)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new fd3672e GEODE-9838: Log key info for deserialization issue while
index update (#7136)
fd3672e is described below
commit fd3672e2ac902a9851ff2daa6c3180541d3f7ff0
Author: Xiaojian Zhou
AuthorDate: Tue Nov 23 09:22:19 2021 -0800
GEODE-9838: Log key info for deserialization issue while index update
(#7136)
(cherry picked from commit f56d60a6227fc46fbf3e8f3f5ba48d8be453e69e)
---
.../cache/query/internal/index/IndexManagerIntegrationTest.java | 6 +-
.../org/apache/geode/cache/query/internal/index/IndexManager.java | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
index 42ebb3a..e89351c 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexManagerIntegrationTest.java
@@ -71,7 +71,8 @@ public class IndexManagerIntegrationTest {
TestQueryObject.throwException = false;
logFile = temporaryFolder.newFile(testName.getMethodName() + ".log");
-serverStarterRule.withProperty("log-file",
logFile.getAbsolutePath()).startServer();
+serverStarterRule.withProperty("log-file", logFile.getAbsolutePath())
+.withProperty("log-level", "debug").startServer();
internalCache = serverStarterRule.getCache();
}
@@ -144,6 +145,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " + newKey);
}
@Test
@@ -171,6 +173,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
@Test
@@ -213,6 +216,7 @@ public class IndexManagerIntegrationTest {
.contains(String.format(
"Updating the Index %s failed. The index is corrupted and marked
as invalid.",
indexName));
+LogFileAssert.assertThat(logFile).contains("Corrupted key is " +
existingKey);
}
private static class TestQueryObject implements Serializable {
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
index fa8db50..7fbfe17 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/IndexManager.java
@@ -1157,6 +1157,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
@@ -1169,6 +1170,7 @@ public class IndexManager {
logger.warn(String.format(
"Updating the Index %s failed. The index is corrupted and marked as
invalid.",
((AbstractIndex) index).indexName), exception);
+ logger.debug("Corrupted key is " + entry.getKey());
}
}
[geode] branch develop updated (fb142e1 -> f56d60a)
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 fb142e1 GEODE-9825: processInputBuffer resize retains data (#7131) add f56d60a GEODE-9838: Log key info for deserialization issue while index update (#7136) No new revisions were added by this update. Summary of changes: .../cache/query/internal/index/IndexManagerIntegrationTest.java | 6 +- .../org/apache/geode/cache/query/internal/index/IndexManager.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-)
[geode] branch develop updated: GEODE-9825: processInputBuffer resize retains data (#7131)
This is an automated email from the ASF dual-hosted git repository.
burcham 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 fb142e1 GEODE-9825: processInputBuffer resize retains data (#7131)
fb142e1 is described below
commit fb142e1bbd42d6af2463fd9b9b49ef3e5519cfcb
Author: Bill Burcham
AuthorDate: Tue Nov 23 08:29:11 2021 -0800
GEODE-9825: processInputBuffer resize retains data (#7131)
---
.../internal/P2PMessagingConcurrencyDUnitTest.java | 136 +++--
.../org/apache/geode/internal/tcp/Connection.java | 12 +-
2 files changed, 111 insertions(+), 37 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/P2PMessagingConcurrencyDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/P2PMessagingConcurrencyDUnitTest.java
index e54191a..c204777 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/P2PMessagingConcurrencyDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/P2PMessagingConcurrencyDUnitTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.distributed.internal;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.DataInput;
@@ -29,12 +30,13 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.LongAdder;
+import junitparams.Parameters;
import org.jetbrains.annotations.NotNull;
-import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.ssl.CertStores;
@@ -48,15 +50,24 @@ import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.DistributedExecutorServiceRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.MembershipTest;
+import org.apache.geode.test.junit.runners.GeodeParamsRunner;
import org.apache.geode.test.version.VersionManager;
/**
- * Tests one-way P2P messaging between two peers. A shared,
- * ordered connection is used and many concurrent tasks
- * compete on the sending side. Tests with TLS enabled
- * to exercise ByteBufferSharing and friends.
+ * Tests one-way P2P messaging between two peers.
+ * Many concurrent tasks compete on the sending side.
+ * The main purpose of the test is to exercise
+ * ByteBufferSharing and friends.
+ *
+ * Tests combinations of: conserve-sockets true/false,
+ * TLS on/off, and socket-buffer-size for sender
+ * and receiver both set to the default (and equal)
+ * and set to the sender's buffer twice as big as the
+ * receiver's buffer.
+ *
*/
@Category({MembershipTest.class})
+@RunWith(GeodeParamsRunner.class)
public class P2PMessagingConcurrencyDUnitTest {
// how many messages will each sender generate?
@@ -71,6 +82,8 @@ public class P2PMessagingConcurrencyDUnitTest {
// random seed
private static final int RANDOM_SEED = 1234;
+ private static Properties securityProperties;
+
@Rule
public final ClusterStartupRule clusterStartupRule = new
ClusterStartupRule(3);
@@ -87,21 +100,56 @@ public class P2PMessagingConcurrencyDUnitTest {
*/
private static LongAdder bytesTransferredAdder;
- @Before
- public void before() throws GeneralSecurityException, IOException {
-final Properties configuration = gemFireConfiguration();
+ private void configure(
+ final boolean conserveSockets,
+ final boolean useTLS,
+ final int sendSocketBufferSize,
+ final int receiveSocketBufferSize) throws GeneralSecurityException,
IOException {
+
+final Properties senderConfiguration =
+gemFireConfiguration(conserveSockets, useTLS, sendSocketBufferSize);
+final Properties receiverConfiguration =
+gemFireConfiguration(conserveSockets, useTLS, receiveSocketBufferSize);
final MemberVM locator =
clusterStartupRule.startLocatorVM(0, 0, VersionManager.CURRENT_VERSION,
-x -> x.withProperties(configuration).withConnectionToLocator()
+x ->
x.withProperties(senderConfiguration).withConnectionToLocator()
.withoutClusterConfigurationService().withoutManagementRestService());
-sender = clusterStartupRule.startServerVM(1, configuration,
locator.getPort());
-receiver = clusterStartupRule.startServerVM(2, configuration,
locator.getPort());
+sender = clusterStartupRule.startServerVM(1, senderConfiguration,
locator.getPort());
+receiver = clusterStartupRule.startServerVM(2, receiverConfiguration,
locator.getPort());
}
@Test
- public void
