mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-26 11:30:36 +00:00
5cf1a19f3f
"Fixes issues uncovered in longevity test (#2608).
Main problem is that due to time drift scylla_tables.version column
may not get deleted on all nodes doing the schema merge, which will
make some nodes come up with different table schema version than others.
The inconsistency will not heal because scylla_tables doesn't
take part in the schema sync. This is fixed by the last patch.
This will cause nodes to constantly try to sync the schema, which under
some conditions triggers #2617."
* tag 'tgrabiec/fix-table-schema-version-inconsistency-v1' of github.com:scylladb/seastar-dev:
schema_tables: Add scylla_tables to ALL
schema: Make schema_mutations equality consistent with digest
schema_tables: Extract compact_for_schema_digest()
schema_tables: Always drop scylla_tables::version
(cherry picked from commit 937fe80a1a)
114 lines
4.3 KiB
C++
114 lines
4.3 KiB
C++
/*
|
|
* Copyright 2015 ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "schema_mutations.hh"
|
|
#include "canonical_mutation.hh"
|
|
#include "db/schema_tables.hh"
|
|
#include "md5_hasher.hh"
|
|
|
|
schema_mutations::schema_mutations(canonical_mutation columnfamilies,
|
|
canonical_mutation columns,
|
|
bool is_view,
|
|
stdx::optional<canonical_mutation> indices,
|
|
stdx::optional<canonical_mutation> dropped_columns,
|
|
stdx::optional<canonical_mutation> scylla_tables)
|
|
: _columnfamilies(columnfamilies.to_mutation(is_view ? db::schema_tables::views() : db::schema_tables::tables()))
|
|
, _columns(columns.to_mutation(db::schema_tables::columns()))
|
|
, _indices(indices ? stdx::optional<mutation>{indices.value().to_mutation(db::schema_tables::indexes())} : stdx::nullopt)
|
|
, _dropped_columns(dropped_columns ? stdx::optional<mutation>{dropped_columns.value().to_mutation(db::schema_tables::dropped_columns())} : stdx::nullopt)
|
|
, _scylla_tables(scylla_tables ? stdx::optional<mutation>{scylla_tables.value().to_mutation(db::schema_tables::scylla_tables())} : stdx::nullopt)
|
|
{}
|
|
|
|
void schema_mutations::copy_to(std::vector<mutation>& dst) const {
|
|
dst.push_back(_columnfamilies);
|
|
dst.push_back(_columns);
|
|
if (_indices) {
|
|
dst.push_back(_indices.value());
|
|
}
|
|
if (_dropped_columns) {
|
|
dst.push_back(_dropped_columns.value());
|
|
}
|
|
if (_scylla_tables) {
|
|
dst.push_back(_scylla_tables.value());
|
|
}
|
|
}
|
|
|
|
table_schema_version schema_mutations::digest() const {
|
|
if (_scylla_tables) {
|
|
auto rs = query::result_set(*_scylla_tables);
|
|
if (!rs.empty()) {
|
|
auto&& row = rs.row(0);
|
|
if (row.has("version")) {
|
|
auto val = row.get<utils::UUID>("version");
|
|
if (val) {
|
|
return *val;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
md5_hasher h;
|
|
db::schema_tables::feed_hash_for_schema_digest(h, _columnfamilies);
|
|
db::schema_tables::feed_hash_for_schema_digest(h, _columns);
|
|
if (_indices && !_indices.value().partition().empty()) {
|
|
db::schema_tables::feed_hash_for_schema_digest(h, _indices.value());
|
|
}
|
|
if (_dropped_columns && !_dropped_columns.value().partition().empty()) {
|
|
db::schema_tables::feed_hash_for_schema_digest(h, _dropped_columns.value());
|
|
}
|
|
if (_scylla_tables) {
|
|
db::schema_tables::feed_hash_for_schema_digest(h, _scylla_tables.value());
|
|
}
|
|
return utils::UUID_gen::get_name_UUID(h.finalize());
|
|
}
|
|
|
|
static stdx::optional<mutation> compact(const stdx::optional<mutation>& m) {
|
|
if (!m) {
|
|
return m;
|
|
}
|
|
return db::schema_tables::compact_for_schema_digest(*m);
|
|
}
|
|
|
|
static stdx::optional<mutation> compact(const mutation& m) {
|
|
return db::schema_tables::compact_for_schema_digest(m);
|
|
}
|
|
|
|
bool schema_mutations::operator==(const schema_mutations& other) const {
|
|
return compact(_columnfamilies) == compact(other._columnfamilies)
|
|
&& compact(_columns) == compact(other._columns)
|
|
&& compact(_indices) == compact(other._indices)
|
|
&& compact(_dropped_columns) == compact(other._dropped_columns)
|
|
&& compact(_scylla_tables) == compact(other._scylla_tables)
|
|
;
|
|
}
|
|
|
|
bool schema_mutations::operator!=(const schema_mutations& other) const {
|
|
return !(*this == other);
|
|
}
|
|
|
|
bool schema_mutations::live() const {
|
|
return _columnfamilies.live_row_count() > 0 || _columns.live_row_count() > 0;
|
|
}
|
|
|
|
bool schema_mutations::is_view() const {
|
|
return _columnfamilies.schema() == db::schema_tables::views();
|
|
}
|