Skip to content

Commit 5ed212e

Browse files
committed
[opt](rowset) Remote fetch rowsets to avoid -230 error when capturing rowsets (apache#3967)
1 parent ee2f9a6 commit 5ed212e

53 files changed

Lines changed: 1403 additions & 304 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎be/src/cloud/cloud_base_compaction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ Status CloudBaseCompaction::modify_rowsets() {
424424
// the tablet to be unable to synchronize the rowset meta changes generated by cumu compaction.
425425
cloud_tablet()->set_base_compaction_cnt(stats.base_compaction_cnt());
426426
if (output_rowset_delete_bitmap) {
427-
_tablet->tablet_meta()->delete_bitmap().merge(*output_rowset_delete_bitmap);
427+
_tablet->tablet_meta()->delete_bitmap()->merge(*output_rowset_delete_bitmap);
428428
}
429429
if (stats.cumulative_compaction_cnt() >= cloud_tablet()->cumulative_compaction_cnt()) {
430430
cloud_tablet()->reset_approximate_stats(stats.num_rowsets(), stats.num_segments(),

‎be/src/cloud/cloud_cumulative_compaction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ Status CloudCumulativeCompaction::modify_rowsets() {
385385
cloud_tablet()->set_cumulative_compaction_cnt(stats.cumulative_compaction_cnt());
386386
cloud_tablet()->set_cumulative_layer_point(stats.cumulative_point());
387387
if (output_rowset_delete_bitmap) {
388-
_tablet->tablet_meta()->delete_bitmap().merge(*output_rowset_delete_bitmap);
388+
_tablet->tablet_meta()->delete_bitmap()->merge(*output_rowset_delete_bitmap);
389389
}
390390
if (stats.base_compaction_cnt() >= cloud_tablet()->base_compaction_cnt()) {
391391
cloud_tablet()->reset_approximate_stats(stats.num_rowsets(), stats.num_segments(),

‎be/src/cloud/cloud_full_compaction.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "common/status.h"
2727
#include "cpp/sync_point.h"
2828
#include "gen_cpp/cloud.pb.h"
29+
#include "olap/base_tablet.h"
2930
#include "olap/compaction.h"
3031
#include "olap/rowset/beta_rowset.h"
3132
#include "olap/tablet_meta.h"
@@ -273,7 +274,7 @@ Status CloudFullCompaction::modify_rowsets() {
273274
cloud_tablet()->set_base_compaction_cnt(stats.base_compaction_cnt());
274275
cloud_tablet()->set_cumulative_layer_point(stats.cumulative_point());
275276
if (output_rowset_delete_bitmap) {
276-
_tablet->tablet_meta()->delete_bitmap().merge(*output_rowset_delete_bitmap);
277+
_tablet->tablet_meta()->delete_bitmap()->merge(*output_rowset_delete_bitmap);
277278
}
278279
if (stats.cumulative_compaction_cnt() >= cloud_tablet()->cumulative_compaction_cnt()) {
279280
cloud_tablet()->reset_approximate_stats(stats.num_rowsets(), stats.num_segments(),
@@ -340,8 +341,9 @@ Status CloudFullCompaction::_cloud_full_compaction_update_delete_bitmap(int64_t
340341
int64_t max_version = cloud_tablet()->max_version().second;
341342
DCHECK(max_version >= _output_rowset->version().second);
342343
if (max_version > _output_rowset->version().second) {
343-
RETURN_IF_ERROR(cloud_tablet()->capture_consistent_rowsets_unlocked(
344-
{_output_rowset->version().second + 1, max_version}, &tmp_rowsets));
344+
auto ret = DORIS_TRY(cloud_tablet()->capture_consistent_rowsets_unlocked(
345+
{_output_rowset->version().second + 1, max_version}, CaptureRowsetOps {}));
346+
tmp_rowsets = std::move(ret.rowsets);
345347
}
346348
for (const auto& it : tmp_rowsets) {
347349
int64_t cur_version = it->rowset_meta()->start_version();
@@ -372,7 +374,7 @@ Status CloudFullCompaction::_cloud_full_compaction_update_delete_bitmap(int64_t
372374
.tag("input_segments", _input_segments)
373375
.tag("input_rowsets_total_size", _input_rowsets_total_size)
374376
.tag("update_bitmap_size", delete_bitmap->delete_bitmap.size());
375-
_tablet->tablet_meta()->delete_bitmap().merge(*delete_bitmap);
377+
_tablet->tablet_meta()->delete_bitmap()->merge(*delete_bitmap);
376378
return Status::OK();
377379
}
378380

‎be/src/cloud/cloud_meta_mgr.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ Status CloudMetaMgr::sync_tablet_rowsets_unlocked(CloudTablet* tablet,
579579
.error(st);
580580
return st;
581581
}
582-
tablet->tablet_meta()->delete_bitmap().merge(delete_bitmap);
582+
tablet->tablet_meta()->delete_bitmap()->merge(delete_bitmap);
583583
if (config::enable_mow_verbose_log && !resp.rowset_meta().empty() &&
584584
delete_bitmap.cardinality() > 0) {
585585
std::vector<std::string> new_rowset_msgs;
@@ -650,6 +650,7 @@ Status CloudMetaMgr::sync_tablet_rowsets_unlocked(CloudTablet* tablet,
650650
.tag("new_rowsets(rowset,count,cardinality)",
651651
fmt::format("[{}]", fmt::join(new_rowset_msgs, ", ")));
652652
}
653+
>>>>>>> e0302c141c82264f32bd3d533885bd723da9fd95
653654
}
654655
DBUG_EXECUTE_IF("CloudMetaMgr::sync_tablet_rowsets.before.modify_tablet_meta", {
655656
auto target_tablet_id = dp->param<int64_t>("tablet_id", -1);

‎be/src/cloud/cloud_schema_change_job.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "cloud/cloud_meta_mgr.h"
2828
#include "cloud/cloud_tablet_mgr.h"
2929
#include "common/status.h"
30+
#include "olap/base_tablet.h"
3031
#include "olap/delete_handler.h"
3132
#include "olap/olap_define.h"
3233
#include "olap/rowset/beta_rowset.h"
@@ -179,7 +180,7 @@ Status CloudSchemaChangeJob::process_alter_tablet(const TAlterTabletReqV2& reque
179180
reader_context.sequence_id_idx = reader_context.tablet_schema->sequence_col_idx();
180181
reader_context.is_unique = _base_tablet->keys_type() == UNIQUE_KEYS;
181182
reader_context.batch_size = ALTER_TABLE_BATCH_SIZE;
182-
reader_context.delete_bitmap = &_base_tablet->tablet_meta()->delete_bitmap();
183+
reader_context.delete_bitmap = _base_tablet->tablet_meta()->delete_bitmap();
183184
reader_context.version = Version(0, start_resp.alter_version());
184185

185186
for (auto& split : rs_splits) {
@@ -450,7 +451,7 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
450451
.tag("alter_version", alter_version);
451452
RETURN_IF_ERROR(_cloud_storage_engine.register_compaction_stop_token(_new_tablet, initiator));
452453
TabletMetaSharedPtr tmp_meta = std::make_shared<TabletMeta>(*(_new_tablet->tablet_meta()));
453-
tmp_meta->delete_bitmap().delete_bitmap.clear();
454+
tmp_meta->delete_bitmap()->delete_bitmap.clear();
454455
std::shared_ptr<CloudTablet> tmp_tablet =
455456
std::make_shared<CloudTablet>(_cloud_storage_engine, tmp_meta);
456457
{
@@ -459,22 +460,21 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
459460
}
460461

461462
// step 1, process incremental rowset without delete bitmap update lock
462-
std::vector<RowsetSharedPtr> incremental_rowsets;
463463
RETURN_IF_ERROR(_cloud_storage_engine.meta_mgr().sync_tablet_rowsets(tmp_tablet.get()));
464464
int64_t max_version = tmp_tablet->max_version().second;
465465
LOG(INFO) << "alter table for mow table, calculate delete bitmap of "
466466
<< "incremental rowsets without lock, version: " << start_calc_delete_bitmap_version
467467
<< "-" << max_version << " new_table_id: " << _new_tablet->tablet_id();
468468
if (max_version >= start_calc_delete_bitmap_version) {
469-
RETURN_IF_ERROR(tmp_tablet->capture_consistent_rowsets_unlocked(
470-
{start_calc_delete_bitmap_version, max_version}, &incremental_rowsets));
469+
auto ret = DORIS_TRY(tmp_tablet->capture_consistent_rowsets_unlocked(
470+
{start_calc_delete_bitmap_version, max_version}, CaptureRowsetOps {}));
471471
DBUG_EXECUTE_IF("CloudSchemaChangeJob::_process_delete_bitmap.after.capture_without_lock",
472472
DBUG_BLOCK);
473473
{
474474
std::unique_lock wlock(tmp_tablet->get_header_lock());
475475
tmp_tablet->add_rowsets(_output_rowsets, true, wlock);
476476
}
477-
for (auto rowset : incremental_rowsets) {
477+
for (auto rowset : ret.rowsets) {
478478
RETURN_IF_ERROR(CloudTablet::update_delete_bitmap_without_lock(tmp_tablet, rowset));
479479
}
480480
}
@@ -490,15 +490,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
490490
LOG(INFO) << "alter table for mow table, calculate delete bitmap of "
491491
<< "incremental rowsets with lock, version: " << max_version + 1 << "-"
492492
<< new_max_version << " new_tablet_id: " << _new_tablet->tablet_id();
493-
std::vector<RowsetSharedPtr> new_incremental_rowsets;
494493
if (new_max_version > max_version) {
495-
RETURN_IF_ERROR(tmp_tablet->capture_consistent_rowsets_unlocked(
496-
{max_version + 1, new_max_version}, &new_incremental_rowsets));
494+
auto ret = DORIS_TRY(tmp_tablet->capture_consistent_rowsets_unlocked(
495+
{max_version + 1, new_max_version}, CaptureRowsetOps {}));
497496
{
498497
std::unique_lock wlock(tmp_tablet->get_header_lock());
499498
tmp_tablet->add_rowsets(_output_rowsets, true, wlock);
500499
}
501-
for (auto rowset : new_incremental_rowsets) {
500+
for (auto rowset : ret.rowsets) {
502501
RETURN_IF_ERROR(CloudTablet::update_delete_bitmap_without_lock(tmp_tablet, rowset));
503502
}
504503
}
@@ -515,13 +514,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
515514
}
516515
});
517516

518-
auto& delete_bitmap = tmp_tablet->tablet_meta()->delete_bitmap();
517+
auto delete_bitmap = tmp_tablet->tablet_meta()->delete_bitmap();
519518

520519
// step4, store delete bitmap
521520
RETURN_IF_ERROR(_cloud_storage_engine.meta_mgr().update_delete_bitmap(
522-
*_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID, initiator, &delete_bitmap));
521+
*_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID, initiator, delete_bitmap.get()));
523522

524-
_new_tablet->tablet_meta()->delete_bitmap() = delete_bitmap;
523+
auto original_dbm = _new_tablet->tablet_meta()->delete_bitmap();
524+
*original_dbm = std::move(*delete_bitmap);
525525
return Status::OK();
526526
}
527527

‎be/src/cloud/cloud_tablet.cpp‎

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "common/logging.h"
4040
#include "io/cache/block_file_cache_downloader.h"
4141
#include "io/cache/block_file_cache_factory.h"
42+
#include "olap/base_tablet.h"
4243
#include "olap/compaction.h"
4344
#include "olap/cumulative_compaction_time_series_policy.h"
4445
#include "olap/olap_define.h"
@@ -71,49 +72,17 @@ bool CloudTablet::exceed_version_limit(int32_t limit) {
7172
return _approximate_num_rowsets.load(std::memory_order_relaxed) > limit;
7273
}
7374

74-
Status CloudTablet::capture_consistent_rowsets_unlocked(
75-
const Version& spec_version, std::vector<RowsetSharedPtr>* rowsets) const {
76-
Versions version_path;
77-
auto st = _timestamped_version_tracker.capture_consistent_versions(spec_version, &version_path);
78-
if (!st.ok()) {
79-
// Check no missed versions or req version is merged
80-
auto missed_versions = get_missed_versions(spec_version.second);
81-
if (missed_versions.empty()) {
82-
st.set_code(VERSION_ALREADY_MERGED); // Reset error code
83-
}
84-
st.append(" tablet_id=" + std::to_string(tablet_id()));
85-
return st;
86-
}
87-
VLOG_DEBUG << "capture consitent versions: " << version_path;
88-
return _capture_consistent_rowsets_unlocked(version_path, rowsets);
89-
}
90-
9175
Status CloudTablet::capture_rs_readers(const Version& spec_version,
9276
std::vector<RowSetSplits>* rs_splits,
9377
bool skip_missing_version) {
9478
DBUG_EXECUTE_IF("CloudTablet.capture_rs_readers.return.e-230", {
9579
LOG_WARNING("CloudTablet.capture_rs_readers.return e-230").tag("tablet_id", tablet_id());
9680
return Status::Error<false>(-230, "injected error");
9781
});
98-
Versions version_path;
9982
std::shared_lock rlock(_meta_lock);
100-
auto st = _timestamped_version_tracker.capture_consistent_versions(spec_version, &version_path);
101-
if (!st.ok()) {
102-
rlock.unlock(); // avoid logging in lock range
103-
// Check no missed versions or req version is merged
104-
auto missed_versions = get_missed_versions(spec_version.second);
105-
if (missed_versions.empty()) {
106-
st.set_code(VERSION_ALREADY_MERGED); // Reset error code
107-
st.append(" versions are already compacted, ");
108-
}
109-
st.append(" tablet_id=" + std::to_string(tablet_id()));
110-
// clang-format off
111-
LOG(WARNING) << st << '\n' << [this]() { std::string json; get_compaction_status(&json); return json; }();
112-
// clang-format on
113-
return st;
114-
}
115-
VLOG_DEBUG << "capture consitent versions: " << version_path;
116-
return capture_rs_readers_unlocked(version_path, rs_splits);
83+
*rs_splits = DORIS_TRY(capture_rs_readers_unlocked(
84+
spec_version, CaptureRowsetOps {.skip_missing_versions = skip_missing_version}));
85+
return Status::OK();
11786
}
11887

11988
Status CloudTablet::merge_rowsets_schema() {
@@ -1017,7 +986,7 @@ Status CloudTablet::calc_delete_bitmap_for_compaction(
1017986
std::size_t missed_rows_size = 0;
1018987
calc_compaction_output_rowset_delete_bitmap(
1019988
input_rowsets, rowid_conversion, 0, version.second + 1, missed_rows.get(),
1020-
location_map.get(), tablet_meta()->delete_bitmap(), output_rowset_delete_bitmap.get());
989+
location_map.get(), *tablet_meta()->delete_bitmap(), output_rowset_delete_bitmap.get());
1021990
if (missed_rows) {
1022991
missed_rows_size = missed_rows->size();
1023992
if (!allow_delete_in_cumu_compaction) {
@@ -1054,7 +1023,7 @@ Status CloudTablet::calc_delete_bitmap_for_compaction(
10541023

10551024
calc_compaction_output_rowset_delete_bitmap(
10561025
input_rowsets, rowid_conversion, version.second, UINT64_MAX, missed_rows.get(),
1057-
location_map.get(), tablet_meta()->delete_bitmap(), output_rowset_delete_bitmap.get());
1026+
location_map.get(), *tablet_meta()->delete_bitmap(), output_rowset_delete_bitmap.get());
10581027
int64_t t4 = MonotonicMicros();
10591028
if (location_map) {
10601029
RETURN_IF_ERROR(check_rowid_conversion(output_rowset, *location_map));

‎be/src/cloud/cloud_tablet.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ class CloudTablet final : public BaseTablet {
5555
Status capture_rs_readers(const Version& spec_version, std::vector<RowSetSplits>* rs_splits,
5656
bool skip_missing_version) override;
5757

58-
Status capture_consistent_rowsets_unlocked(
59-
const Version& spec_version, std::vector<RowsetSharedPtr>* rowsets) const override;
60-
6158
size_t tablet_footprint() override {
6259
return _approximate_data_size.load(std::memory_order_relaxed);
6360
}

‎be/src/cloud/cloud_tablet_mgr.cpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "cloud/cloud_storage_engine.h"
2626
#include "cloud/cloud_tablet.h"
2727
#include "cloud/config.h"
28+
#include "common/logging.h"
2829
#include "common/status.h"
2930
#include "olap/lru_cache.h"
3031
#include "runtime/memory/cache_policy.h"
@@ -154,7 +155,7 @@ void set_tablet_access_time_ms(CloudTablet* tablet) {
154155
Result<std::shared_ptr<CloudTablet>> CloudTabletMgr::get_tablet(int64_t tablet_id, bool warmup_data,
155156
bool sync_delete_bitmap,
156157
SyncRowsetStats* sync_stats,
157-
bool force_use_cache) {
158+
bool local_only) {
158159
// LRU value type. `Value`'s lifetime MUST NOT be longer than `CloudTabletMgr`
159160
class Value : public LRUCacheValueBase {
160161
public:
@@ -172,12 +173,17 @@ Result<std::shared_ptr<CloudTablet>> CloudTabletMgr::get_tablet(int64_t tablet_i
172173
CacheKey key(tablet_id_str);
173174
auto* handle = _cache->lookup(key);
174175

175-
if (handle == nullptr && force_use_cache) {
176-
return ResultError(
177-
Status::InternalError("failed to get cloud tablet from cache {}", tablet_id));
178-
}
179-
180176
if (handle == nullptr) {
177+
if (local_only) {
178+
LOG(INFO) << "tablet=" << tablet_id
179+
<< "does not exists in local tablet cache, because param local_only=true, "
180+
"treat it as an error";
181+
return ResultError(Status::InternalError(
182+
"tablet={} does not exists in local tablet cache, because param "
183+
"local_only=true, "
184+
"treat it as an error",
185+
tablet_id));
186+
}
181187
if (sync_stats) {
182188
++sync_stats->tablet_meta_cache_miss;
183189
}
@@ -505,7 +511,7 @@ void CloudTabletMgr::get_topn_tablet_delete_bitmap_score(
505511
auto t = tablet_wk.lock();
506512
if (!t) return;
507513
uint64_t delete_bitmap_count =
508-
t.get()->tablet_meta()->delete_bitmap().get_delete_bitmap_count();
514+
t.get()->tablet_meta()->delete_bitmap()->get_delete_bitmap_count();
509515
total_delete_map_count += delete_bitmap_count;
510516
if (delete_bitmap_count > *max_delete_bitmap_score) {
511517
max_delete_bitmap_score_tablet_id = t->tablet_id();

‎be/src/cloud/cloud_tablet_mgr.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ class CloudTabletMgr {
4747
Result<std::shared_ptr<CloudTablet>> get_tablet(int64_t tablet_id, bool warmup_data = false,
4848
bool sync_delete_bitmap = true,
4949
SyncRowsetStats* sync_stats = nullptr,
50+
<<<<<<< HEAD
51+
bool local_only = false);
52+
=======
5053
bool force_use_cache = false);
54+
>>>>>>> e0302c141c82264f32bd3d533885bd723da9fd95
5155

5256
void erase_tablet(int64_t tablet_id);
5357

‎be/src/common/config.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,7 @@ DEFINE_mBool(enable_compaction_pause_on_high_memory, "true");
15171517

15181518
DEFINE_mBool(enable_calc_delete_bitmap_between_segments_concurrently, "false");
15191519

1520+
DEFINE_mBool(enable_fetch_rowsets_from_peer_replicas, "false");
15201521
// the max length of segments key bounds, in bytes
15211522
// ATTENTION: as long as this conf has ever been enabled, cluster downgrade and backup recovery will no longer be supported.
15221523
DEFINE_mInt32(segments_key_bounds_truncation_threshold, "-1");

0 commit comments

Comments
 (0)