From c3fd9fe922553c66b450f350ee709ec6646c8818 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Thu, 14 Nov 2024 09:38:21 +0000 Subject: [PATCH 1/2] PI-2619 Validate JDBC connections before use --- .../container/pipelines/contact/logstash-incremental.conf | 2 ++ .../container/pipelines/person/logstash-incremental.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/projects/person-search-index-from-delius/container/pipelines/contact/logstash-incremental.conf b/projects/person-search-index-from-delius/container/pipelines/contact/logstash-incremental.conf index 3bca0ce575..27e5792e98 100644 --- a/projects/person-search-index-from-delius/container/pipelines/contact/logstash-incremental.conf +++ b/projects/person-search-index-from-delius/container/pipelines/contact/logstash-incremental.conf @@ -32,6 +32,8 @@ filter { jdbc_connection_string => "${JDBC_CONNECTION_STRING}" jdbc_user => "${JDBC_USER}" jdbc_password => "${JDBC_PASSWORD}" + jdbc_validate_connection => true + jdbc_validation_timeout => 120 statement => "${INCREMENTAL_STATEMENT_SQL}" use_prepared_statements => true prepared_statement_name => "search_indexer_contact_incremental" diff --git a/projects/person-search-index-from-delius/container/pipelines/person/logstash-incremental.conf b/projects/person-search-index-from-delius/container/pipelines/person/logstash-incremental.conf index d171b0c1c3..eda2612a49 100644 --- a/projects/person-search-index-from-delius/container/pipelines/person/logstash-incremental.conf +++ b/projects/person-search-index-from-delius/container/pipelines/person/logstash-incremental.conf @@ -19,6 +19,8 @@ filter { jdbc_connection_string => "${JDBC_CONNECTION_STRING}" jdbc_user => "${JDBC_USER}" jdbc_password => "${JDBC_PASSWORD}" + jdbc_validate_connection => true + jdbc_validation_timeout => 120 statement => "${INCREMENTAL_STATEMENT_SQL}" parameters => { "offender_id" => "%{offenderId}" } target => "db" From f46e2d1c46147fe54b2ceef66c9598c662b8037e Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Thu, 14 Nov 2024 09:42:24 +0000 Subject: [PATCH 2/2] Delay startup time in dev --- projects/person-search-index-from-delius/deploy/values-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/person-search-index-from-delius/deploy/values-dev.yml b/projects/person-search-index-from-delius/deploy/values-dev.yml index 945ac173f6..333a288c9c 100644 --- a/projects/person-search-index-from-delius/deploy/values-dev.yml +++ b/projects/person-search-index-from-delius/deploy/values-dev.yml @@ -4,6 +4,7 @@ generic-service: scheduledDowntime: enabled: true + startup: 0 8 * * 1-5 # delayed startup to match Delius DB startup time env: SENTRY_ENVIRONMENT: dev