diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in index 497525433..1202befd3 100755 --- a/oam/install_scripts/columnstore-post-install.in +++ b/oam/install_scripts/columnstore-post-install.in @@ -116,7 +116,6 @@ chmod 777 @ENGINE_LOGDIR@/install installLogDir=@ENGINE_LOGDIR@/install # make sure trace dir is world-writable and sticky -test -d @ENGINE_DATADIR@/data || mkdir -p @ENGINE_DATADIR@/data test -d @ENGINE_DATADIR@/data1/systemFiles/dbrm || mkdir -p @ENGINE_DATADIR@/data1/systemFiles/dbrm test -d @ENGINE_DATADIR@/local || mkdir -p @ENGINE_DATADIR@/local test -d @ENGINE_DATADIR@/data1/systemFiles/dataTransaction || rmdir @ENGINE_DATADIR@/data1/systemFiles/dataTransaction >/dev/null 2>&1 @@ -126,17 +125,10 @@ chmod -R 1755 @ENGINE_DATADIR@/data1/systemFiles >/dev/null 2>&1 chmod 1755 @ENGINE_SYSCONFDIR@/columnstore > /dev/null 2>&1 #create the bulk-load dirs -mkdir -p @ENGINE_DATADIR@/data/bulk/data/import >/dev/null 2>&1 -mkdir -p @ENGINE_DATADIR@/data/bulk/log >/dev/null 2>&1 -mkdir -p @ENGINE_DATADIR@/data/bulk/job >/dev/null 2>&1 -mkdir -p @ENGINE_DATADIR@/data/bulk/rollback >/dev/null 2>&1 -mkdir -p @ENGINE_DATADIR@/data/bulk/tmpjob >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/data/import >/dev/null 2>&1 -mkdir -p @ENGINE_LOGDIR@/data/bulk/log >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/job >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/rollback >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/tmpjob >/dev/null 2>&1 -rm -f @ENGINE_DATADIR@/data/bulk/tmpjob/* >/dev/null 2>&1 rm -f @ENGINE_LOGDIR@/data/bulk/tmpjob/* >/dev/null 2>&1 chmod -R 777 @ENGINE_LOGDIR@/data diff --git a/oam/install_scripts/columnstore-pre-uninstall.in b/oam/install_scripts/columnstore-pre-uninstall.in index 0d481360e..941d9aa7a 100755 --- a/oam/install_scripts/columnstore-pre-uninstall.in +++ b/oam/install_scripts/columnstore-pre-uninstall.in @@ -60,7 +60,6 @@ fi rm -f @ENGINE_DATADIR@/local/*.columnstore rm -rf @ENGINE_DATADIR@/local/etc/ -rm -f @ENGINE_DATADIR@/data/bulk/tmp/job/* >/dev/null 2>&1 rm -f @ENGINE_DATADIR@/local/moveDbrootTransactionLog rm -rf @ENGINE_LOGDIR@ rm -rf /tmp/columnstore_tmp_files diff --git a/oam/install_scripts/columnstoreLogRotate.in b/oam/install_scripts/columnstoreLogRotate.in index 35e806ca7..754018bc4 100644 --- a/oam/install_scripts/columnstoreLogRotate.in +++ b/oam/install_scripts/columnstoreLogRotate.in @@ -18,7 +18,7 @@ copy olddir @ENGINE_SYSCONFDIR@/columnstore } -@ENGINE_DATADIR@/data/bulk/job/*.xml { +@ENGINE_LOGDIR@/data/bulk/job/*.xml { missingok daily rotate 1 @@ -26,7 +26,7 @@ maxage 30 nocreate } -@ENGINE_DATADIR@/data/bulk/log/*.err { +@ENGINE_LOGDIR@/data/bulk/log/*.err { missingok daily rotate 1 @@ -34,7 +34,7 @@ maxage 30 nocreate } -@ENGINE_DATADIR@/data/bulk/log/*.log { +@ENGINE_LOGDIR@/data/bulk/log/*.log { missingok daily rotate 1 diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp index 334e05333..5885a6f78 100644 --- a/tools/dbbuilder/dbbuilder.cpp +++ b/tools/dbbuilder/dbbuilder.cpp @@ -176,9 +176,7 @@ int main(int argc, char* argv[]) return 1; } - //get tmp log directory - tmpDir = startup::StartUp::tmpDir(); - logFile = tmpDir + "/dbbuilder.status"; + logFile = string(MCSLOGDIR) + "/install/dbbuilder.status"; buildOption = atoi(argv[optind++]); diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp index 992f8562f..0042d21c1 100644 --- a/tools/dbloadxml/colxml.cpp +++ b/tools/dbloadxml/colxml.cpp @@ -78,23 +78,6 @@ int main(int argc, char** argv) return -1; } } - - std::ostringstream aSS2; - aSS2 << aBulkRoot; - aSS2 << "/log"; - std::string logDir = aSS2.str(); - - if (!boost::filesystem::exists(logDir.c_str())) - { - cout << "Creating directory : " << logDir << endl; - bool aSuccess = boost::filesystem::create_directories(logDir.c_str()); - - if (!aSuccess) - { - cout << "\nFailed to create directory, please check permissions\n" << endl; - return -1; - } - } } else { diff --git a/writeengine/shared/we_config.cpp b/writeengine/shared/we_config.cpp index 48f35b289..f4d163290 100644 --- a/writeengine/shared/we_config.cpp +++ b/writeengine/shared/we_config.cpp @@ -120,7 +120,7 @@ void Config::checkReload( ) if ( m_bulkRoot.length() == 0 ) { - m_bulkRoot = "/var/lib/columnstore"; + m_bulkRoot = "/var/log/mariadb/columnstore"; #ifndef _MSC_VER m_bulkRoot += "/data"; #endif diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp index e19a42dbe..e7abb9257 100644 --- a/writeengine/splitter/we_cmdargs.cpp +++ b/writeengine/splitter/we_cmdargs.cpp @@ -1494,7 +1494,7 @@ void WECmdArgs::checkJobIdCase() snprintf(aBuff, sizeof(aBuff), "%s/Job_%s.xml", fJobPath.c_str(), fJobId.c_str()); else // for time being - snprintf(aBuff, sizeof(aBuff), "/var/lib/columnstore/data/bulk/job/Job_%s.xml", + snprintf(aBuff, sizeof(aBuff), "/var/log/mariadb/columnstore/data/bulk/job/Job_%s.xml", fJobId.c_str()); std::string aJobFileName(aBuff); @@ -1935,23 +1935,6 @@ void WECmdArgs::checkForBulkLogDir(const std::string& BulkRoot) throw runtime_error("Failed to create job directory, check permissions"); } } - - std::ostringstream aSS2; - aSS2 << BulkRoot; - aSS2 << "/log"; - std::string logDir = aSS2.str(); - - if ( !boost::filesystem::exists(logDir.c_str()) ) - { - cout << "Creating directory : " << logDir << endl; - bool aSuccess = boost::filesystem::create_directories(logDir.c_str()); - - if (!aSuccess) - { - cout << "\nFailed to create bulk log directory, check permissions\n" << endl; - throw runtime_error("Failed to create bulk log directory, check permissions"); - } - } } else {