Skip to content

Replace validation logic for data-dir in pt-osc to use innodb_directories. #1023

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

Open
peppla wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Replace validation logic for data-dir in pt-osc to use innodb_directories. #1023

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
23 changes: 16 additions & 7 deletions bin/pt-online-schema-change
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11438,13 +11438,22 @@ sub create_new_table {
$sql =~ s/\s+ENGINE=\S+//;
}
if ( $o->get('data-dir') && !$o->got('remove-data-dir') ) {
if ( (-d $o->get('data-dir')) && (-w $o->get('data-dir')) ){
$sql = insert_data_directory($sql, $o->get('data-dir'));
PTDEBUG && _d("adding data dir ".$o->get('data-dir'));
PTDEBUG && _d("New query\n$sql\n");
} else {
die $o->get('data-dir') . " is not a directory or it is not writable";
}
# The directory must be in innodb_directories
my (undef, $innodb_directories) = $cxn->dbh->selectrow_array("SHOW VARIABLES LIKE 'innodb_directories'");
if ( $innodb_directories ) {
my @dirs = split(/\s*;\s*/, $innodb_directories);
my %dirs_lookup = map { $_ => 1 } @dirs;
if ($dirs_lookup{$o->get('data-dir')}) {
$sql = insert_data_directory($sql, $o->get('data-dir'));
PTDEBUG && _d("adding data dir ".$o->get('data-dir'));
PTDEBUG && _d("New query\n$sql\n");
} else {
die "Data directory " . $o->get('data-dir') . " is not in innodb_directories variable: " . $innodb_directories;
}
} else {
# There is no innodb_directories variable or it is empty
die "Could not get innodb_directories variable from server or it is empty.";
}
}
if ( $o->got('remove-data-dir') ) {
$sql =~ s/DATA DIRECTORY\s*=\s*'.*?'//;
Expand Down
Loading