Skip to content

B2 -> GCS fallback, log to datadog #127

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

Merged
merged 5 commits into from
Apr 10, 2023
Merged

B2 -> GCS fallback, log to datadog #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ea9de7
configure datadog logging endpoint
ewdurbin Apr 10, 2023
c2696f9
log to datadog when packages are served from fallback
ewdurbin Apr 10, 2023
7a00e2e
configure B2 auth
ewdurbin Apr 10, 2023
a48de6a
configure, but do not put into service the S3 Archive backend
ewdurbin Apr 10, 2023
40dfd91
serve from b2, fallback to gcs
ewdurbin Apr 10, 2023
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
4 changes: 4 additions & 0 deletions terraform/config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ variable "test_pypi_warehouse_token" {
type = string
sensitive = true
}
variable "datadog_token" {
type = string
sensitive = true
}

terraform {
cloud {
Expand Down
56 changes: 54 additions & 2 deletions terraform/file-hosting/fastly-service.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,32 @@ resource "fastly_service_vcl" "files" {
error_threshold = 5
}

backend {
name = "B2"
auto_loadbalance = false
shield = "iad-va-us"

request_condition = "Package File"
healthcheck = "B2 Health"

address = "${var.files_bucket}.s3.us-east-005.backblazeb2.com"
port = 443
use_ssl = true
ssl_cert_hostname = "${var.files_bucket}.s3.us-east-005.backblazeb2.com"
ssl_sni_hostname = "${var.files_bucket}.s3.us-east-005.backblazeb2.com"

connect_timeout = 5000
first_byte_timeout = 60000
between_bytes_timeout = 15000
error_threshold = 5
}

backend {
name = "GCS"
auto_loadbalance = false
shield = "bfi-wa-us"

request_condition = "Package File"
request_condition = "NeverReq"
healthcheck = "GCS Health"

address = "${var.files_bucket}.storage.googleapis.com"
Expand All @@ -96,11 +116,31 @@ resource "fastly_service_vcl" "files" {
}

backend {
name = "S3"
name = "S3_Archive"
auto_loadbalance = false
shield = "bfi-wa-us"

request_condition = "NeverReq"
healthcheck = "S3 Health"

address = "${var.files_bucket}-archive.s3.amazonaws.com"
port = 443
use_ssl = true
ssl_cert_hostname = "${var.files_bucket}-archive.s3.amazonaws.com"
ssl_sni_hostname = "${var.files_bucket}-archive.s3.amazonaws.com"

connect_timeout = 5000
first_byte_timeout = 60000
between_bytes_timeout = 15000
error_threshold = 5
}

backend {
name = "S3"
auto_loadbalance = false
shield = "bfi-wa-us"

request_condition = "NeverReq"
healthcheck = "S3 Health"

address = "${var.files_bucket}.s3.amazonaws.com"
Expand Down Expand Up @@ -201,6 +241,12 @@ resource "fastly_service_vcl" "files" {
response_condition = "Never"
}

logging_datadog {
name = "DataDog Log"
token = var.datadog_token
response_condition = "Package Served From Fallback"
}

logging_s3 {
name = "S3 Error Logs"

Expand Down Expand Up @@ -250,6 +296,12 @@ resource "fastly_service_vcl" "files" {
type = "RESPONSE"
statement = "req.http.Fastly-Client-IP == \"127.0.0.1\" && req.http.Fastly-Client-IP != \"127.0.0.1\""
}

condition {
name = "Package Served From Fallback"
type = "RESPONSE"
statement = "req.restarts == 0 && req.backend == S3 && req.url ~ \"^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/\" && http_status_matches(beresp.status, \"200\")"
}
}

resource "aws_route53_record" "files" {
Expand Down
1 change: 1 addition & 0 deletions terraform/file-hosting/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ variable "aws_access_key_id" { type = string }
variable "aws_secret_access_key" { type = string }
variable "gcs_access_key_id" { type = string }
variable "gcs_secret_access_key" { type = string }
variable "datadog_token" { type = string }

variable "fastly_endpoints" { type = map(any) }
variable "domain_map" { type = map(any) }
Expand Down
30 changes: 23 additions & 7 deletions terraform/file-hosting/vcl/files.vcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,28 @@ sub vcl_recv {
# Change our backend to S3 to look for the file there, re-enable clustering and continue
# https://www.slideshare.net/Fastly/advanced-vcl-how-to-use-restart
if (req.restarts > 0 && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/") {
set req.backend = F_S3;
set req.backend = F_GCS;
set req.http.Fastly-Force-Shield = "1";
}

# Requests that are for an *actual* file get disaptched to Amazon S3 instead of
# to our typical backends. We need to setup the request to correctly access
# S3 and to authorize ourselves to S3.
# Requests that are for an *actual* file get disaptched to object storage instead of
# to our typical backends.

# If our file request is being dispatched to B2, we need to setup the request to correctly
# access B2 and to authorize ourselves to B2 with S3 compatible auth.
if (req.backend == F_B2 && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/") {
# Setup our environment to better match what S3 expects/needs
set req.http.Host = var.B2-Bucket-Name "s3.us-east-005.backblazeb2.com";
set req.http.Date = now;
set req.url = regsuball(req.url, "\+", urlencode("+"));

# Compute the Authorization header that B2 requires to be able to
# access the files stored there.
set req.http.Authorization = "AWS " var.B2-Application-Key-ID":" digest.hmac_sha1_base64(var.B2-Application-Key, "GET" LF LF LF req.http.Date LF "/" var.S3-Bucket-Name req.url.path);
}

# If our file request is being dispatched to S3, we need to setup the request to correctly
# access S3 and to authorize ourselves to S3.
if (req.backend == F_S3 && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/") {
# Setup our environment to better match what S3 expects/needs
set req.http.Host = var.S3-Bucket-Name ".s3.amazonaws.com";
Expand All @@ -92,6 +107,7 @@ sub vcl_recv {
# access the files stored there.
set req.http.Authorization = "AWS " var.AWS-Access-Key-ID ":" digest.hmac_sha1_base64(var.AWS-Secret-Access-Key, "GET" LF LF LF req.http.Date LF "/" var.S3-Bucket-Name req.url.path);
}

# If our file request is being dispatched to GCS, setup the request to correctly
# access GCS and authorize ourselves with GCS interoperability credentials.
if (req.backend == GCS && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/") {
Expand Down Expand Up @@ -126,9 +142,9 @@ sub vcl_fetch {
set beresp.cacheable = true;
}

# If we successfully got a 404 response from GCS for a Package URL restart
# to check S3 for the file!
if (req.restarts == 0 && req.backend == GCS && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/" && http_status_matches(beresp.status, "404")) {
# If we successfully got a 404 response from B2 for a Package URL restart
# to check GCS for the file!
if (req.restarts == 0 && req.backend == B2 && req.url ~ "^/packages/[a-f0-9]{2}/[a-f0-9]{2}/[a-f0-9]{60}/" && http_status_matches(beresp.status, "404")) {
restart;
}

Expand Down
2 changes: 2 additions & 0 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ module "file-hosting" {
files_bucket = "pypi-files"
mirror = "mirror.dub1.pypi.io"
s3_logging_keys = var.fastly_s3_logging
datadog_token = var.datadog_token

aws_access_key_id = var.aws_access_key_id
aws_secret_access_key = var.aws_secret_access_key
Expand Down Expand Up @@ -177,6 +178,7 @@ module "test-file-hosting" {
files_bucket = "pypi-files-staging"
mirror = "test-mirror.dub1.pypi.io"
s3_logging_keys = var.fastly_s3_logging
datadog_token = var.datadog_token

aws_access_key_id = var.aws_access_key_id
aws_secret_access_key = var.aws_secret_access_key
Expand Down