Set NodeEventLoopFactory boot_uuid to logged boot_uuid
Previously, we couldn't replay relogged logfiles because they
did not correctly track the boot uuid from the ServerStatistics message,
which was very unfortunate. Since the goal of replay is to reproduce
the state of the world when we were running, set the simulated boot UUID
to match what was logged.
I still don't seem to be able to fully replay relogged files (see
comments in drivetrain_replay.cc), but I think that those issues are
likely independent of this particular problem and I haven't yet written
a test to conveniently reproduce it.
Change-Id: I121ea4001e6fee7595b4fe1a2b200ffa1ae9bd40
diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index 16fb2ab..56c3bb0 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -30,7 +30,7 @@
constexpr std::string_view kSingleConfigSha1(
"bc8c9c2e31589eae6f0e36d766f6a437643e861d9568b7483106841cf7504dea");
constexpr std::string_view kConfigSha1(
- "0000c81e444ac470b8d29fb864621ae93a0e294a7e90c0dc4840d0f0d40fd72e");
+ "f59be0b208c3feab512abac12720b53166303b382b39806e2beeb46e3b9d2a4a");
class LoggerTest : public ::testing::Test {
public:
@@ -805,6 +805,10 @@
CountChannelsData(config, logfiles_[0]),
UnorderedElementsAre(
std::make_tuple("/pi1/aos", "aos.message_bridge.Timestamp", 200),
+ std::make_tuple("/pi1/aos", "aos.message_bridge.ServerStatistics",
+ 21),
+ std::make_tuple("/pi1/aos", "aos.message_bridge.ClientStatistics",
+ 200),
std::make_tuple("/pi1/aos", "aos.timing.Report", 40),
std::make_tuple("/test", "aos.examples.Ping", 2001)))
<< " : " << logfiles_[0];
@@ -839,6 +843,10 @@
CountChannelsData(config, logfiles_[3]),
UnorderedElementsAre(
std::make_tuple("/pi2/aos", "aos.message_bridge.Timestamp", 200),
+ std::make_tuple("/pi2/aos", "aos.message_bridge.ServerStatistics",
+ 21),
+ std::make_tuple("/pi2/aos", "aos.message_bridge.ClientStatistics",
+ 200),
std::make_tuple("/pi2/aos", "aos.timing.Report", 40),
std::make_tuple("/test", "aos.examples.Pong", 2001)))
<< " : " << logfiles_[3];
@@ -1595,11 +1603,6 @@
std::unique_ptr<EventLoop> pi2_event_loop =
log_reader_factory.MakeEventLoop("test", pi2);
- MessageCounter<RemoteMessage> pi1_original_message_header_counter(
- pi1_event_loop.get(), "/original/aos/remote_timestamps/pi2");
- MessageCounter<RemoteMessage> pi2_original_message_header_counter(
- pi2_event_loop.get(), "/original/aos/remote_timestamps/pi1");
-
aos::Fetcher<message_bridge::Timestamp> pi1_timestamp_on_pi1_fetcher =
pi1_event_loop->MakeFetcher<message_bridge::Timestamp>("/pi1/aos");
aos::Fetcher<message_bridge::Timestamp> pi1_timestamp_on_pi2_fetcher =
@@ -1772,10 +1775,17 @@
log_reader_factory.Run();
}
- EXPECT_EQ(pi2_original_message_header_counter.count(), 0u);
- EXPECT_EQ(pi1_original_message_header_counter.count(), 0u);
-
reader.Deregister();
+
+ // And verify that we can run the LogReader over the relogged files without
+ // hitting any fatal errors.
+ {
+ LogReader relogged_reader(SortParts(
+ MakeLogFiles(tmp_dir_ + "/relogged1", tmp_dir_ + "/relogged2")));
+ relogged_reader.Register();
+
+ relogged_reader.event_loop_factory()->Run();
+ }
}
// Tests that we properly populate and extract the logger_start time by setting