Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CodeLogicImprovements #7143

Merged
merged 16 commits into from
Jul 19, 2024
Merged

CodeLogicImprovements #7143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea4d4ee
CodeLogicImprovements
madhu-k-sr2 Jul 19, 2024
6e14f8c
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
75af11f
CodeLogicImprovements-2
madhu-k-sr2 Jul 19, 2024
81b5298
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
572b6a6
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
58ec59c
CodeCorrections-0719-1
madhu-k-sr2 Jul 19, 2024
13d14e9
CodeCorrections-0719-2
madhu-k-sr2 Jul 19, 2024
0f3267f
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
73bcaca
CodeCorrections-0719-3
madhu-k-sr2 Jul 19, 2024
e3dea9e
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
5175514
CodeCorrections-0719-4
madhu-k-sr2 Jul 19, 2024
2f3ce32
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
dc443a3
CodeCorrections-0719-5
madhu-k-sr2 Jul 19, 2024
def8d88
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
4b1d896
CodeCorrections-0719-6
madhu-k-sr2 Jul 19, 2024
3049ac4
Merge branch 'main' of https://github.com/ministryofjustice/modernisa…
madhu-k-sr2 Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions terraform/environments/electronic-monitoring-data/dms_data_validation_glue_job.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,38 +222,41 @@ resource "aws_glue_job" "rds_to_s3_parquet_migration" {
worker_type = "G.2X"
number_of_workers = 5
default_arguments = {
"--script_bucket_name" = aws_s3_bucket.dms_dv_glue_job_s3_bucket.id
"--rds_db_host_ep" = split(":", aws_db_instance.database_2022.endpoint)[0]
"--rds_db_pwd" = aws_db_instance.database_2022.password
"--rds_sqlserver_db" = ""
"--rds_sqlserver_db_schema" = "dbo"
"--rds_sqlserver_db_table" = ""
"--rds_db_tbl_pkeys_col_list" = ""
"--rds_table_total_size_mb" = ""
"--rds_table_total_rows" = ""
"--date_partition_column_name" = ""
"--other_partitionby_columns" = ""
"--validation_sample_fraction_float" = 0
"--validation_sample_df_repartition" = 0
"--jdbc_read_256mb_partitions" = "false"
"--jdbc_read_512mb_partitions" = "false"
"--jdbc_read_1gb_partitions" = "false"
"--jdbc_read_2gb_partitions" = "false"
"--rename_migrated_prq_tbl_folder" = ""
"--year_partition" = "false"
"--month_partition" = "false"
"--day_partition" = "false"
"--rds_to_parquet_output_s3_bucket" = aws_s3_bucket.dms_target_ep_s3_bucket.id
"--dv_parquet_output_s3_bucket" = aws_s3_bucket.dms_dv_parquet_s3_bucket.id
"--glue_catalog_db_name" = aws_glue_catalog_database.dms_dv_glue_catalog_db.name
"--glue_catalog_tbl_name" = "glue_df_output"
"--continuous-log-logGroup" = "/aws-glue/jobs/${aws_cloudwatch_log_group.rds_to_s3_parquet_migration.name}"
"--enable-continuous-cloudwatch-log" = "true"
"--enable-continuous-log-filter" = "true"
"--enable-metrics" = "true"
"--enable-auto-scaling" = "true"
"--conf" = <<EOF
"--script_bucket_name" = aws_s3_bucket.dms_dv_glue_job_s3_bucket.id
"--rds_db_host_ep" = split(":", aws_db_instance.database_2022.endpoint)[0]
"--rds_db_pwd" = aws_db_instance.database_2022.password
"--rds_sqlserver_db" = ""
"--rds_sqlserver_db_schema" = "dbo"
"--rds_sqlserver_db_table" = ""
"--rds_db_tbl_pkeys_col_list" = ""
"--rds_table_total_size_mb" = ""
"--rds_table_total_rows" = ""
"--rds_df_repartition_num" = 0
"--date_partition_column_name" = ""
"--other_partitionby_columns" = ""
"--validation_sample_fraction_float" = 0
"--validation_sample_df_repartition_num" = 0
"--jdbc_read_256mb_partitions" = "false"
"--jdbc_read_512mb_partitions" = "false"
"--jdbc_read_1gb_partitions" = "false"
"--jdbc_read_2gb_partitions" = "false"
"--rename_migrated_prq_tbl_folder" = ""
"--year_partition_bool" = "false"
"--month_partition_bool" = "false"
"--day_partition_bool" = "false"
"--validation_only_run" = "false"
"--rds_to_parquet_output_s3_bucket" = aws_s3_bucket.dms_target_ep_s3_bucket.id
"--dv_parquet_output_s3_bucket" = aws_s3_bucket.dms_dv_parquet_s3_bucket.id
"--glue_catalog_db_name" = aws_glue_catalog_database.dms_dv_glue_catalog_db.name
"--glue_catalog_tbl_name" = "glue_df_output"
"--continuous-log-logGroup" = "/aws-glue/jobs/${aws_cloudwatch_log_group.rds_to_s3_parquet_migration.name}"
"--enable-continuous-cloudwatch-log" = "true"
"--enable-continuous-log-filter" = "true"
"--enable-metrics" = "true"
"--enable-auto-scaling" = "true"
"--conf" = <<EOF
spark.sql.legacy.parquet.datetimeRebaseModeInRead=CORRECTED
--conf spark.sql.sources.partitionOverwriteMode=dynamic
--conf spark.sql.parquet.aggregatePushdown=true
--conf spark.sql.shuffle.partitions=2001
--conf spark.sql.files.maxPartitionBytes=256m
Expand Down
Loading