From 94bb4ca4b8f626e579215d5f561321fa898ec968 Mon Sep 17 00:00:00 2001 From: peterwywong <46875219+peterwywong@users.noreply.github.com> Date: Wed, 10 Mar 2021 11:33:08 -0600 Subject: [PATCH] Revert "Modify mysqlsetup and restorexCATdb to examine DB restoration delay" --- xCAT-client/bin/mysqlsetup | 2 +- xCAT-client/sbin/restorexCATdb | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index 63183c9ea..588db7011 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -1965,7 +1965,7 @@ sub restorexcatdb } # restore it - my $cmd = "XCATBYPASS=y XCATCFG=\"$xcatcfg\" restorexCATdb -p $::backupdir > /tmp/test_delay.log"; + my $cmd = "XCATBYPASS=y XCATCFG=\"$xcatcfg\" restorexCATdb -p $::backupdir"; # not display passwords in verbose mode my $tmpv = $::VERBOSE; diff --git a/xCAT-client/sbin/restorexCATdb b/xCAT-client/sbin/restorexCATdb index 881c9628a..512ed46cc 100644 --- a/xCAT-client/sbin/restorexCATdb +++ b/xCAT-client/sbin/restorexCATdb @@ -77,26 +77,9 @@ if (@output2) { @skiptbls = split(/\,/, $output2[0]); } -system("date"); -print "\ndf:\n\n"; -system("df"); -print "\n"; -system("lsblk"); -print "\n"; - -print "meminfo:\n\n"; -system("cat /proc/meminfo"); -print "\n"; - -print "/etc/xcat/cfgloc\n\n"; -system("cat /etc/xcat/cfgloc"); -print "\n"; - my @files = readdir(DIRPATH); foreach my $table (@files) { - system("date"); - print "Table: $table\n\n"; if ($table ne '.' and $table ne '..') { my $tablename = $::PATH;