percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-05-07 01:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replaced validation logic for data-dir

Browse Source
This commit is contained in:
Pep Pla
2025-10-30 14:17:23 +01:00
parent 0289a1a6b4
commit c162562ae3
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-online-schema-change
+16 -7
View File
@@ -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*'.*?'//;