From 081731f6ade237302168d473ffabaef0ac2d8e08 Mon Sep 17 00:00:00 2001 From: Ignatenko Andrey Date: Mon, 3 Feb 2020 16:17:31 -0800 Subject: [PATCH] Merge pull request #26 in N4FRA/debezium from DSCON-117_DBConnector_exception to master Squashed commit of the following: commit 1eb6ce1bb2b8e13aac93891c3dfe25fe7ed58985 Merge: da3066c2 8f53bba6 Author: AndreyIg Date: Mon Feb 3 16:11:32 2020 -0800 fix DSCON-117 DBConnector exception commit da3066c2b23bcbce4f5043b5a161657cd6483633 Author: AndreyIg Date: Mon Feb 3 16:06:47 2020 -0800 DSCON-117, DBConnector exception while incremental loading1 commit 2cb8126b258cae75547dd2fc9b45177533169fa9 Author: AndreyIg Date: Mon Feb 3 13:45:38 2020 -0800 fix smallest scn calculation commit 4bf0b69ac5df0bbe54e4bb404c8d17afec07511b Merge: 8023485e 605d22fc Author: AndreyIg Date: Fri Jan 24 07:37:32 2020 -0800 Merge branch 'master' into DBZ-137_candidate_merge_branch commit 605d22fc0a683741ea405797178464cfdcb17aac Merge: 276c19bd e68ada6f Author: AndreyIg Date: Fri Jan 24 07:32:11 2020 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 276c19bd9401eafc183050b8bbc882c405c753e7 Merge: 9b5a3f3e bc8e4be3 Author: AndreyIg Date: Mon Jan 20 14:32:44 2020 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 8023485e28eb25709f3b6dc1cb9f232f2a7a5a25 Author: AndreyIg Date: Mon Jan 20 14:24:12 2020 -0800 fix setting supplemental logging for new table commit f16f3a5600f2b6ea586e9f5bf9fa883c02b16b4b Merge: 91b00f8c 9b5a3f3e Author: AndreyIg Date: Wed Jan 15 13:44:36 2020 -0800 Merge branch 'master' into DBZ-137_candidate_merge_branch commit 9b5a3f3ef76a9b8748d0e71c657c031a4ad0929b Merge: 9b0ee989 f9de59c7 Author: AndreyIg Date: Wed Jan 15 13:41:38 2020 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 91b00f8ce031a48a2de52262680cb08e0314e574 Author: AndreyIg Date: Mon Jan 6 16:09:22 2020 -0800 DBZ-137_fix_oldest_scn_issue commit 9b0ee989e1185ff9ff848a87f8fc2de2e4ee8843 Merge: 7ab9af36 0fe3cf3d Author: AndreyIg Date: Fri Dec 27 11:55:19 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 7ab9af36c606e1caae671ec9ca99865236a922a8 Merge: 90979c16 d8872ce6 Author: AndreyIg Date: Fri Dec 27 11:48:18 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 90979c163070de6f09bd8e1fd6ef2d9e608d5382 Merge: d174eabb 4086b3e1 Author: AndreyIg Date: Fri Dec 13 13:39:26 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit d174eabba2ed7f29993f28e6746809800fb0741e Merge: 0894de1f 7e77a83b Author: AndreyIg Date: Mon Dec 9 08:58:41 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 0894de1f0ab453fa5b3af050ad7f3339c7ad36b5 Merge: 8353b85b 12021bd3 Author: AndreyIg Date: Wed Nov 27 15:12:39 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 8353b85b9221d2760dcd3836022f10180499c15d Merge: c6f361f8 b69f88c0 Author: AndreyIg Date: Wed Nov 27 14:57:47 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit c6f361f8037ad40fb18b73fba19ef73d3ffe3ec5 Merge: 7b499a36 7c9497a8 Author: AndreyIg Date: Tue Nov 26 15:27:32 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 7b499a36ee80c2257f27d6c0fa13111c12744248 Merge: ff19baa8 5be9ef50 Author: AndreyIg Date: Fri Nov 22 14:09:47 2019 -0800 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit ff19baa8f0b5cb697b12f9c1c3563c2093fe6781 Merge: 7b0b4764 0309d35d Author: AndreyIg Date: Fri Sep 27 11:04:12 2019 -0700 Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium commit 7b0b47647b8fbd00064a76550a01c363032ce33e Merge: 5d76700f eaaddfb5 Author: AndreyIg Date: Thu Sep 5 15:52:31 2019 -0700 ARGO-198431, new parser ... and 4 more commits --- .../oracle/logminer/LogMinerStreamingChangeEventSource.java | 5 ++++- .../connector/oracle/logminer/TransactionalBuffer.java | 2 +- .../oracle/logminer/TransactionalBufferMetrics.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java index 21b0961a6..1b7cac79d 100644 --- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java +++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java @@ -208,10 +208,13 @@ public void commitOffset(Map offset) { } private boolean connectionProblem (Throwable e){ + if (e.getMessage() == null || e.getCause() == null) { + return false; + } return e.getMessage().startsWith("ORA-03135") || e.getMessage().startsWith("ORA-12543") || e.getCause() instanceof IOException || - (e.getCause() != null && e.getCause().getCause() instanceof NetException); + e.getCause().getCause() instanceof NetException; } } diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java index d63c51ddc..fd960b402 100644 --- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java +++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java @@ -178,7 +178,7 @@ private BigDecimal calculateSmallestScn() { .map(transaction -> transaction.firstScn) .min(BigDecimal::compareTo) .orElseThrow(() -> new DataException("Cannot calculate smallest SCN")); - metrics.ifPresent(m -> m.setOldestScn(scn == null ? null : scn.longValue())); + metrics.ifPresent(m -> m.setOldestScn(scn == null ? -1 : scn.longValue())); return scn; } diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java index db37b14be..8dfc8c778 100644 --- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java +++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java @@ -152,7 +152,7 @@ public long getMinLagFromSource() { @Override public long getAverageLagFromSource() { - return totalLagsFromTheSource.get().toMillis()/capturedDmlCounter.get() == 0 ? 1 : capturedDmlCounter.get(); + return totalLagsFromTheSource.get().toMillis()/(capturedDmlCounter.get() == 0 ? 1 : capturedDmlCounter.get()); } @Override