You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mc...@apache.org on 2019/02/01 01:57:43 UTC
[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 <rm...@pivotal.io>
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;
+ }
}