← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Eric Day
  • Date: 2010-03-04 17:10:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1329.
  • Revision ID: eday@oddments.org-20100304171035-9afxk6bvc701iuoj
Switched to using the MySQL protocol by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
271
271
 
272
272
our $opt_max_save_core= 5;
273
273
my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.
274
 
our $mysql_port_offset= 50;
 
274
our $secondary_port_offset= 50;
275
275
 
276
276
######################################################################
277
277
#
923
923
 
924
924
  $master->[0]=
925
925
  {
926
 
   pid           => 0,
927
 
   type          => "master",
928
 
   idx           => 0,
929
 
   path_myddir   => "$opt_vardir/master-data",
930
 
   path_myerr    => "$opt_vardir/log/master.err",
931
 
   path_pid      => "$opt_vardir/run/master.pid",
932
 
   path_sock     => "$sockdir/master.sock",
933
 
   port          =>  $opt_master_myport,
934
 
   mysql_port    =>  $opt_master_myport + $mysql_port_offset,
935
 
   start_timeout =>  400, # enough time create innodb tables
936
 
   cluster       =>  0, # index in clusters list
937
 
   start_opts    => [],
 
926
   pid            => 0,
 
927
   type           => "master",
 
928
   idx            => 0,
 
929
   path_myddir    => "$opt_vardir/master-data",
 
930
   path_myerr     => "$opt_vardir/log/master.err",
 
931
   path_pid       => "$opt_vardir/run/master.pid",
 
932
   path_sock      => "$sockdir/master.sock",
 
933
   port           =>  $opt_master_myport,
 
934
   secondary_port =>  $opt_master_myport + $secondary_port_offset,
 
935
   start_timeout  =>  400, # enough time create innodb tables
 
936
   cluster        =>  0, # index in clusters list
 
937
   start_opts     => [],
938
938
  };
939
939
 
940
940
  $master->[1]=
941
941
  {
942
 
   pid           => 0,
943
 
   type          => "master",
944
 
   idx           => 1,
945
 
   path_myddir   => "$opt_vardir/master1-data",
946
 
   path_myerr    => "$opt_vardir/log/master1.err",
947
 
   path_pid      => "$opt_vardir/run/master1.pid",
948
 
   path_sock     => "$sockdir/master1.sock",
949
 
   port          => $opt_master_myport + 1,
950
 
   mysql_port    => $opt_master_myport + 1 + $mysql_port_offset,
951
 
   start_timeout => 400, # enough time create innodb tables
952
 
   cluster       =>  0, # index in clusters list
953
 
   start_opts    => [],
 
942
   pid            => 0,
 
943
   type           => "master",
 
944
   idx            => 1,
 
945
   path_myddir    => "$opt_vardir/master1-data",
 
946
   path_myerr     => "$opt_vardir/log/master1.err",
 
947
   path_pid       => "$opt_vardir/run/master1.pid",
 
948
   path_sock      => "$sockdir/master1.sock",
 
949
   port           => $opt_master_myport + 1,
 
950
   secondary_port => $opt_master_myport + 1 + $secondary_port_offset,
 
951
   start_timeout  => 400, # enough time create innodb tables
 
952
   cluster        =>  0, # index in clusters list
 
953
   start_opts     => [],
954
954
  };
955
955
 
956
956
  $slave->[0]=
957
957
  {
958
 
   pid           => 0,
959
 
   type          => "slave",
960
 
   idx           => 0,
961
 
   path_myddir   => "$opt_vardir/slave-data",
962
 
   path_myerr    => "$opt_vardir/log/slave.err",
963
 
   path_pid      => "$opt_vardir/run/slave.pid",
964
 
   path_sock     => "$sockdir/slave.sock",
965
 
   port          => $opt_slave_myport,
966
 
   mysql_port    => $opt_slave_myport + $mysql_port_offset,
967
 
   start_timeout => 400,
968
 
 
969
 
   cluster       =>  1, # index in clusters list
970
 
   start_opts    => [],
 
958
   pid            => 0,
 
959
   type           => "slave",
 
960
   idx            => 0,
 
961
   path_myddir    => "$opt_vardir/slave-data",
 
962
   path_myerr     => "$opt_vardir/log/slave.err",
 
963
   path_pid       => "$opt_vardir/run/slave.pid",
 
964
   path_sock      => "$sockdir/slave.sock",
 
965
   port           => $opt_slave_myport,
 
966
   secondary_port => $opt_slave_myport + $secondary_port_offset,
 
967
   start_timeout  => 400,
 
968
   cluster        =>  1, # index in clusters list
 
969
   start_opts     => [],
971
970
  };
