Skip to content

Commit 94094dd

Browse files
committed
Added debug logging to SST to find another bug
View changes keep getting stuck while trying to run signed_log_test.
1 parent 3e64870 commit 94094dd

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

include/derecho/sst/detail/sst_impl.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ void SST<DerivedSST>::put_with_completion(const std::vector<uint32_t> receiver_r
177177
// perform a remote RDMA write on the owner of the row
178178
ce_ctxt[index].set_remote_id(res_vec[index]->remote_id);
179179
ce_ctxt[index].set_ce_idx(ce_idx);
180+
dbg_trace(sst_logger, "Created a CE context for write to row {}: {:p} -> {{ {}, {}, {} }}", index, static_cast<void*>(&ce_ctxt[index]), ce_ctxt[index].ce_idx(), ce_ctxt[index].remote_id(), ce_ctxt[index].is_managed());
180181
res_vec[index]->post_remote_write_with_completion(&ce_ctxt[index], offset, size);
181182
posted_write_to[index] = true;
182183
num_writes_posted++;
@@ -216,6 +217,7 @@ void SST<DerivedSST>::put_with_completion(const std::vector<uint32_t> receiver_r
216217
if (result && result.value() == 1) {
217218
polled_successfully_from[index] = true;
218219
} else {
220+
dbg_debug(sst_logger, "put_with_completion marked row {} failed due to not receiving a completion", index);
219221
failed_node_indexes.push_back(index);
220222
}
221223
}
@@ -264,6 +266,7 @@ void SST<DerivedSST>::sync_with_members() const {
264266
for(auto const& id_index : members_by_id) {
265267
std::tie(node_id, sst_index) = id_index;
266268
if(sst_index != my_index && !row_is_frozen[sst_index]) {
269+
dbg_debug(sst_logger, "TCP sync with node {}, for row {}", node_id, sst_index);
267270
sync(node_id);
268271
}
269272
}
@@ -279,6 +282,7 @@ void SST<DerivedSST>::sync_with_members(std::vector<uint32_t> row_indices) const
279282
continue;
280283
}
281284
if(!row_is_frozen[row_index]) {
285+
dbg_debug(sst_logger, "TCP sync with node {}, for row {}", members[row_index], row_index);
282286
sync(members[row_index]);
283287
}
284288
}

include/derecho/sst/sst.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ class SST {
181181

182182
DerivedSST* derived_this;
183183

184+
/** Pointer to the logger for the SST module, which is created in sst::lf_initialize() */
185+
std::shared_ptr<spdlog::logger> sst_logger;
186+
184187
std::vector<std::thread> background_threads;
185188
std::atomic<bool> thread_shutdown;
186189

@@ -236,6 +239,7 @@ class SST {
236239
public:
237240
SST(DerivedSST* derived_class_pointer, const SSTParams& params)
238241
: derived_this(derived_class_pointer),
242+
sst_logger(spdlog::get(LoggerFactory::SST_LOGGER_NAME)),
239243
thread_shutdown(false),
240244
poll_cq_timeout_ms(derecho::getConfUInt32(derecho::Conf::DERECHO_SST_POLL_CQ_TIMEOUT_MS)),
241245
members(params.members),

src/core/git_version.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace derecho {
1313
const int MAJOR_VERSION = 2;
1414
const int MINOR_VERSION = 4;
1515
const int PATCH_VERSION = 1;
16-
const int COMMITS_AHEAD_OF_VERSION = 8;
16+
const int COMMITS_AHEAD_OF_VERSION = 9;
1717
const char* VERSION_STRING = "2.4.1";
18-
const char* VERSION_STRING_PLUS_COMMITS = "2.4.1+8";
18+
const char* VERSION_STRING_PLUS_COMMITS = "2.4.1+9";
1919

2020
}

0 commit comments

Comments
 (0)