Skip to content

Commit 5a3b466

Browse files
committed
fix delete predicate bug when cooldown (apache#317)
1 parent 2ae395e commit 5a3b466

6 files changed

Lines changed: 46 additions & 26 deletions

File tree

‎be/src/agent/task_worker_pool.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,7 @@ void TaskWorkerPool::_update_tablet_meta_worker_thread_callback() {
874874
} else {
875875
LOG(INFO) << "set tablet cooldown resource "
876876
<< tablet_meta_info.storage_policy;
877-
tablet->tablet_meta()->set_cooldown_resource(
878-
tablet_meta_info.storage_policy);
877+
tablet->tablet_meta()->set_storage_policy(tablet_meta_info.storage_policy);
879878
}
880879
break;
881880
}

‎be/src/olap/base_compaction.cpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,26 @@ Status BaseCompaction::pick_rowsets_to_compact() {
9090
RETURN_NOT_OK(check_version_continuity(_input_rowsets));
9191
RETURN_NOT_OK(_check_rowset_overlapping(_input_rowsets));
9292

93+
// If there are delete predicate rowsets in tablet, start_version > 0 implies some rowsets before
94+
// delete version cannot apply these delete predicates, which can cause incorrect query result.
95+
// So we must abort this base compaction.
96+
// A typical scenario is that some rowsets before cumulative point are on remote storage.
97+
if (_input_rowsets.front()->start_version() > 0) {
98+
bool has_delete_predicate = false;
99+
for (const auto& rs : _input_rowsets) {
100+
if (rs->rowset_meta()->has_delete_predicate()) {
101+
has_delete_predicate = true;
102+
break;
103+
}
104+
}
105+
if (has_delete_predicate) {
106+
LOG(WARNING)
107+
<< "Some rowsets cannot apply delete predicates in base compaction. tablet_id="
108+
<< _tablet->tablet_id();
109+
return Status::OLAPInternalError(OLAP_ERR_BE_NO_SUITABLE_VERSION);
110+
}
111+
}
112+
93113
if (_input_rowsets.size() == 2 && _input_rowsets[0]->end_version() == 1) {
94114
// the tablet is with rowset: [0-1], [2-y]
95115
// and [0-1] has no data. in this situation, no need to do base compaction.

‎be/src/olap/base_tablet.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#pragma once
1919

2020
#include <memory>
21+
#include <string>
2122

2223
#include "olap/olap_define.h"
2324
#include "olap/tablet_meta.h"
@@ -59,10 +60,10 @@ class BaseTablet : public std::enable_shared_from_this<BaseTablet> {
5960
int16_t shard_id() const;
6061
bool equal(int64_t tablet_id, int32_t schema_hash);
6162

62-
const io::ResourceId& cooldown_resource() const { return _tablet_meta->cooldown_resource(); }
63+
const std::string& storage_policy() const { return _tablet_meta->storage_policy(); }
6364

64-
void set_cooldown_resource(io::ResourceId resource) {
65-
_tablet_meta->set_cooldown_resource(std::move(resource));
65+
void set_storage_policy(std::string policy) {
66+
_tablet_meta->set_storage_policy(std::move(policy));
6667
}
6768

6869
// properties encapsulated in TabletSchema

‎be/src/olap/tablet.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,10 +1101,8 @@ void Tablet::pick_candidate_rowsets_to_cumulative_compaction(
11011101

11021102
void Tablet::pick_candidate_rowsets_to_base_compaction(vector<RowsetSharedPtr>* candidate_rowsets) {
11031103
std::shared_lock rdlock(_meta_lock);
1104-
// FIXME(cyx): If there are delete predicate rowsets in tablet,
1105-
// remote rowsets cannot apply these delete predicate, which can cause
1106-
// incorrect query result.
11071104
for (auto& it : _rs_version_map) {
1105+
// Do compaction on local rowsets only.
11081106
if (it.first.first < _cumulative_point && it.second->is_local()) {
11091107
candidate_rowsets->push_back(it.second);
11101108
}
@@ -1659,7 +1657,7 @@ Status Tablet::cooldown() {
16591657
LOG(WARNING) << "Failed to own cumu_compaction_lock. tablet=" << tablet_id();
16601658
return Status::OLAPInternalError(OLAP_ERR_BE_TRY_BE_LOCK_ERROR);
16611659
}
1662-
auto dest_fs = io::FileSystemMap::instance()->get(cooldown_resource());
1660+
auto dest_fs = io::FileSystemMap::instance()->get(storage_policy());
16631661
if (!dest_fs) {
16641662
return Status::OLAPInternalError(OLAP_ERR_NOT_INITED);
16651663
}
@@ -1694,7 +1692,7 @@ Status Tablet::cooldown() {
16941692
new_rowset_meta->set_fs(dest_fs);
16951693
new_rowset_meta->set_creation_time(time(nullptr));
16961694
RowsetSharedPtr new_rowset;
1697-
RowsetFactory::create_rowset(&_schema, _tablet_path, std::move(new_rowset_meta), &new_rowset);
1695+
RowsetFactory::create_rowset(&_schema, _tablet_path, new_rowset_meta, &new_rowset);
16981696

16991697
std::vector to_add {std::move(new_rowset)};
17001698
std::vector to_delete {std::move(old_rowset)};
@@ -1705,6 +1703,10 @@ Status Tablet::cooldown() {
17051703
has_shutdown = tablet_state() == TABLET_SHUTDOWN;
17061704
if (!has_shutdown) {
17071705
modify_rowsets(to_add, to_delete);
1706+
if (new_rowset_meta->has_delete_predicate()) {
1707+
add_delete_predicate(new_rowset_meta->delete_predicate(),
1708+
new_rowset_meta->start_version());
1709+
}
17081710
_self_owned_remote_rowsets.insert(to_add.front());
17091711
save_meta();
17101712
}
@@ -1737,13 +1739,13 @@ RowsetSharedPtr Tablet::pick_cooldown_rowset() {
17371739

17381740
bool Tablet::need_cooldown(int64_t* cooldown_timestamp, size_t* file_size) {
17391741
// std::shared_lock meta_rlock(_meta_lock);
1740-
if (cooldown_resource().empty()) {
1742+
if (storage_policy().empty()) {
17411743
VLOG_DEBUG << "tablet does not need cooldown, tablet id: " << tablet_id();
17421744
return false;
17431745
}
1744-
auto policy = ExecEnv::GetInstance()->storage_policy_mgr()->get(cooldown_resource());
1746+
auto policy = ExecEnv::GetInstance()->storage_policy_mgr()->get(storage_policy());
17451747
if (!policy) {
1746-
LOG(WARNING) << "Cannot get storage policy: " << cooldown_resource();
1748+
LOG(WARNING) << "Cannot get storage policy: " << storage_policy();
17471749
return false;
17481750
}
17491751
auto cooldown_ttl_sec = policy->cooldown_ttl;

‎be/src/olap/tablet_meta.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ TabletMeta::TabletMeta(const TabletMeta& b)
197197
_preferred_rowset_type(b._preferred_rowset_type),
198198
_remote_storage_name(b._remote_storage_name),
199199
_storage_medium(b._storage_medium),
200-
_cooldown_resource(b._cooldown_resource) {};
200+
_storage_policy(b._storage_policy) {};
201201

202202
void TabletMeta::_init_column_from_tcolumn(uint32_t unique_id, const TColumn& tcolumn,
203203
ColumnPB* column) {
@@ -455,7 +455,7 @@ void TabletMeta::init_from_pb(const TabletMetaPB& tablet_meta_pb) {
455455

456456
_remote_storage_name = tablet_meta_pb.remote_storage_name();
457457
_storage_medium = tablet_meta_pb.storage_medium();
458-
_cooldown_resource = tablet_meta_pb.storage_policy();
458+
_storage_policy = tablet_meta_pb.storage_policy();
459459
}
460460

461461
void TabletMeta::to_meta_pb(TabletMetaPB* tablet_meta_pb) {
@@ -504,7 +504,7 @@ void TabletMeta::to_meta_pb(TabletMetaPB* tablet_meta_pb) {
504504

505505
tablet_meta_pb->set_remote_storage_name(_remote_storage_name);
506506
tablet_meta_pb->set_storage_medium(_storage_medium);
507-
tablet_meta_pb->set_storage_policy(_cooldown_resource);
507+
tablet_meta_pb->set_storage_policy(_storage_policy);
508508
}
509509

510510
uint32_t TabletMeta::mem_size() const {
@@ -721,7 +721,7 @@ bool operator==(const TabletMeta& a, const TabletMeta& b) {
721721
if (a._preferred_rowset_type != b._preferred_rowset_type) return false;
722722
if (a._storage_medium != b._storage_medium) return false;
723723
if (a._remote_storage_name != b._remote_storage_name) return false;
724-
if (a._cooldown_resource != b._cooldown_resource) return false;
724+
if (a._storage_policy != b._storage_policy) return false;
725725
return true;
726726
}
727727

‎be/src/olap/tablet_meta.h‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
#include "common/logging.h"
2727
#include "gen_cpp/olap_file.pb.h"
28-
#include "io/fs/file_system.h"
2928
#include "olap/delete_handler.h"
3029
#include "olap/olap_common.h"
3130
#include "olap/olap_define.h"
@@ -187,16 +186,16 @@ class TabletMeta {
187186

188187
StorageMediumPB storage_medium() const { return _storage_medium; }
189188

190-
const io::ResourceId& cooldown_resource() const {
189+
const std::string& storage_policy() const {
191190
std::shared_lock<std::shared_mutex> rlock(_meta_lock);
192-
return _cooldown_resource;
191+
return _storage_policy;
193192
}
194193

195-
void set_cooldown_resource(io::ResourceId resource) {
194+
void set_storage_policy(std::string policy) {
196195
std::unique_lock<std::shared_mutex> wlock(_meta_lock);
197-
VLOG_NOTICE << "set tablet_id : " << _table_id << " cooldown resource from "
198-
<< _cooldown_resource << " to " << resource;
199-
_cooldown_resource = std::move(resource);
196+
VLOG_NOTICE << "set tablet_id : " << _table_id << " storage policy from " << _storage_policy
197+
<< " to " << policy;
198+
_storage_policy = std::move(policy);
200199
}
201200

202201
private:
@@ -236,8 +235,7 @@ class TabletMeta {
236235
std::string _remote_storage_name;
237236
StorageMediumPB _storage_medium = StorageMediumPB::HDD;
238237

239-
// FIXME(cyx): Currently `cooldown_resource` is equivalent to `storage_policy`.
240-
io::ResourceId _cooldown_resource;
238+
std::string _storage_policy;
241239

242240
mutable std::shared_mutex _meta_lock;
243241
};

0 commit comments

Comments
 (0)