From ccf77c624c1d53f2419385673be18cf07bfa5ca3 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 18:48:23 +0300 Subject: [PATCH 1/6] IGNITE-18473 Add getter of CdcMain instance in CdcCommandLineStartup --- .../cmdline/CdcCommandLineStartup.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index c390f95338f82..1f2b6ceeed4dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -47,12 +47,22 @@ public class CdcCommandLineStartup { /** Quite log flag. */ private static final boolean QUITE = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_QUIET); + /** Cdc instance. */ + private final AtomicReference cdc = new AtomicReference<>(); + /** * Main entry point. * * @param args Command line arguments. */ public static void main(String[] args) { + new CdcCommandLineStartup().start(args); + } + + /** + * @param args Args. + */ + public void start(String[] args) { if (!QUITE) { X.println(" __________ ________________ ________ _____" + NL + " / _/ ___/ |/ / _/_ __/ __/ / ___/ _ \\/ ___/" + NL + @@ -75,8 +85,6 @@ public static void main(String[] args) { if (args.length > 0 && args[0].charAt(0) == '-') exit("Invalid arguments: " + args[0], true, -1); - AtomicReference cdc = new AtomicReference<>(); - try { cdc.set(CdcLoader.loadCdc(args[0])); @@ -113,7 +121,7 @@ public static void main(String[] args) { * @param showUsage Whether or not to show usage information. * @param exitCode Exit code. */ - private static void exit(@Nullable String errMsg, boolean showUsage, int exitCode) { + private void exit(@Nullable String errMsg, boolean showUsage, int exitCode) { if (errMsg != null) X.error(errMsg); @@ -134,4 +142,11 @@ private static void exit(@Nullable String errMsg, boolean showUsage, int exitCod System.exit(exitCode); } + + /** + * @return Cdc instance. + */ + public CdcMain cdc() { + return cdc.get(); + } } From 06d8946effdf455178ba2760499b0fc0a3c53a7a Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 22:33:23 +0300 Subject: [PATCH 2/6] Revert "IGNITE-18473 Add getter of CdcMain instance in CdcCommandLineStartup" This reverts commit ccf77c624c1d53f2419385673be18cf07bfa5ca3. --- .../cmdline/CdcCommandLineStartup.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index 1f2b6ceeed4dc..c390f95338f82 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -47,22 +47,12 @@ public class CdcCommandLineStartup { /** Quite log flag. */ private static final boolean QUITE = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_QUIET); - /** Cdc instance. */ - private final AtomicReference cdc = new AtomicReference<>(); - /** * Main entry point. * * @param args Command line arguments. */ public static void main(String[] args) { - new CdcCommandLineStartup().start(args); - } - - /** - * @param args Args. - */ - public void start(String[] args) { if (!QUITE) { X.println(" __________ ________________ ________ _____" + NL + " / _/ ___/ |/ / _/_ __/ __/ / ___/ _ \\/ ___/" + NL + @@ -85,6 +75,8 @@ public void start(String[] args) { if (args.length > 0 && args[0].charAt(0) == '-') exit("Invalid arguments: " + args[0], true, -1); + AtomicReference cdc = new AtomicReference<>(); + try { cdc.set(CdcLoader.loadCdc(args[0])); @@ -121,7 +113,7 @@ public void start(String[] args) { * @param showUsage Whether or not to show usage information. * @param exitCode Exit code. */ - private void exit(@Nullable String errMsg, boolean showUsage, int exitCode) { + private static void exit(@Nullable String errMsg, boolean showUsage, int exitCode) { if (errMsg != null) X.error(errMsg); @@ -142,11 +134,4 @@ private void exit(@Nullable String errMsg, boolean showUsage, int exitCode) { System.exit(exitCode); } - - /** - * @return Cdc instance. - */ - public CdcMain cdc() { - return cdc.get(); - } } From af56e56574fa5b7f694131209f6253911121a813 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 22:45:15 +0300 Subject: [PATCH 3/6] IGNITE-18473 Add InterruptedException handling in CdcCommandLineStartup#main --- .../apache/ignite/startup/cmdline/CdcCommandLineStartup.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index c390f95338f82..4b72f6f61776f 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -94,6 +94,9 @@ public static void main(String[] args) { appThread.join(); } + catch (InterruptedException e) { + e.printStackTrace(); + } catch (Throwable e) { e.printStackTrace(); From 6970ef6365c7f8d3e993a3eb37232dd2ea32834e Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 23:03:34 +0300 Subject: [PATCH 4/6] IGNITE-18473 Fix message. --- .../apache/ignite/startup/cmdline/CdcCommandLineStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index 4b72f6f61776f..c16fe3a6f3cb7 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -95,7 +95,7 @@ public static void main(String[] args) { appThread.join(); } catch (InterruptedException e) { - e.printStackTrace(); + X.error("CdcCommandLineStartup execution was interrupted."); } catch (Throwable e) { e.printStackTrace(); From 744ca243f99fbd3888c803eb0a3bcccc670807f4 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 23:05:01 +0300 Subject: [PATCH 5/6] IGNITE-18473 Fix message. --- .../apache/ignite/startup/cmdline/CdcCommandLineStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index c16fe3a6f3cb7..966d907bba2e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -94,7 +94,7 @@ public static void main(String[] args) { appThread.join(); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { X.error("CdcCommandLineStartup execution was interrupted."); } catch (Throwable e) { From aadcaba317b24a53d31401eb4586b5f6cdd6d0f5 Mon Sep 17 00:00:00 2001 From: Ilya Shishkov Date: Wed, 28 Dec 2022 23:21:36 +0300 Subject: [PATCH 6/6] IGNITE-18473 Fix message. --- .../apache/ignite/startup/cmdline/CdcCommandLineStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java index 966d907bba2e3..5a62bf58848ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CdcCommandLineStartup.java @@ -95,7 +95,7 @@ public static void main(String[] args) { appThread.join(); } catch (InterruptedException ignore) { - X.error("CdcCommandLineStartup execution was interrupted."); + X.error("CDC was interrupted."); } catch (Throwable e) { e.printStackTrace();