[geode] branch develop updated (9154cfc7ed -> 18f0e9c55c)
This is an automated email from the ASF dual-hosted git repository.
mivanac pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
from 9154cfc7ed GEODE-10226: Added monitoring of async writer (#7667)
add 18f0e9c55c GEODE-10020: For Ping task avoid registering new
destination endpoint (#7515)
No new revisions were added by this update.
Summary of changes:
...iversWithSamePortAndHostnameForSendersTest.java | 48 +-
.../cache/client/internal/ConnectionImpl.java | 21 ++-
.../cache/client/internal/OpExecutorImpl.java | 17 ++-
.../geode/distributed/internal/ServerLocation.java | 15 +-
...eRunnable.java => ServerLocationExtension.java} | 23 ++-
.../cache/client/internal/ConnectionImplTest.java | 165 +
...dTest.java => ServerLocationExtensionTest.java} | 74 +++--
.../distributed/internal/ServerLocationTest.java | 72 +
8 files changed, 359 insertions(+), 76 deletions(-)
copy
geode-core/src/main/java/org/apache/geode/distributed/internal/{SizeableRunnable.java
=> ServerLocationExtension.java} (62%)
create mode 100644
geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionImplTest.java
copy
geode-core/src/test/java/org/apache/geode/distributed/internal/{ServerLocationAndMemberIdTest.java
=> ServerLocationExtensionTest.java} (53%)
create mode 100644
geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocationTest.java
[geode] branch develop updated: GEODE-10226: Added monitoring of async writer (#7667)
This is an automated email from the ASF dual-hosted git repository.
mivanac 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 9154cfc7ed GEODE-10226: Added monitoring of async writer (#7667)
9154cfc7ed is described below
commit 9154cfc7ed70f1accd695a7e99714d3886e29ba9
Author: Mario Ivanac <48509724+miva...@users.noreply.github.com>
AuthorDate: Wed May 25 07:32:44 2022 +0200
GEODE-10226: Added monitoring of async writer (#7667)
* GEODE-10226: Added monitoring of async writer
---
.../apache/geode/internal/cache/DiskStoreImpl.java | 121 -
.../internal/monitoring/ThreadsMonitoring.java | 4 +-
.../internal/monitoring/ThreadsMonitoringImpl.java | 4 +
.../monitoring/executor/AbstractExecutor.java | 4 +
...Executor.java => AsyncWriterExecutorGroup.java} | 28 +
.../monitoring/executor/SuspendableExecutor.java | 9 ++
.../cache/DiskStoreImplValueRecoveryTest.java | 14 +++
.../geode/internal/cache/FlusherThreadTest.java| 17 +++
.../monitoring/ThreadsMonitoringImplJUnitTest.java | 1 +
.../monitoring/ThreadsMonitoringJUnitTest.java | 6 +-
.../executor/SuspendableExecutorTest.java | 11 ++
11 files changed, 142 insertions(+), 77 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index 9dee1c1c77..0f9865b720 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -19,6 +19,7 @@ import static
org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FIL
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static
org.apache.geode.internal.cache.entries.DiskEntry.Helper.readRawValue;
+import static
org.apache.geode.internal.monitoring.ThreadsMonitoring.Mode.AsyncWriterExecutor;
import java.io.File;
import java.io.FileOutputStream;
@@ -113,6 +114,8 @@ import
org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.monitoring.ThreadsMonitoring;
+import org.apache.geode.internal.monitoring.executor.AbstractExecutor;
import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.logging.internal.executors.LoggingExecutors;
@@ -1649,6 +1652,10 @@ public class DiskStoreImpl implements DiskStore {
this.diskStore = diskStore;
}
+private ThreadsMonitoring getThreadMonitoring() {
+ return
diskStore.getCache().getInternalDistributedSystem().getDM().getThreadMonitoring();
+}
+
private boolean waitUntilFlushIsReady() throws InterruptedException {
if (diskStore.maxAsyncItems > 0) {
final long time = diskStore.getTimeInterval();
@@ -1716,67 +1723,79 @@ public class DiskStoreImpl implements DiskStore {
logger.debug("Async writer thread started");
}
boolean doingFlush = false;
+ final ThreadsMonitoring threadMonitoring = getThreadMonitoring();
+ final AbstractExecutor threadMonitorExecutor =
+ threadMonitoring.createAbstractExecutor(AsyncWriterExecutor);
+ threadMonitorExecutor.suspendMonitoring();
+ threadMonitoring.register(threadMonitorExecutor);
+
try {
while (waitUntilFlushIsReady()) {
- int drainCount = diskStore.fillDrainList();
- if (drainCount > 0) {
-Iterator it = diskStore.getDrainList().iterator();
-while (it.hasNext()) {
- Object o = it.next();
- if (o instanceof FlushNotifier) {
-flushChild();
-if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
- if (!it.hasNext()) {
-doingFlush = false;
-CacheObserverHolder.getInstance().afterWritingBytes();
+ threadMonitorExecutor.resumeMonitoring();
+ try {
+int drainCount = diskStore.fillDrainList();
+if (drainCount > 0) {
+ Iterator it = diskStore.getDrainList().iterator();
+ while (it.hasNext()) {
+threadMonitorExecutor.reportProgress();
+Object o = it.next();
+if (o instanceof FlushNotifier) {
+ flushChild();
+ if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+if (!it.hasNext()) {
+ doingFlush = false;
+ CacheObserve
[geode-benchmarks] branch develop updated: GEODE-10296: Prevent JVM exit on parser error. (#168)
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-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new 4ffee416 GEODE-10296: Prevent JVM exit on parser error. (#168)
4ffee416 is described below
commit 4ffee41659f41e745066776e0213fa2f58408b7a
Author: Jacob Barrett
AuthorDate: Tue May 24 09:29:11 2022 -0700
GEODE-10296: Prevent JVM exit on parser error. (#168)
Configure HistogramLogProcessor to throw exceptions rather than exit.
---
.../geode/perftest/yardstick/hdrhistogram/HdrHistogramWriter.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/yardstick/hdrhistogram/HdrHistogramWriter.java
b/harness/src/main/java/org/apache/geode/perftest/yardstick/hdrhistogram/HdrHistogramWriter.java
index 3ed4033e..087136f1 100644
---
a/harness/src/main/java/org/apache/geode/perftest/yardstick/hdrhistogram/HdrHistogramWriter.java
+++
b/harness/src/main/java/org/apache/geode/perftest/yardstick/hdrhistogram/HdrHistogramWriter.java
@@ -51,12 +51,13 @@ public class HdrHistogramWriter implements
Consumer {
writer.close();
}
HistogramLogProcessor histogramLogProcessor =
- new HistogramLogProcessor(new String[] {"-i",
outputFile.getAbsolutePath(), "-o",
+ new HistogramLogProcessor(new String[] {"-v", "-i",
outputFile.getAbsolutePath(), "-o",
outputHDRFile.getAbsolutePath()});
histogramLogProcessor.run();
HistogramLogProcessor histogramLogProcessorCSV =
- new HistogramLogProcessor(new String[] {"-csv", "-i",
outputFile.getAbsolutePath(), "-o",
- outputCSVFile.getAbsolutePath()});
+ new HistogramLogProcessor(
+ new String[] {"-v", "-csv", "-i", outputFile.getAbsolutePath(),
"-o",
+ outputCSVFile.getAbsolutePath()});
histogramLogProcessorCSV.run();
} catch (FileNotFoundException e) {
throw new UncheckedIOException(e);
