From b30708d49f7e823a1b3bb04297975aea1be3e512 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Wed, 19 Feb 2025 15:31:04 +0100 Subject: Ensure that graphadmin schema-create-job exits with a non-zero exit code in case of failure - currently, when the GenTester program fails, it is not terminating with a non-zero exit code - the consequence of this is that the initContainer/job that executes this is stuck and waits forever - this changes the code in case of failure, which in turn should cause a retry for the container - also bump version to 1.15.6-SNAPSHOT Issue-ID: AAI-4136 Change-Id: Ic8a26df66f2ae1a55a1547b562cc6f042f5a513b Signed-off-by: Fiete Ostkamp --- src/main/java/org/onap/aai/schema/GenTester.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/aai/schema/GenTester.java b/src/main/java/org/onap/aai/schema/GenTester.java index 55212d8..6443d43 100644 --- a/src/main/java/org/onap/aai/schema/GenTester.java +++ b/src/main/java/org/onap/aai/schema/GenTester.java @@ -54,6 +54,18 @@ public class GenTester { */ public static void main(String[] args) throws AAIException { + try { + createSchema(args); + } catch (Exception e) { + LOGGER.error("Failed to run schema creation", e); + System.exit(1); + } + + LOGGER.debug("All done, if the program does not exit, please kill it manually."); + System.exit(0); + } + + private static void createSchema(String[] args) throws AAIException { JanusGraph graph = null; System.setProperty("aai.service.name", GenTester.class.getSimpleName()); @@ -180,9 +192,6 @@ public class GenTester { ErrorLogHelper.logError("AAI_4000", ex.getMessage()); System.exit(1); } - - LOGGER.debug("-- all done, if program does not exit, please kill."); - System.exit(0); } private static void setSchemaInitializedToFalse(JanusGraph graph, Optional schemaInitializedVertex) { -- cgit