diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index aff6b8f1a..145c5c010 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -250,7 +250,7 @@ The next steps are: export COLUMNSTORE_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql -$installdir/bin/postConfigure -i $installdir +$installdir/bin/postConfigure --installdir=$installdir EOD else @@ -282,13 +282,13 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps export COLUMNSTORE_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql . $installdir/bin/setenv-hdfs-20 -$installdir/bin/postConfigure -i $installdir +$installdir/bin/postConfigure --installdir=$installdir If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: export COLUMNSTORE_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql -$installdir/bin/postConfigure -i $installdir +$installdir/bin/postConfigure --installdir=$installdir EOD else @@ -321,13 +321,13 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps export COLUMNSTORE_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath . $installdir/bin/setenv-hdfs-12 -$installdir/bin/postConfigure -i $installdir +$installdir/bin/postConfigure --installdir=$installdir If you are intending to install MariaDB Columnstore without Hadoop, the next steps are: export COLUMNSTORE_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql -$installdir/bin/postConfigure -i $installdir +$installdir/bin/postConfigure --installdir=$installdir EOD else diff --git a/oam/install_scripts/rsync.sh b/oam/install_scripts/rsync.sh index 476393eb4..d7d73d2d0 100755 --- a/oam/install_scripts/rsync.sh +++ b/oam/install_scripts/rsync.sh @@ -26,7 +26,7 @@ if { $PASSWORD == "ssh" } { set PASSWORD "" } -set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME$@SERVER:$INSTALLDIR/mysql/db/" +set COMMAND "rsync -vopgr -e ssh --exclude=mysql/ --exclude=test/ --exclude=infinidb_vtable/ --exclude=infinidb_querystats/ --exclude=calpontsys/ --include=*/ --include=*/* --exclude=* $INSTALLDIR/mysql/db/ $USERNAME@$SERVER:$INSTALLDIR/mysql/db/" # # run command diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index c2157bc5d..a0a2d5825 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -491,7 +491,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 ); if ( returnStatus != API_SUCCESS) { - cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl; + cout << endl << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist*.logs on " << masterModule << endl; return returnStatus; } diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index cbeb1da05..50bed8e64 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -336,17 +336,13 @@ int main(int argc, char *argv[]) // for backward compatibility else if( string("-n") == argv[i] ) noPrompting = true; - else if( string("-i") == argv[i] ) { + else if( string("--installdir=") == argv[i] ) { i++; if (i >= argc ) { cout << " ERROR: install dir not provided" << endl; exit (1); } installDir = argv[i]; - if ( installDir.find("-") != string::npos ) { - cout << " ERROR: Valid install dir not provided" << endl; - exit (1); - } } else if( string("-port") == argv[i] ) { i++;