Skip to content

Commit 46e0fb7

Browse files
oleimanoleiman
authored
Merge pull request #29564 from oleiman/chore/noticket/get-exception-in-vlog
chore: Fix many instances of future::get_exception in vlog args
2 parents dc8b30a + 1f71524 commit 46e0fb7

31 files changed

+109
-128
lines changed

‎src/v/cloud_storage/remote_segment.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1749,12 +1749,13 @@ ss::future<bool> hydration_loop_state::materialize() {
17491749
for (size_t i = 0; i < rs.size(); ++i) {
17501750
auto& r = rs[i];
17511751
if (r.failed()) {
1752+
auto ex = r.get_exception();
17521753
vlog(
17531754
_ctxlog.warn,
17541755
"Failed to materialize {} {}: {}",
17551756
_states[i].path_kind,
17561757
_states[i].path,
1757-
r.get_exception());
1758+
ex);
17581759
accum &= false;
17591760
} else {
17601761
accum &= r.get();

‎src/v/cloud_storage/segment_chunk_api.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,8 @@ void segment_chunks::resolve_prefetch_futures() {
204204
vassert(
205205
f.available(), "future not available when resolving prefetches");
206206
if (f.failed()) {
207-
vlog(
208-
_ctxlog.trace,
209-
"failed prefetch download: {}",
210-
f.get_exception());
207+
auto ex = f.get_exception();
208+
vlog(_ctxlog.trace, "failed prefetch download: {}", ex);
211209
}
212210
}
213211
}
@@ -400,10 +398,11 @@ ss::future<> chunk_eviction_strategy::close_files(
400398
auto close_results = co_await ss::when_all(fs.begin(), fs.end());
401399
for (auto& result : close_results) {
402400
if (result.failed()) {
401+
auto ex = result.get_exception();
403402
vlog(
404403
rtc.warn,
405404
"failed to close a chunk file handle during eviction: {}",
406-
result.get_exception());
405+
ex);
407406
}
408407
}
409408
}

