forked from jpwhite4/xdmod-ondemand
-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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 how reverse proxy ports are stored. #72
Draft
aaronweeden
wants to merge
32
commits into
ubccr:xdmod11.0
Choose a base branch
from
aaronweeden:fix-reverse-proxy-port-11.0
base: xdmod11.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Fix how reverse proxy ports are stored. #72
aaronweeden
wants to merge
32
commits into
ubccr:xdmod11.0
from
aaronweeden:fix-reverse-proxy-port-11.0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aaronweeden
force-pushed
the
fix-reverse-proxy-port-11.0
branch
from
December 16, 2024 19:24
4e07c19
to
df6dbe8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WORK IN PROGRESS
Description
Currently, the
page_impressions.reverse_proxy_port_id
column is onlysmallint(5) unsigned
, but thereverse_proxy_port.id
column isint(11)
. This means ifreverse_proxy_port.id
is > 65535 (the maximum value ofsmallint(5) unsigned
), then it will be mistakenly mapped as 65535 inpage_impressions.reverse_proxy_port_id
.This PR fixes this by adding a
11.0.0 -> 11.0.1
migration that will create a new columnpage_impressions.reverse_proxy_port
, fill it with the corresponding value ofreverse_proxy_port.port
ifpage_impressions.reverse_proxy_port_id
< 65535 (otherwise 0), drop the columnpage_impressions.reverse_proxy_port_id
, drop the tablereverse_proxy_port
, and update the unique index on thepage_impressions
table.This PR also adds instructions to the upgrade guide for reingesting old logs to fix port numbers whose IDs were ≥ 65535.
This PR also updates the CircleCI config to add tests for both major and minor upgrades, in this case
10.5.0 -> 11.0.1
and11.0.0 -> 11.0.1
, respectively. This is needed for this PR because the previous10.5.0 -> 11.0.0
upgrade added thereverse_proxy_port
table, the new11.0.0 -> 11.0.1
upgrade will remove it, but the new10.5.0 -> 11.0.0 -> 11.0.1
upgrade does not need to add the table in the first place.This PR also adds a PR template for this repository.
Motivation and Context
This bug was noticed on both
xdmod-dev
and ACCESS XDMoD when the following warning appears during ingestion.Tests performed
I tested the following in a Docker container running the image
tools-ext-01.ccr.xdmod.org/xdmod-ondemand:x86_64-rockylinux8.9.20231119-v11.0.0-1.0-03
:Types of changes
Checklist: