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

fix(psql-pg-group): Correctly setup pg group for new versions with cu… #1823

Merged
merged 1 commit into from
Jan 11, 2022
Merged

fix(psql-pg-group): Correctly setup pg group for new versions with cu… #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tf_files/aws/commons/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,15 @@ variable "indexd_backup_window" {
}

variable "fence_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "sheepdog_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "indexd_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "fence_auto_minor_version_upgrade" {
Expand Down
47 changes: 44 additions & 3 deletions tf_files/aws/encrypted-rds/kube.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ resource "aws_db_instance" "db_fence" {
storage_type = "gp2"
engine = "${var.fence_engine}"
engine_version = "${var.fence_engine_version}"
parameter_group_name = "${var.db_pg_name}"
parameter_group_name = "${aws_db_parameter_group.rds-cdis-pg.name}"
instance_class = "${var.fence_db_instance}"
name = "${var.fence_database_name}"
username = "${var.fence_db_username}"
Expand Down Expand Up @@ -53,7 +53,7 @@ resource "aws_db_instance" "db_gdcapi" {
storage_type = "gp2"
engine = "${var.sheepdog_engine}"
engine_version = "${var.sheepdog_engine_version}"
parameter_group_name = "${var.db_pg_name}"
parameter_group_name = "${aws_db_parameter_group.rds-cdis-pg.name}"
instance_class = "${var.sheepdog_db_instance}"
name = "${var.sheepdog_database_name}"
username = "${var.sheepdog_db_username}"
Expand Down Expand Up @@ -87,7 +87,7 @@ resource "aws_db_instance" "db_indexd" {
storage_type = "gp2"
engine = "${var.indexd_engine}"
engine_version = "${var.indexd_engine_version}"
parameter_group_name = "${var.db_pg_name}"
parameter_group_name = "${aws_db_parameter_group.rds-cdis-pg.name}"
instance_class = "${var.indexd_db_instance}"
name = "${var.indexd_database_name}"
username = "${var.indexd_db_username}"
Expand All @@ -114,6 +114,47 @@ resource "aws_db_instance" "db_indexd" {
}
}

resource "aws_db_parameter_group" "rds-cdis-pg" {
name = "${var.vpc_name}-rds-cdis-pg"
family = "postgres${var.fence_engine_version}"

# make index searches cheaper per row
parameter {
name = "cpu_index_tuple_cost"
value = "0.000005"
}

# raise cost of search per row to be closer to read cost
# suggested for SSD backed disks
parameter {
name = "cpu_tuple_cost"
value = "0.7"
}

# Log the duration of each SQL statement
parameter {
name = "log_duration"
value = "1"
}

# Log statements above this duration
# 0 = everything
parameter {
name = "log_min_duration_statement"
value = "0"
}

# lower cost of random reads from disk because we use SSDs
parameter {
name = "random_page_cost"
value = "0.7"
}

lifecycle {
ignore_changes = ["*"]
}
}

# See https://www.postgresql.org/docs/9.6/static/runtime-config-logging.html
# and https://www.postgresql.org/docs/9.6/static/runtime-config-query.html#RUNTIME-CONFIG-QUERY-ENABLE
# for detail parameter descriptions
10 changes: 3 additions & 7 deletions tf_files/aws/encrypted-rds/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ variable "indexd_backup_window" {
}

variable "fence_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "sheepdog_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "indexd_engine_version" {
default = "9.6.11"
default = "13.3"
}

variable "fence_auto_minor_version_upgrade" {
Expand Down Expand Up @@ -255,10 +255,6 @@ variable "aws_db_subnet_group_name" {
default = "subnetName"
}

variable "db_pg_name" {
default = ""
}

variable "fence_max_allocated_storage" {
description = "Maximum allocated storage for autosacaling"
default = 0
Expand Down