From 30f050435819d84b87d55a5b64db2ac7a155449a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 16 Jan 2025 10:32:49 -0700
Subject: [PATCH] test
---
.../java/gov/usgs/earthquake/nshmp/www/PrimingResource.java | 5 ++++-
src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
index 8a8ce704..8da139a7 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
@@ -1,6 +1,7 @@
package gov.usgs.earthquake.nshmp.www;
import java.nio.file.Path;
+import java.util.logging.Logger;
import org.crac.Context;
import org.crac.Resource;
@@ -27,13 +28,15 @@ public class PrimingResource implements OrderedResource {
@Override
public void beforeCheckpoint(Context<? extends Resource> context) throws Exception {
+ Logger.getAnonymousLogger().info("Before checkpoint");
ServletUtil.model(ServletUtil.loadModel(modelPath));
updateParameter();
}
@Override
public void afterRestore(Context<? extends Resource> context) throws Exception {
- System.out.println("Reset exexutors");
+ Logger.getAnonymousLogger().info("After restore: reset execurors");
+ // Reset executors on restore as Shutdown event does not fire on AWS lambda
ServletUtil.resetExecutors();
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
index e007dea5..5f75c7c2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
@@ -91,6 +91,9 @@ public class ServletUtil {
.create();
}
+ /**
+ * Reset executors on AWS Lambda SnapStart restore
+ */
static void resetExecutors() {
CALC_EXECUTOR.shutdown();
TASK_EXECUTOR.shutdown();
@@ -115,7 +118,6 @@ public class ServletUtil {
@EventListener
void startup(StartupEvent event) {
- System.out.println("on start up");
if (!awsRuntime.isPresent()) {
HAZARD_MODEL = loadModel(modelPath);
}
--
GitLab