From 617a4ed557a8edc21f6dcce4bdd9f74d61b0c8a6 Mon Sep 17 00:00:00 2001
From: Wai Yee Wong <wpeter@us.ibm.com>
Date: Mon, 1 Mar 2021 16:52:37 -0500
Subject: [PATCH] Modify mysqlsetup and restorexCATdb to examine DB restoration
 delay

---
 xCAT-client/bin/mysqlsetup     |  2 +-
 xCAT-client/sbin/restorexCATdb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index 588db7011..63183c9ea 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";
+    my $cmd = "XCATBYPASS=y XCATCFG=\"$xcatcfg\"  restorexCATdb -p $::backupdir > /tmp/test_delay.log";
 
     # not display passwords in verbose mode
     my $tmpv = $::VERBOSE;
diff --git a/xCAT-client/sbin/restorexCATdb b/xCAT-client/sbin/restorexCATdb
index 512ed46cc..881c9628a 100644
--- a/xCAT-client/sbin/restorexCATdb
+++ b/xCAT-client/sbin/restorexCATdb
@@ -77,9 +77,26 @@ 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;