database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

changes from 1.0.7

Browse Source
This commit is contained in:
david hill
2017-01-17 15:22:43 -06:00
parent 519ade4d4d
commit 3b39a03416
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
oam/install_scripts/post-install
View File

@@ -231,6 +231,9 @@ if [ $? -eq 0 ]; then
cat /tmp/syslog_install.log cat /tmp/syslog_install.log
fi fi
#backup copy of Alarm Config File
/bin/cp -f $installdir/etc/AlarmConfig.xml $installdir/etc/AlarmConfig.xml.installSave > /dev/null 2>&1
#setup alias commands #setup alias commands
eval userhome=~$user eval userhome=~$user
bashFile=$userhome/.bashrc bashFile=$userhome/.bashrc

1
oam/install_scripts/pre-uninstall
View File

@@ -153,6 +153,7 @@ if [ $quiet != 1 ]; then
#make copy of Columnstore.xml #make copy of Columnstore.xml
/bin/cp -f $installdir/etc/Columnstore.xml $installdir/etc/Columnstore.xml.rpmsave > /dev/null 2>&1 /bin/cp -f $installdir/etc/Columnstore.xml $installdir/etc/Columnstore.xml.rpmsave > /dev/null 2>&1
/bin/cp -f $installdir/mysql/my.cnf $installdir/mysql/my.cnf.rpmsave > /dev/null 2>&1 /bin/cp -f $installdir/mysql/my.cnf $installdir/mysql/my.cnf.rpmsave > /dev/null 2>&1
rm -f $installdir/etc/AlarmConfig.xml.installSave
fi fi
#umount file systems #umount file systems

19
oamapps/postConfigure/postConfigure.cpp
View File

@@ -4248,7 +4248,7 @@ bool storageSetup(bool amazonInstall)
{} {}
if ( UMVolumeSize.empty() || UMVolumeSize == "" || UMVolumeSize == oam::UnassignedName) if ( UMVolumeSize.empty() || UMVolumeSize == "" || UMVolumeSize == oam::UnassignedName)
UMVolumeSize = "10"; UMVolumeSize = minSize;
while(true) while(true)
{ {
@@ -4572,14 +4572,6 @@ bool storageSetup(bool amazonInstall)
} }
cout << endl; cout << endl;
try {
oam.getSystemConfig("PMVolumeSize", PMVolumeSize);
}
catch(...)
{}
if ( PMVolumeSize.empty() || PMVolumeSize == "" || PMVolumeSize == oam::UnassignedName)
PMVolumeSize = "100";
string minSize = "1"; string minSize = "1";
string maxSize = "16384"; string maxSize = "16384";
@@ -4593,6 +4585,15 @@ bool storageSetup(bool amazonInstall)
if (PMVolumeType == "standard") if (PMVolumeType == "standard")
maxSize = "1024"; maxSize = "1024";
try {
oam.getSystemConfig("PMVolumeSize", PMVolumeSize);
}
catch(...)
{}
if ( PMVolumeSize.empty() || PMVolumeSize == "" || PMVolumeSize == oam::UnassignedName)
PMVolumeSize = minSize;
while(true) while(true)
{ {
string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > "; string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > ";