Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: unusualActivityFailPercent #191

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Feature: unusualActivityFailPercent #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9532999
ususalActivityFailPercent tag for datasets.xml
ayushsingh01042003 Aug 27, 2024
b7bc3b0
Checks for > 100
ayushsingh01042003 Aug 27, 2024
b973fa0
Update Default = 25
ayushsingh01042003 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions WEB-INF/classes/gov/noaa/pfel/erddap/LoadDatasets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,9 @@ public void run() {
emailDailyReport(threadSummary, threadList, reportDate);
} else {
// major load, but not daily report
emailUnusualActivity(threadSummary, threadList);
if (EDStatic.unusualActivityFailPercent != -1) {
emailUnusualActivity(threadSummary, threadList);
}
}

// after every major loadDatasets
Expand Down Expand Up @@ -1069,6 +1071,15 @@ private void parseUsingSimpleXmlReader(
tnt < 1 || tnt == Integer.MAX_VALUE ? EDStatic.DEFAULT_unusualActivity : tnt;
String2.log("unusualActivity=" + EDStatic.unusualActivity);

} else if (tags.equals("<erddapDatasets><unusualActivityFailPercent>")) {
} else if (tags.equals("<erddapDatasets></unusualActivityFailPercent>")) {
int tnt = String2.parseInt(xmlReader.content());
EDStatic.unusualActivityFailPercent =
tnt < 0 || tnt > 100 || tnt == Integer.MAX_VALUE
? EDStatic.DEFAULT_unusualActivityFailPercent
: tnt;
String2.log("unusualActivityFailPercent=" + EDStatic.unusualActivityFailPercent);

} else if (tags.equals("<erddapDatasets><updateMaxEvents>")) {
} else if (tags.equals("<erddapDatasets></updateMaxEvents>")) {
int tnt = String2.parseInt(xmlReader.content());
Expand Down Expand Up @@ -1249,14 +1260,17 @@ private void emailUnusualActivity(String threadSummary, String threadList) {
// email if some threshold is surpassed???
int nFailed = String2.getTimeDistributionN(EDStatic.failureTimesDistributionLoadDatasets);
int nSucceeded = String2.getTimeDistributionN(EDStatic.responseTimesDistributionLoadDatasets);
if (nFailed + nSucceeded > EDStatic.unusualActivity) // high activity level
EDStatic.email(
if (nFailed + nSucceeded > EDStatic.unusualActivity) { // high activity level
EDStatic.email(
EDStatic.emailEverythingToCsv, "Unusual Activity: lots of requests", sb.toString());
else if (nFailed > 10 && nFailed > nSucceeded / 4) // >25% of requests fail
EDStatic.email(
} else if (nFailed > 10
&& nFailed
> nSucceeded * (EDStatic.unusualActivityFailPercent) / 100) { // >25% of requests fail
EDStatic.email(
EDStatic.emailEverythingToCsv,
"Unusual Activity: >25% of requests failed",
"Unusual Activity: >" + EDStatic.unusualActivityFailPercent + "% of requests failed",
sb.toString());
}
}

private void emailDailyReport(String threadSummary, String threadList, String reportDate) {
Expand Down
11 changes: 11 additions & 0 deletions WEB-INF/classes/gov/noaa/pfel/erddap/handlers/TopLevelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,17 @@ public void endElement(String uri, String localName, String qName) {
String2.log("updateMaxEvents=" + EDStatic.updateMaxEvents);
}
}
case "unusualActivityFailPercent" -> {
int tnt = String2.parseInt(data.toString());
EDStatic.unusualActivityFailPercent =
tnt < 0 || tnt > 100 || tnt == Integer.MAX_VALUE
? EDStatic.DEFAULT_unusualActivityFailPercent
: tnt;

if (reallyVerbose) {
String2.log("unusualActivityFailPercent" + EDStatic.unusualActivityFailPercent);
}
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions WEB-INF/classes/gov/noaa/pfel/erddap/util/EDStatic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ public class EDStatic {
public static final int DEFAULT_slowDownTroubleMillis = 1000;
public static final int DEFAULT_unusualActivity = 10000;
public static final int DEFAULT_updateMaxEvents = 10;
public static final int DEFAULT_unusualActivityFailPercent = 25;
public static long cacheMillis = DEFAULT_cacheMinutes * Calendar2.MILLIS_PER_MINUTE;
public static String drawLandMask = DEFAULT_drawLandMask;
public static boolean emailDiagnosticsToErdData = true;
Expand All @@ -399,6 +400,7 @@ public class EDStatic {
public static int slowDownTroubleMillis = DEFAULT_slowDownTroubleMillis;
public static int unusualActivity = DEFAULT_unusualActivity;
public static int updateMaxEvents = DEFAULT_updateMaxEvents;
public static int unusualActivityFailPercent = DEFAULT_unusualActivityFailPercent;

// not translated
public static
Expand Down