Home / Browse / xCAT / Mail / Archive

xCAT

Email Archive: xcat-commit (read-only)

[Xcat-commit] SF.net SVN: xcat:[8532] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2010-12-30 12:25

Revision: 8532
          http://xcat.svn.sourceforge.net/xcat/?rev=8532&view=rev
Author:   lissav
Date:     2010-12-30 12:25:27 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
fix defect 3145930 mysqlsetup retoring when no dump taken

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2010-12-30 10:23:21 UTC (rev 8531)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2010-12-30 12:25:27 UTC (rev 8532)
@@ -337,19 +337,19 @@
         # create cfgloc file
         #
         &createcfgloc;
-    }
 
-    #
-    # Restore backed up database into MySQL
-    #
-    &restorexcatdb;
+        #
+        # Restore backed up database into MySQL
+        #
+        &restorexcatdb;
 
-    if ($::osname eq 'AIX')
-    {
-        xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
-    } else {
-        xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
-    } 
+        if ($::osname eq 'AIX')
+        {
+          xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
+        } else {
+          xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
+        } 
+    }
 
 }    # end initialization
 
@@ -1584,7 +1584,6 @@
 
 }
 
-#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 
@@ -1602,28 +1601,25 @@
 
     # copy the mysql cfgloc file
     my $cmd;
-    if ($::xcatrunningmysql == 0)
-    {    # xcat cfgloc not configured
 
-        # if they had an old cfgloc on another database, save it
-        if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
-        {
+    # if they had an old cfgloc on another database, save it
+    if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
+    {
             $cmd = "cp /etc/xcat/cfgloc /etc/xcat/cfgloc.olddb";
             xCAT::Utils->runcmd($cmd, 0);
             if ($::RUNCMD_RC != 0)
             {
                 xCAT::MsgUtils->message("E", " $cmd failed.");
             }
-        }
+    }
 
-        # put in place cfgloc for mysql
-        $cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
-        {
+    # put in place cfgloc for mysql
+    $cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
+    xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+    {
             xCAT::MsgUtils->message("E", " $cmd failed.");
             exit(1);
-        }
     }
 
     # allow readonly by root


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Xcat-commit] SF.net SVN: xcat:[7981] xcat-core/trunk/xCAT-client/bin/mysqlsetup	<lissav@us...>

[Xcat-commit] SF.net SVN: xcat:[8532] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2010-12-30 12:25

Revision: 8532
          http://xcat.svn.sourceforge.net/xcat/?rev=8532&view=rev
Author:   lissav
Date:     2010-12-30 12:25:27 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
fix defect 3145930 mysqlsetup retoring when no dump taken

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2010-12-30 10:23:21 UTC (rev 8531)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2010-12-30 12:25:27 UTC (rev 8532)
@@ -337,19 +337,19 @@
         # create cfgloc file
         #
         &createcfgloc;
-    }
 
-    #
-    # Restore backed up database into MySQL
-    #
-    &restorexcatdb;
+        #
+        # Restore backed up database into MySQL
+        #
+        &restorexcatdb;
 
-    if ($::osname eq 'AIX')
-    {
-        xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
-    } else {
-        xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
-    } 
+        if ($::osname eq 'AIX')
+        {
+          xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
+        } else {
+          xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
+        } 
+    }
 
 }    # end initialization
 
@@ -1584,7 +1584,6 @@
 
 }
 
-#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 
@@ -1602,28 +1601,25 @@
 
     # copy the mysql cfgloc file
     my $cmd;
-    if ($::xcatrunningmysql == 0)
-    {    # xcat cfgloc not configured
 
-        # if they had an old cfgloc on another database, save it
-        if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
-        {
+    # if they had an old cfgloc on another database, save it
+    if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
+    {
             $cmd = "cp /etc/xcat/cfgloc /etc/xcat/cfgloc.olddb";
             xCAT::Utils->runcmd($cmd, 0);
             if ($::RUNCMD_RC != 0)
             {
                 xCAT::MsgUtils->message("E", " $cmd failed.");
             }
-        }
+    }
 
-        # put in place cfgloc for mysql
-        $cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
-        {
+    # put in place cfgloc for mysql
+    $cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
+    xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+    {
             xCAT::MsgUtils->message("E", " $cmd failed.");
             exit(1);
-        }
     }
 
     # allow readonly by root


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[8791] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2011-02-06 12:27

Revision: 8791
          http://xcat.svn.sourceforge.net/xcat/?rev=8791&view=rev
Author:   lissav
Date:     2011-02-06 12:26:59 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
fix so you can migrate from DB2 or Pgsql to MySQL

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-02-06 11:35:12 UTC (rev 8790)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-02-06 12:26:59 UTC (rev 8791)
@@ -257,7 +257,10 @@
     }
 
     &backupxcatdb;
+    # shutdown the xcatd daemon while migrating
+    &shutdownxcatd;
 
+
     #
     #  Get MN name from site.master in backed up database
     # if that does not exist use resolved hostname
@@ -549,9 +552,38 @@
     }
 
 }
+#-----------------------------------------------------------------------------
 
+=head3    shutdownxcatd 
+	
+  shutdown the daemon 
+
+=cut
+
 #-----------------------------------------------------------------------------
 
+sub shutdownxcatd
+
+{
+    my $msg = "Shutting down the xcatd daemon during database migration.";
+    xCAT::MsgUtils->message('I', "$msg");
+    my $xcmd;
+    if ($::osname eq 'AIX')
+    {
+        $xcmd = "stopsrc -s xcatd";
+
+    }
+    else
+    {
+        $xcmd = "service xcatd stop";
+    }
+    system($xcmd);
+}
+
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+
 =head3   fixinstall 
 	
         If AIX, Fixes ownership and permssion on install 
@@ -1625,6 +1657,15 @@
     # allow readonly by root
     chmod 0600, "/etc/xcat/cfgloc";
 
+    # set the env variable for Table.pm for the new database 
+    my $xcatcfg;
+    my $cfgl;
+    open($cfgl,"<","/etc/xcat/cfgloc");
+    $xcatcfg = <$cfgl>;
+    close($cfgl);
+    chomp($xcatcfg);
+    $ENV{'XCATCFG'}=$xcatcfg;
+
     # restore the database
     xCAT::MsgUtils->message(
         "I",
@@ -1638,7 +1679,7 @@
     }
 
     # restore it
-    my $cmd = "XCATBYPASS=1 restorexCATdb -p $::backupdir";
+    my $cmd = "XCATBYPASS=y XCATCFG=\"$xcatcfg\"  restorexCATdb -p $::backupdir";
     xCAT::Utils->runcmd($cmd, 0);
     if ($::RUNCMD_RC != 0)
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[10249] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2011-08-09 12:51

Revision: 10249
          http://xcat.svn.sourceforge.net/xcat/?rev=10249&view=rev
Author:   lissav
Date:     2011-08-09 12:51:44 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
change nofiles limit

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-08-09 12:50:59 UTC (rev 10248)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-08-09 12:51:44 UTC (rev 10249)
@@ -475,7 +475,7 @@
             print LIMITSTMP "        data= -1\n";
             print LIMITSTMP "        rss= -1\n";
             print LIMITSTMP "        stack= -1\n";
-            print LIMITSTMP "        nofiles= -1\n";
+            print LIMITSTMP "        nofiles= 102400\n";
             print LIMITSTMP "\n";
             $rootstanza = 1;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[10655] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2011-09-28 11:26

Revision: 10655
          http://xcat.svn.sourceforge.net/xcat/?rev=10655&view=rev
Author:   lissav
Date:     2011-09-28 11:26:02 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
fix bad message

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-09-28 11:25:23 UTC (rev 10654)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2011-09-28 11:26:02 UTC (rev 10655)
@@ -186,7 +186,7 @@
         if ($::INIT)
         {
             my $message =
-              "The /opt/xcat/cfgloc file is already configured for MySQL. xcat database initialization will not take place.";
+              "The /etc/xcat/cfgloc file is already configured for MySQL. xcat database initialization will not take place.";
             xCAT::MsgUtils->message("I", "$message");
         }
         $::xcatrunningmysql = 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[12317] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <sjing@us...> - 2012-04-24 02:00

Revision: 12317
          http://xcat.svn.sourceforge.net/xcat/?rev=12317&view=rev
Author:   sjing
Date:     2012-04-24 02:00:50 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
the fix for bug 3364300 - not display passwords in xcat commands or logs.

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-04-24 01:59:41 UTC (rev 12316)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-04-24 02:00:50 UTC (rev 12317)
@@ -973,8 +973,12 @@
     {
         $cmd = "/usr/bin/mysqladmin -u root password $::rootpassword";
     }
+
+    # secure passwd in verbose mode
+    my $tmpv = $::VERBOSE;
+    $::VERBOSE = 0;
     xCAT::Utils->runcmd($cmd, 0);
-
+    $::VERBOSE = $tmpv;
     if ($::RUNCMD_RC != 0)
     {
         xCAT::MsgUtils->message(
@@ -1549,14 +1553,18 @@
         my $entry =
           "[xCATDB]\nSERVER =$server\nDATABASE = xcatdb\nUSER     = xcatadmin\nPASSWORD = $passwd";
         $cmd = "echo \"$entry\" >> $rootodbcfile";
+        # secure passwd in verbose mode
+        my $tmpv = $::VERBOSE;
+        $::VERBOSE = 0;        
         xCAT::Utils->runcmd($cmd, 0);
         if ($::RUNCMD_RC != 0)
         {
-            $message = "$cmd failed. Could not setup root ODBC file.";
+            $message = "command failed. Could not setup root ODBC file.";
             xCAT::MsgUtils->message("E", "$message");
             exit(1);
 
         }
+        $::VERBOSE = $tmpv;
     }
     else
     {    # entry already there
@@ -1602,14 +1610,19 @@
     my $mysqlentry =
       "mysql:dbname=xcatdb;host=$::MN|xcatadmin|$::adminpassword";
     $cmd = "echo \"$mysqlentry\" > $cfglocmysql";
+
+    # secure passwd in verbose mode
+    my $tmpv = $::VERBOSE;
+    $::VERBOSE = 0;    
     xCAT::Utils->runcmd($cmd, 0);
     if ($::RUNCMD_RC != 0)
     {
-        $message = "$cmd failed. Could not setup cfgloc.mysql";
+        $message = "command failed. Could not setup cfgloc.mysql";
         xCAT::MsgUtils->message("E", "$message");
         exit(1);
 
     }
+    $::VERBOSE = $tmpv;
 
     # allow readonly by root
     chmod 0600, $cfglocmysql;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[12769] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2012-05-17 17:19

Revision: 12769
          http://xcat.svn.sourceforge.net/xcat/?rev=12769&view=rev
Author:   lissav
Date:     2012-05-17 17:19:13 +0000 (Thu, 17 May 2012)
Log Message:
-----------
fix defect 3526288 

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-05-17 17:18:05 UTC (rev 12768)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-05-17 17:19:13 UTC (rev 12769)
@@ -1012,10 +1012,10 @@
     my $mysql_prompt = 'mysql> ';
     my $expect_log   = undef;
     my $debug        = 0;
-    if ($::VERBOSE)
-    {
-        $debug = 1;
-    }
+    #if ($::VERBOSE)
+    #{
+    #    $debug = 1;
+    #}
     $mysql = new Expect;
     my $createuser =
       "CREATE USER xcatadmin IDENTIFIED BY \'$::adminpassword\';\r";
@@ -1132,10 +1132,10 @@
     my $mysql_prompt = 'mysql> ';
     my $expect_log   = undef;
     my $debug        = 0;
-    if ($::VERBOSE)
-    {
-        $debug = 1;
-    }
+    #if ($::VERBOSE)
+    #{
+    #    $debug = 1;
+    #}
     $mysql = new Expect;
     my $setLLfunction =
       "SET GLOBAL log_bin_trust_function_creators=1;\r";
@@ -1241,10 +1241,10 @@
 {
     my @hosts;
     my $debug = 0;
-    if ($::VERBOSE)
-    {
-        $debug = 1;
-    }
+    #if ($::VERBOSE)
+    #{
+    #    $debug = 1;
+    #}
 
     open(HOSTFILE, "<$::HOSTFILE")
       or

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xcat-commit] SF.net SVN: xcat:[12907] xcat-core/trunk/xCAT-client/bin/mysqlsetup

From: <lissav@us...> - 2012-05-23 13:57

Revision: 12907
          http://xcat.svn.sourceforge.net/xcat/?rev=12907&view=rev
Author:   lissav
Date:     2012-05-23 13:57:15 +0000 (Wed, 23 May 2012)
Log Message:
-----------
fixed hardcoded admin id

Modified Paths:
--------------
    xcat-core/trunk/xCAT-client/bin/mysqlsetup

Modified: xcat-core/trunk/xCAT-client/bin/mysqlsetup
===================================================================
--- xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-05-23 08:32:31 UTC (rev 12906)
+++ xcat-core/trunk/xCAT-client/bin/mysqlsetup	2012-05-23 13:57:15 UTC (rev 12907)
@@ -1551,7 +1551,7 @@
     if ($::RUNCMD_RC != 0)    # then xcat entry not there
     {
         my $entry =
-          "[xCATDB]\nSERVER =$server\nDATABASE = xcatdb\nUSER     = xcatadmin\nPASSWORD = $passwd";
+          "[xCATDB]\nSERVER =$server\nDATABASE = xcatdb\nUSER     = $adminid\nPASSWORD = $passwd";
         $cmd = "echo \"$entry\" >> $rootodbcfile";
         # secure passwd in verbose mode
         my $tmpv = $::VERBOSE;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.