xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Make xcatprobe xcatmn recognize default SQLite DB

Browse Source
This commit is contained in:
Mark Gurevich 2021-04-13 15:45:15 -04:00
parent aa087c98ef
commit af4507bc31
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/advanced/hierarchy/databases/index.rst
View File

@ -1,6 +1,8 @@
Configure a Database
====================
SQLite
------
xCAT uses the SQLite database (https://www.sqlite.org/) as the default database and it is initialized during xCAT installation of the Management Node. If using Service Nodes, SQLite **cannot** be used because Service Nodes require remote access to the xCAT database. One of the following databases should be used:
* :ref:`mysql_reference_label`

2
docs/source/advanced/hierarchy/databases/mysql_install.rst
View File

@ -82,7 +82,7 @@ Debian/Ubuntu
mysql-server
mysql-common
libdbd-mysql-perl
libmysqlclient18
libmysqlclient*
mysql-client-5*
mysql-client-core-5*
mysql-server-5*

11
xCAT-probe/subcmds/xcatmn
View File

@ -322,7 +322,7 @@ sub check_all_xcat_daemons {
$rst_type = "w" if ($child_pid);
}
}
push @$error_ref, "More Daemon '$daemon' is running";
push @$error_ref, "More than one instance of '$daemon' is running";
$rst = 1;
} elsif ($counter == 0) {
push @$error_ref, "Daemon '$daemon' isn't running";
@ -1310,8 +1310,13 @@ sub check_db_pkgs {
my $cfgloc_file = "/etc/xcat/cfgloc";
if (! -e $cfgloc_file) {
push @$error_ref, "$cfgloc_file does not exist, check xcat installation.";
return 1;
# no $cfgloc_file, check if running with default SQLite
if (-d "/etc/xcat") {
return 0; #Default SQLite
} else {
push @$error_ref, "Can not find $cfgloc_file or /etc/xcat, check xcat database installation.";
return 1;
}
}
my $db_type = `cat $cfgloc_file | awk -F ':' '{print \$1}'`;
chomp($db_type);