Skip to content

Commit

Permalink
Revert "Re-add partition manifest logging"
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnwat authored Dec 12, 2024
1 parent 1d386b6 commit 5378aec
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 24 deletions.
24 changes: 7 additions & 17 deletions src/v/cloud_storage/partition_manifest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2033,18 +2033,15 @@ ss::future<iobuf> partition_manifest::serialize_buf() const {
return ss::make_ready_future<iobuf>(to_iobuf());
}

void partition_manifest::serialize_json(
std::ostream& out, bool include_segments) const {
void partition_manifest::serialize_json(std::ostream& out) const {
serialization_cursor_ptr c = make_cursor(out);
serialize_begin(c);
if (include_segments) {
while (!c->segments_done) {
serialize_segments(c);
}
serialize_replaced(c);
while (!c->spillover_done) {
serialize_spillover(c);
}
while (!c->segments_done) {
serialize_segments(c);
}
serialize_replaced(c);
while (!c->spillover_done) {
serialize_spillover(c);
}
serialize_end(c);
}
Expand Down Expand Up @@ -2713,11 +2710,4 @@ void partition_manifest::process_anomalies(
_last_scrubbed_offset);
}

std::ostream& operator<<(std::ostream& o, const partition_manifest& pm) {
o << "{manifest: ";
pm.serialize_json(o, false);
o << "; last segment: " << pm.last_segment() << "}";
return o;
}

} // namespace cloud_storage
4 changes: 1 addition & 3 deletions src/v/cloud_storage/partition_manifest.h
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ class partition_manifest : public base_manifest {
/// Serialize manifest object
///
/// \param out output stream that should be used to output the json
void serialize_json(std::ostream& out, bool include_segments = true) const;
void serialize_json(std::ostream& out) const;

// Serialize the manifest to an ss::output_stream in JSON format
/// \param out output stream to serialize into; must be kept alive
Expand Down Expand Up @@ -700,6 +700,4 @@ class partition_manifest : public base_manifest {
model::offset _applied_offset;
};

std::ostream& operator<<(std::ostream& o, const partition_manifest& f);

} // namespace cloud_storage
4 changes: 0 additions & 4 deletions src/v/cluster/partition_recovery_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,6 @@ ss::future<log_recovery_result> partition_downloader::download_log() {
_ntpc.get_revision(),
retention);
auto mat = co_await find_recovery_material();
vlog(
_ctxlog.debug,
"Partition manifest used for recovery: {}",
mat.partition_manifest);
if (mat.partition_manifest.size() == 0) {
// If the downloaded manifest doesn't have any segments
log_recovery_result result{
Expand Down

0 comments on commit 5378aec

Please sign in to comment.