github
/
vitess-gh
зеркало из https://github.com/github/vitess-gh.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

remove non-informative error message that is printed on every restart, cleanup error messages 

Signed-off-by: deepthi <deepthi@planetscale.com>
This commit is contained in:
deepthi 2019-09-13 12:09:05 -07:00
Родитель 2bf60f2154
Коммит dafaae1a90
1 изменённых файлов: 8 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
go/vt/mysqlctl/metadata_tables.go
Просмотреть файл

@ -88,34 +88,32 @@ func PopulateMetadataTables(mysqld MysqlDaemon, localMetadata map[string]string,
}
for _, sql := range sqlAlterLocalMetadataTable {
if _, err := conn.ExecuteFetch(sql, 0, false); err != nil {
if merr, ok := err.(*mysql.SQLError); ok && merr.Num == mysql.ERDupFieldName {
log.Errorf("Expected error executing %v: %v", sql, err)
} else {
log.Errorf("Unexpected error executing %v: %v", sql, err)
// Ignore "Duplicate column name 'db_name'" errors which can happen on every restart.
if merr, ok := err.(*mysql.SQLError); !ok || merr.Num != mysql.ERDupFieldName {
log.Errorf("Error executing %v: %v", sql, err)
return err
}
}
}
sql := fmt.Sprintf(sqlUpdateLocalMetadataTable, dbName)
if _, err := conn.ExecuteFetch(sql, 0, false); err != nil {
log.Errorf("unexpected error executing %v: %v, continuing. Please check the data in _vt.local_metadata and take corrective action", sql, err)
log.Errorf("Error executing %v: %v, continuing. Please check the data in _vt.local_metadata and take corrective action.", sql, err)
}
if _, err := conn.ExecuteFetch(sqlCreateShardMetadataTable, 0, false); err != nil {
return err
}
for _, sql := range sqlAlterShardMetadataTable {
if _, err := conn.ExecuteFetch(sql, 0, false); err != nil {
if merr, ok := err.(*mysql.SQLError); ok && merr.Num == mysql.ERDupFieldName {
log.Errorf("Expected error executing %v: %v", sql, err)
} else {
log.Errorf("Unexpected error executing %v: %v", sql, err)
// Ignore "Duplicate column name 'db_name'" errors which can happen on every restart.
if merr, ok := err.(*mysql.SQLError); !ok || merr.Num != mysql.ERDupFieldName {
log.Errorf("Error executing %v: %v", sql, err)
return err
}
}
}
sql = fmt.Sprintf(sqlUpdateShardMetadataTable, dbName)
if _, err := conn.ExecuteFetch(sql, 0, false); err != nil {
log.Errorf("unexpected error executing %v: %v, continuing. Please check the data in _vt.shard_metadata and take corrective action", sql, err)
log.Errorf("Error executing %v: %v, continuing. Please check the data in _vt.shard_metadata and take corrective action.", sql, err)
}
// Populate local_metadata from the passed list of values.