972
971
 
973
972
  $slave->[1]=
974
973
  {
975
 
   pid           => 0,
976
 
   type          => "slave",
977
 
   idx           => 1,
978
 
   path_myddir   => "$opt_vardir/slave1-data",
979
 
   path_myerr    => "$opt_vardir/log/slave1.err",
980
 
   path_pid      => "$opt_vardir/run/slave1.pid",
981
 
   path_sock     => "$sockdir/slave1.sock",
982
 
   port          => $opt_slave_myport + 1,
983
 
   mysql_port    => $opt_slave_myport + 1 + $mysql_port_offset,
984
 
   start_timeout => 300,
985
 
   cluster       =>  -1, # index in clusters list
986
 
   start_opts    => [],
 
974
   pid            => 0,
 
975
   type           => "slave",
 
976
   idx            => 1,
 
977
   path_myddir    => "$opt_vardir/slave1-data",
 
978
   path_myerr     => "$opt_vardir/log/slave1.err",
 
979
   path_pid       => "$opt_vardir/run/slave1.pid",
 
980
   path_sock      => "$sockdir/slave1.sock",
 
981
   port           => $opt_slave_myport + 1,
 
982
   secondary_port => $opt_slave_myport + 1 + $secondary_port_offset,
 
983
   start_timeout  => 300,
 
984
   cluster        =>  -1, # index in clusters list
 
985
   start_opts     => [],
987
986
  };
988
987
 
989
988
  $slave->[2]=
990
989
  {
991
 
   pid           => 0,
992
 
   type          => "slave",
993
 
   idx           => 2,
994
 
   path_myddir   => "$opt_vardir/slave2-data",
995
 
   path_myerr    => "$opt_vardir/log/slave2.err",
996
 
   path_pid      => "$opt_vardir/run/slave2.pid",
997
 
   path_sock     => "$sockdir/slave2.sock",
998
 
   port          => $opt_slave_myport + 2,
999
 
   mysql_port    => $opt_slave_myport + 2 + $mysql_port_offset,
1000
 
   start_timeout => 300,
1001
 
   cluster       =>  -1, # index in clusters list
1002
 
   start_opts    => [],
 
990
   pid            => 0,
 
991
   type           => "slave",
 
992
   idx            => 2,
 
993
   path_myddir    => "$opt_vardir/slave2-data",
 
994
   path_myerr     => "$opt_vardir/log/slave2.err",
 
995
   path_pid       => "$opt_vardir/run/slave2.pid",
 
996
   path_sock      => "$sockdir/slave2.sock",
 
997
   port           => $opt_slave_myport + 2,
 
998
   secondary_port => $opt_slave_myport + 2 + $secondary_port_offset,
 
999
   start_timeout  => 300,
 
1000
   cluster        =>  -1, # index in clusters list
 
1001
   start_opts     => [],
1003
1002
  };
1004
1003
 
1005
1004
 
1440
1439
  # ----------------------------------------------------
1441
1440
  my $cmdline_mysqldump= generate_cmdline_mysqldump($master->[0]);
1442
1441
  my $cmdline_mysqldumpslave= generate_cmdline_mysqldump($slave->[0]);
1443
 
  my $cmdline_mysqldumpmysql= mtr_native_path($exe_drizzledump) .
 
1442
  my $cmdline_mysqldump_secondary= mtr_native_path($exe_drizzledump) .
1444
1443
       " --no-defaults -uroot " .
1445
 
       "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1444
       " --port=$master->[0]->{'secondary_port'} ";
1446
1445
 
1447
1446
  if ( $opt_debug )
1448
1447
  {
1450
1449
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace";
1451
1450
    $cmdline_mysqldumpslave .=
1452
1451
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace";
1453
 
    $cmdline_mysqldumpmysql .=
 
1452
    $cmdline_mysqldump_secondary .=
1454
1453
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-mysql.trace";
1455
1454
  }
