database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-2022: aws specific options can't use nvme dev names

Browse Source 
Checkpointing a minimal attempt to disable the aws-specific
functionality for new installations.
This commit is contained in:
Patrick LeBlanc
2020-03-11 11:14:44 -04:00
parent d4f0f02958
commit efb97b1415
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oamapps/postConfigure/CMakeLists.txt
View File

@ -65,5 +65,5 @@ install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-
########### next target ############### ########### next target ###############
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

18
oamapps/postConfigure/postConfigure.cpp
View File

@ -316,11 +316,6 @@ int main(int argc, char* argv[])
multi_server_quick_install = true; multi_server_quick_install = true;
noPrompting = true; noPrompting = true;
} }
else if( string("-qa") == argv[i] )
{
amazon_quick_install = true;
noPrompting = true;
}
else if ( string("-f") == argv[i] ) else if ( string("-f") == argv[i] )
nodeps = "--nodeps"; nodeps = "--nodeps";
else if ( string("-o") == argv[i] ) else if ( string("-o") == argv[i] )
@ -460,7 +455,7 @@ int main(int argc, char* argv[])
else else
{ {
cout << " ERROR: Invalid Argument = " << argv[i] << endl; cout << " ERROR: Invalid Argument = " << argv[i] << endl;
cout << " Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-qa][-port][-i][-sn][-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr][-numBlocksPct][-totalUmMemory]" << endl; cout << " Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-port][-i][-sn][-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr][-numBlocksPct][-totalUmMemory]" << endl;
exit (1); exit (1);
} }
} }
@ -1354,6 +1349,7 @@ int main(int argc, char* argv[])
bool amazonInstall = false; bool amazonInstall = false;
string cloud = oam::UnassignedName; string cloud = oam::UnassignedName;
#if 0
if (!multi_server_quick_install) if (!multi_server_quick_install)
{ {
string amazonLog = tmpDir + "/amazon.log"; string amazonLog = tmpDir + "/amazon.log";
@ -1393,6 +1389,7 @@ int main(int argc, char* argv[])
amazonInstall = true; amazonInstall = true;
} }
} }
#endif
try try
{ {
@ -1402,6 +1399,15 @@ int main(int argc, char* argv[])
{ {
cloud = oam::UnassignedName; cloud = oam::UnassignedName;
} }
#if XXXPAT
if (cloud.find("amazon") != string::npos)
{
cout << "AWS-specific functionality has been deprecated for this version." << endl
<< "Please re-run postConfigure without the upgrade option." << endl;
exit(1);
}
#endif
if ( cloud == "disable" ) if ( cloud == "disable" )
amazonInstall = false; amazonInstall = false;