Skip to content

Updates: changes for database initilization. #408

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updates: changes for database initilization. #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89ddd95
Updates: changes for database initilization.
saikumar-vs Aug 22, 2025
02935ed
Updates: fix to create default test db for RQG
saikumar-vs Aug 22, 2025
7ac45c7
Updates:default test db for RQG, also for comparison runs.
saikumar-vs Aug 22, 2025
045370c
Updates: minor improvement
saikumar-vs Aug 25, 2025
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
66 changes: 33 additions & 33 deletions randgen/lib/DBServer/MySQL/MySQLd.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use strict;
use Carp;
use Data::Dumper;
use File::Path qw(mkpath rmtree);
use File::Spec::Functions qw(catfile);

use constant MYSQLD_BASEDIR => 0;
use constant MYSQLD_VARDIR => 1;
Expand Down Expand Up @@ -194,8 +195,8 @@ sub new {
"--datadir=".$self->datadir,
$self->_messages,
"--character-sets-dir=".$self->[MYSQLD_CHARSETS],
"--default-storage-engine=myisam",
"--log-warnings=0",
"--default-storage-engine=innodb",
"--log_error_verbosity=1",
"--tmpdir=".$self->tmpdir];

if ($self->[MYSQLD_START_DIRTY]) {
Expand Down Expand Up @@ -310,7 +311,6 @@ sub addServerOptions {

sub createMysqlBase {
my ($self) = @_;

## 1. Clean old db if any
if (-d $self->vardir) {
rmtree($self->vardir);
Expand All @@ -320,38 +320,31 @@ sub createMysqlBase {
mkpath($self->vardir);
mkpath($self->tmpdir);
mkpath($self->datadir);
mkpath($self->datadir."/mysql");
mkpath($self->datadir."/test");

## 3. Create boot file
my $boot = $self->vardir."/boot.sql";
open BOOT,">$boot";

## Set curren database
print BOOT "use mysql;\n";
foreach my $b (@{$self->[MYSQLD_BOOT_SQL]}) {
open B,$b;
while (<B>) { print BOOT $_;}
close B;
}
## Don't want empty users
print BOOT "DELETE FROM user WHERE `User` = '';\n";
close BOOT;
my $init_options = [
"--no-defaults",
"--initialize-insecure", # Creates root user without password
"--datadir=" . $self->datadir,
"--basedir=" . $self->basedir
];

## 4. Boot database
## 4. Initialize database
my $exit_code;
my $initlog;
if (osWindows()) {
my $command = $self->generateCommand(["--no-defaults","--bootstrap"],
$self->[MYSQLD_STDOPTS]);
my $bootlog = $self->vardir."/boot.log";
system("$command < \"$boot\" > \"$bootlog\"");
# Todo Untested code (WINDOWS).
my $command = $self->generateCommand($init_options, $self->[MYSQLD_STDOPTS]);

$initlog = catfile($self->vardir, "init.log");
$exit_code = system(qq{$command > "$initlog" 2>&1});
} else {
my $boot_options = ["--no-defaults","--bootstrap"];
push(@$boot_options,"--loose-skip-innodb") if $self->_olderThan(5,6,3);
my $command = $self->generateCommand($boot_options,
$self->[MYSQLD_STDOPTS]);
my $bootlog = $self->vardir."/boot.log";
system("cat \"$boot\" | $command > \"$bootlog\" 2>&1 ");
my $command = $self->generateCommand($init_options, $self->[MYSQLD_STDOPTS]);
$initlog = catfile($self->vardir, "init.log");
$exit_code = system(qq{$command > "$initlog" 2>&1});
}

if ($exit_code != 0) {
croak("MySQL initialization failed. Check log: $initlog");
}
}

Expand Down Expand Up @@ -430,6 +423,7 @@ sub startServer {
$self->printInfo;
say("Starting MySQL ".$self->version.": $command");
$self->[MYSQLD_AUXPID] = fork();
croak("Could not fork: $!") unless defined $self->[MYSQLD_AUXPID];
if ($self->[MYSQLD_AUXPID]) {
## Wait for the pid file to have been created
my $wait_time = 0.2;
Expand All @@ -443,8 +437,14 @@ sub startServer {
croak("Could not start mysql server, waited ".($waits*$wait_time)." seconds for pid file");
}
my $pidfile = $self->pidfile;
my $pid = `cat \"$pidfile\"`;
$pid =~ m/([0-9]+)/;
open(my $fh, '<', $pidfile) or croak("Cannot open pidfile '$pidfile': $!");
my $pid = <$fh>;
close($fh);

chomp($pid) if defined $pid;
if (!defined $pid || $pid !~ /^(\d+)$/) {
croak("Invalid or empty PID in pidfile '$pidfile'");
}
$self->[MYSQLD_SERVERPID] = int($1);
} else {
exec("$command > \"$errorlog\" 2>&1") || croak("Could not start mysql server");
Expand Down
6 changes: 5 additions & 1 deletion randgen/runall-new.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,18 +411,22 @@
}
croak("Could not start all servers");
}

if (
($server_id == 0) ||
($rpl_mode eq '')
) {
# Create default test database.
$server[$server_id]->dbh()->do("CREATE DATABASE IF NOT EXISTS $database");

$dsns[$server_id] = $server[$server_id]->dsn($database);
}

if ((defined $dsns[$server_id]) && (defined $engine)) {
my $dbh = DBI->connect($dsns[$server_id], undef, undef, { mysql_multi_statements => 1, RaiseError => 1 } );
$dbh->do("SET GLOBAL storage_engine = '$engine'");
}

}
}

Expand Down