‎src/v/cloud_topics/level_one/common/file_io.cc‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ file_io::put_object(object_id oid, staging_file* file, ss::abort_source* as) {
136136
"l1_file_upload",
137137
std::nullopt));
138138
if (result_fut.failed()) {
139-
vlog(
140-
cd_log.warn, "Error uploading file: {}", result_fut.get_exception());
139+
auto ex = result_fut.get_exception();
140+
vlog(cd_log.warn, "Error uploading file: {}", ex);
141141
co_return std::unexpected(io::errc::cloud_op_error);
142142
}
143143
switch (result_fut.get()) {
@@ -187,11 +187,9 @@ file_io::read_object(object_extent extent, ss::abort_source* as) {
187187
std::optional<cloud_io::cache_item_stream>>(
188188
_cache->get_stream(cache_key));
189189
if (stream_fut.failed()) {
190+
auto ex = stream_fut.get_exception();
190191
vlog(
191-
cd_log.warn,
192-
"Error reading from cache for {}: {}",
193-
extent,
194-
stream_fut.get_exception());
192+
cd_log.warn, "Error reading from cache for {}: {}", extent, ex);
195193
co_return std::unexpected(io::errc::file_io_error);
196194
}
197195
auto stream = stream_fut.get();
@@ -203,11 +201,12 @@ file_io::read_object(object_extent extent, ss::abort_source* as) {
203201
cloud_io::space_reservation_guard>(
204202
_cache->reserve_space(extent.size, 1));
205203
if (reservation_fut.failed()) {
204+
auto ex = reservation_fut.get_exception();
206205
vlog(
207206
cd_log.warn,
208207
"Error reserving cache space for download of {}: {}",
209208
extent,
210-
reservation_fut.get_exception());
209+
ex);
211210
co_return std::unexpected(io::errc::file_io_error);
212211
}
213212
cloud_io::try_consume_stream consumer =
@@ -230,11 +229,8 @@ file_io::read_object(object_extent extent, ss::abort_source* as) {
230229
cloud_storage_clients::http_byte_range{
231230
extent.position, extent.position + extent.size - 1}));
232231
if (result_fut.failed()) {
233-
vlog(
234-
cd_log.warn,
235-
"Error downloading object {}: {}",
236-
extent,
237-
result_fut.get_exception());
232+
auto ex = result_fut.get_exception();
233+
vlog(cd_log.warn, "Error downloading object {}: {}", extent, ex);
238234
co_return std::unexpected(io::errc::cloud_op_error);
239235
}
240236
switch (result_fut.get()) {
@@ -267,10 +263,8 @@ file_io::delete_objects(chunked_vector<object_id> ids, ss::abort_source* as) {
267263
std::ignore = retry_count;
268264
}));
269265
if (result_fut.failed()) {
270-
vlog(
271-
cd_log.warn,
272-
"Error deleting objects: {}",
273-
result_fut.get_exception());
266+
auto ex = result_fut.get_exception();
267+
vlog(cd_log.warn, "Error deleting objects: {}", ex);
274268
co_return std::unexpected(io::errc::cloud_op_error);
275269
}
276270
switch (result_fut.get()) {

‎src/v/cloud_topics/level_one/metastore/replicated_metastore.cc‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -920,11 +920,8 @@ replicated_metastore::flush() {
920920
auto reply_fut = co_await ss::coroutine::as_future(
921921
fe_.flush_domain(std::move(req)));
922922
if (reply_fut.failed()) {
923-
vlog(
924-
cd_log.warn,
925-
"Error flushing partition {}: {}",
926-
pid,
927-
reply_fut.get_exception());
923+
auto ex = reply_fut.get_exception();
924+
vlog(cd_log.warn, "Error flushing partition {}: {}", pid, ex);
928925
co_return std::unexpected(errc::transport_error);
929926
}
930927
auto reply = reply_fut.get();
@@ -1037,11 +1034,8 @@ replicated_metastore::restore(const cloud_storage::remote_label& source_label) {
10371034
auto reply_fut = co_await ss::coroutine::as_future(
10381035
fe_.restore_domain(std::move(req)));
10391036
if (reply_fut.failed()) {
1040-
vlog(
1041-
cd_log.warn,
1042-
"Error restoring partition {}: {}",
1043-
pid,
1044-
reply_fut.get_exception());
1037+
auto ex = reply_fut.get_exception();
1038+
vlog(cd_log.warn, "Error restoring partition {}: {}", pid, ex);
10451039
co_return std::unexpected(errc::transport_error);
10461040
}
10471041
auto reply = reply_fut.get();

‎src/v/cloud_topics/level_zero/batcher/batcher.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,8 @@ ss::future<std::expected<std::monostate, errc>> batcher<Clock>::run_once(
178178
_cluster_services->current_epoch(&_as));
179179

180180
if (epoch_fut.failed()) {
181-
vlog(
182-
_logger.warn,
183-
"Failed to get cluster epoch: {}",
184-
epoch_fut.get_exception());
181+
auto ex = epoch_fut.get_exception();
182+
vlog(_logger.warn, "Failed to get cluster epoch: {}", ex);
185183
while (!list.requests.empty()) {
186184
auto& wr = list.requests.back();
187185
wr.set_value(errc::failed_to_get_epoch);
@@ -271,10 +269,8 @@ ss::future<> batcher<Clock>::bg_controller_loop() {
271269
bool complete = list.complete;
272270

273271
if (units_fut.failed()) {
274-
vlog(
275-
_logger.info,
276-
"Batcher upload loop is shutting down: {}",
277-
units_fut.get_exception());
272+
auto ex = units_fut.get_exception();
273+
vlog(_logger.info, "Batcher upload loop is shutting down: {}", ex);
278274
co_return;
279275
}
280276
auto units = std::move(units_fut.get());

‎src/v/cloud_topics/level_zero/gc/level_zero_gc.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,8 @@ class level_zero_gc::list_delete_worker {
124124
auto u_fut = co_await ss::coroutine::as_future(
125125
seastar::get_units(delete_sem_, 1, as_));
126126
if (u_fut.failed()) {
127-
vlog(
128-
cd_log.debug,
129-
"Failed to get units in delete worker: {}",
130-
u_fut.get_exception());
127+
auto ex = u_fut.get_exception();
128+
vlog(cd_log.debug, "Failed to get units in delete worker: {}", ex);
131129
co_return;
132130
}
133131
if (gate_.is_closed()) {

‎src/v/cloud_topics/level_zero/reader/fetch_request_handler.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ ss::future<> fetch_handler::process_single_request(l0::read_request<>* req) {
116116
req->rtc_logger));
117117

118118
if (extent.failed()) {
119+
auto ex = extent.get_exception();
119120
vlog(
120121
req->rtc_logger.warn,
121122
"Failed to materialize placeholders, error: {}",
122-
extent.get_exception());
123+
ex);
123124
req->set_value(errc::download_failure);
124125
auto_dispose.cancel();
125126
co_return;

‎src/v/cloud_topics/level_zero/write_request_scheduler/tests/write_request_scheduler_test.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,8 @@ static ss::future<size_t> write_until_threshold(
216216
bool failure = false;
217217
for (auto& r : results) {
218218
if (r.failed()) {
219-
vlog(
220-
test_log.error,
221-
"Unexpected write failure: {}",
222-
r.get_exception());
219+
auto ex = r.get_exception();
220+
vlog(test_log.error, "Unexpected write failure: {}", ex);
223221
failure = true;
224222
}
225223
}

‎src/v/cluster/archival/archiver_manager.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,10 @@ struct managed_partition_fsm
435435
next.reset_units.has_value(), "Reset units are not acquired");
436436
auto completion = [&fsm](ss::future<> fut) {
437437
if (fut.failed()) {
438+
auto ex = fut.get_exception();
438439
vlog(
439-
fsm._ctxlog.error,
440-
"ntp_archiver shutdown failed {}",
441-
fut.get_exception());
442-
fsm.process_event(
443-
ev_archiver_failure{.error = fut.get_exception()});
440+
fsm._ctxlog.error, "ntp_archiver shutdown failed {}", ex);
441+
fsm.process_event(ev_archiver_failure{.error = ex});
444442
} else {
445443
fsm.process_event(ev_archiver_stopped{});
446444
}

‎src/v/cluster/archival/ntp_archiver_service.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,8 @@ ss::future<> ntp_archiver::upload_index(
16811681
_conf->bucket_name, cloud_storage_clients::object_key{path}, index, rtc));
16821682

16831683
if (fut.failed()) {
1684-
vlog(ctxlog.warn, "Index upload failed: {}", fut.get_exception());
1684+
auto ex = fut.get_exception();
1685+
vlog(ctxlog.warn, "Index upload failed: {}", ex);
16851686
}
16861687
}
16871688

@@ -2097,7 +2098,8 @@ ntp_archiver::schedule_uploads(std::vector<upload_context> loop_contexts) {
20972098
inflight_uploads.begin(), inflight_uploads.end());
20982099
for (auto& f : futs) {
20992100
if (f.failed()) {
2100-
vlog(_rtclog.warn, "Upload failed: {}", f.get_exception());
2101+
auto ex = f.get_exception();
2102+
vlog(_rtclog.warn, "Upload failed: {}", ex);
21012103
}
21022104
}
21032105
std::rethrow_exception(ep);

0 commit comments

Comments
 (0)