1456
1455
  $ENV{'DRIZZLE_DUMP'}= $cmdline_mysqldump;
1457
1456
  $ENV{'DRIZZLE_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
1458
 
  $ENV{'DRIZZLE_DUMP_MYSQL'}= $cmdline_mysqldumpmysql;
 
1457
  $ENV{'DRIZZLE_DUMP_SECONDARY'}= $cmdline_mysqldump_secondary;
1459
1458
 
1460
1459
  # ----------------------------------------------------
1461
1460
  # Setup env so childs can execute mysqlslap
1466
1465
      mtr_native_path($exe_drizzleslap) .
1467
1466
      " -uroot " .
1468
1467
      "--port=$master->[0]->{'port'} ";
1469
 
    my $cmdline_drizzleslapmysql=
 
1468
    my $cmdline_drizzleslap_secondary=
1470
1469
      mtr_native_path($exe_drizzleslap) .
1471
1470
      " -uroot " .
1472
 
      "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1471
      " --port=$master->[0]->{'secondary_port'} ";
1473
1472
 
1474
1473
    if ( $opt_debug )
1475
1474
   {
1476
1475
      $cmdline_drizzleslap .=
1477
1476
        " --debug=d:t:A,$path_vardir_trace/log/drizzleslap.trace";
1478
 
      $cmdline_drizzleslapmysql .=
 
1477
      $cmdline_drizzleslap_secondary .=
1479
1478
        " --debug=d:t:A,$path_vardir_trace/log/drizzleslap.trace";
1480
1479
    }
1481
1480
    $ENV{'DRIZZLE_SLAP'}= $cmdline_drizzleslap;
1482
 
    $ENV{'DRIZZLE_SLAP_MYSQL'}= $cmdline_drizzleslapmysql;
 
1481
    $ENV{'DRIZZLE_SLAP_SECONDARY'}= $cmdline_drizzleslap_secondary;
1483
1482
  }
1484
1483
 
1485
1484
 
1507
1506
    mtr_native_path($exe_drizzle) .
1508
1507
    " --no-defaults --host=localhost  --user=root --password= " .
1509
1508
    "--port=$master->[0]->{'port'} ";
1510
 
  my $cmdline_drizzlemysql=
 
1509
  my $cmdline_drizzle_secondary=
1511
1510
    mtr_native_path($exe_drizzle) .
1512
1511
    " --no-defaults --host=localhost  --user=root --password= " .
1513
 
    "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1512
    " --port=$master->[0]->{'secondary_port'} ";
1514
1513
 
1515
1514
  $ENV{'MYSQL'}= $cmdline_mysql;
1516
 
  $ENV{'DRIZZLE_MYSQL'}= $cmdline_drizzlemysql;
 
1515
  $ENV{'DRIZZLE_SECONDARY'}= $cmdline_drizzle_secondary;
1517
1516
 
1518
1517
  # ----------------------------------------------------
1519
1518
  # Setup env so childs can execute bug25714
2480
2479
  # Increase default connect_timeout to avoid intermittent
2481
2480
  # disconnects when test servers are put under load
2482
2481
  # see BUG#28359
2483
 
  mtr_add_arg($args, "%s--drizzle-protocol-connect-timeout=60", $prefix);
 
2482
  mtr_add_arg($args, "%s--mysql-protocol-connect-timeout=60", $prefix);
2484
2483
 
2485
2484
 
2486
2485
  # When mysqld is run by a root user(euid is 0), it will fail
2493
2492
  mtr_add_arg($args, "%s--pid-file=%s", $prefix,
2494
2493
              $mysqld->{'path_pid'});
2495
2494
 
 
2495
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
 
2496
              $mysqld->{'port'});
 
2497
 
2496
2498
  mtr_add_arg($args, "%s--drizzle-protocol-port=%d", $prefix,
2497
 
              $mysqld->{'port'});
2498
 
 
2499
 
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
2500
 
              $mysqld->{'mysql_port'});
 
2499
              $mysqld->{'secondary_port'});
2501
2500
 
2502
2501
  mtr_add_arg($args, "%s--datadir=%s", $prefix,
2503
2502
              $mysqld->{'path_myddir'});