milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #586 from yhmo/0.6.0 

#561 Milvus server should report exception/error message or terminate
pull/593/head
Jin Hai 2019-11-28 15:22:39 +08:00 committed by GitHub
parent 53ab0bc1a5 05655580c1
commit 2780da6858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#533 - NSG build failed with MetricType Inner Product
- \#543 - client raise exception in shards when search results is empty
- \#545 - Avoid dead circle of build index thread when error occurs
- \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error
## Feature
- \#12 - Pure CPU version for Milvus

65
core/src/db/meta/MySQLMetaImpl.cpp
View File

@ -290,45 +290,50 @@ MySQLMetaImpl::Initialize() {
// step 4: validate to avoid open old version schema
ValidateMetaSchema();
// step 5: create meta tables
try {
if (mode_ != DBOptions::MODE::CLUSTER_READONLY) {
CleanUpShadowFiles();
}
// step 5: clean shadow files
if (mode_ != DBOptions::MODE::CLUSTER_READONLY) {
CleanUpShadowFiles();
}
{
mysqlpp::ScopedConnection connectionPtr(*mysql_connection_pool_, safe_grab_);
// step 6: try connect mysql server
mysqlpp::ScopedConnection connectionPtr(*mysql_connection_pool_, safe_grab_);
if (connectionPtr == nullptr) {
return Status(DB_ERROR, "Failed to connect to meta server(mysql)");
}
if (connectionPtr == nullptr) {
std::string msg = "Failed to connect MySQL meta server: " + uri;
ENGINE_LOG_ERROR << msg;
throw Exception(DB_INVALID_META_URI, msg);
}
if (!connectionPtr->thread_aware()) {
ENGINE_LOG_ERROR << "MySQL++ wasn't built with thread awareness! Can't run without it.";
return Status(DB_ERROR, "MySQL++ wasn't built with thread awareness! Can't run without it.");
}
mysqlpp::Query InitializeQuery = connectionPtr->query();
if (!connectionPtr->thread_aware()) {
std::string msg =
"Failed to initialize MySQL meta backend: MySQL client component wasn't built with thread awareness";
ENGINE_LOG_ERROR << msg;
throw Exception(DB_INVALID_META_URI, msg);
}
InitializeQuery << "CREATE TABLE IF NOT EXISTS " << TABLES_SCHEMA.name() << " ("
<< TABLES_SCHEMA.ToString() + ");";
// step 7: create meta table Tables
mysqlpp::Query InitializeQuery = connectionPtr->query();
ENGINE_LOG_DEBUG << "MySQLMetaImpl::Initialize: " << InitializeQuery.str();
InitializeQuery << "CREATE TABLE IF NOT EXISTS " << TABLES_SCHEMA.name() << " (" << TABLES_SCHEMA.ToString() + ");";
if (!InitializeQuery.exec()) {
return HandleException("Initialization Error", InitializeQuery.error());
}
ENGINE_LOG_DEBUG << "MySQLMetaImpl::Initialize: " << InitializeQuery.str();
InitializeQuery << "CREATE TABLE IF NOT EXISTS " << TABLEFILES_SCHEMA.name() << " ("
<< TABLEFILES_SCHEMA.ToString() + ");";
if (!InitializeQuery.exec()) {
std::string msg = "Failed to create meta table 'Tables' in MySQL";
ENGINE_LOG_ERROR << msg;
throw Exception(DB_META_TRANSACTION_FAILED, msg);
}
ENGINE_LOG_DEBUG << "MySQLMetaImpl::Initialize: " << InitializeQuery.str();
// step 8: create meta table TableFiles
InitializeQuery << "CREATE TABLE IF NOT EXISTS " << TABLEFILES_SCHEMA.name() << " ("
<< TABLEFILES_SCHEMA.ToString() + ");";
if (!InitializeQuery.exec()) {
return HandleException("Initialization Error", InitializeQuery.error());
}
} // Scoped Connection
} catch (std::exception& e) {
return HandleException("GENERAL ERROR DURING INITIALIZATION", e.what());
ENGINE_LOG_DEBUG << "MySQLMetaImpl::Initialize: " << InitializeQuery.str();
if (!InitializeQuery.exec()) {
std::string msg = "Failed to create meta table 'TableFiles' in MySQL";
ENGINE_LOG_ERROR << msg;
throw Exception(DB_META_TRANSACTION_FAILED, msg);
}
return Status::OK();