Skip to content

Commit

Permalink
sstables: Don't enforce default max_local_deletion_time value for 'mc…
Browse files Browse the repository at this point in the history
…' files.

Commit cc6c383 has fixed an issue with
incorrectly tracking max_local_deletion_time and the check in
validate_max_local_deletion_time was called to work around old files.

This fix relaxes conditions for enforcing defaut max_local_deletion_time
so that they don't apply to SSTables in 'mc' format because the original
problem has been resolved before 'mc' format have been introduced.

This is needed to be able to read correct values from
Cassandra-generated SSTables that don't have a Scylla.db component.
Its presence or absence is used as an indicator of possibly affected
files.

Signed-off-by: Vladimir Krivopalov <vladimir@scylladb.com>
  • Loading branch information
vkrivopalov committed Dec 6, 2018
1 parent 0b1e642 commit d2dfa2e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sstables/sstables.hh
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ public:
}

bool has_correct_max_deletion_time() const {
return has_scylla_component();
return (_version == sstable_version_types::mc) || has_scylla_component();
}

bool filter_has_key(const key& key) {
Expand Down

0 comments on commit d2dfa2e

Please sign in to comment.