fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-28 05:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

logger: restart on file write error

Browse Source 
This can also happen if the maximum file size is reached.
This commit is contained in:
Beat Küng
2023-03-29 08:19:43 +02:00
parent ea61d74c17
commit f119cca3b3
6 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/logger.cpp
+46 -29
View File
@@ -887,6 +887,8 @@ void Logger::run()
was_started = false;
}
handle_file_write_error();
update_params();
// wait for next loop iteration...
@@ -1117,8 +1119,8 @@ bool Logger::start_stop_logging()
if (_vehicle_status_sub.update(&vehicle_status)) {
desired_state = (vehicle_status.arming_state == vehicle_status_s::ARMING_STATE_ARMED) || (_prev_state
&& _log_mode == LogMode::arm_until_shutdown);
desired_state = (vehicle_status.arming_state == vehicle_status_s::ARMING_STATE_ARMED) ||
(_prev_file_log_start_state && _log_mode == LogMode::arm_until_shutdown);
updated = true;
}
}
@@ -1126,8 +1128,8 @@ bool Logger::start_stop_logging()
desired_state = desired_state || _manually_logging_override;
// only start/stop if this is a state transition
if (updated && _prev_state != desired_state) {
_prev_state = desired_state;
if (updated && _prev_file_log_start_state != desired_state) {
_prev_file_log_start_state = desired_state;
if (desired_state) {
if (_should_stop_file_log) { // happens on quick stop/start toggling
@@ -1394,6 +1396,7 @@ void Logger::start_log_file(LogType type)
}
PX4_INFO("Start file log (type: %s)", log_type_str(type));
_statistics[(int) type].start_time_file = 0;
char file_name[LOG_DIR_LEN] = "";
@@ -1409,35 +1412,36 @@ void Logger::start_log_file(LogType type)
_param_sdlog_crypto_exchange_key.get());
#endif
_writer.start_log_file(type, file_name);
_writer.select_write_backend(LogWriter::BackendFile);
_writer.set_need_reliable_transfer(true);
if (_writer.start_log_file(type, file_name)) {
_writer.select_write_backend(LogWriter::BackendFile);
_writer.set_need_reliable_transfer(true);
write_header(type);
write_version(type);
write_formats(type);
write_header(type);
write_version(type);
write_formats(type);
if (type == LogType::Full) {
write_parameters(type);
write_parameter_defaults(type);
write_perf_data(PrintLoadReason::Preflight);
write_console_output();
write_events_file(LogType::Full);
write_excluded_optional_topics(type);
if (type == LogType::Full) {
write_parameters(type);
write_parameter_defaults(type);
write_perf_data(PrintLoadReason::Preflight);
write_console_output();
write_events_file(LogType::Full);
write_excluded_optional_topics(type);
}
write_all_add_logged_msg(type);
_writer.set_need_reliable_transfer(false);
_writer.unselect_write_backend();
_writer.notify();
if (type == LogType::Full) {
/* reset performance counters to get in-flight min and max values in post flight log */
perf_reset_all();
}
_statistics[(int) type].start_time_file = hrt_absolute_time();
}
write_all_add_logged_msg(type);
_writer.set_need_reliable_transfer(false);
_writer.unselect_write_backend();
_writer.notify();
if (type == LogType::Full) {
/* reset performance counters to get in-flight min and max values in post flight log */
perf_reset_all();
}
_statistics[(int)type].start_time_file = hrt_absolute_time();
}
void Logger::stop_log_file(LogType type)
@@ -1513,6 +1517,19 @@ struct perf_callback_data_t {
char *buffer;
};
void Logger::handle_file_write_error()
{
// Check for write errors, but do not immediately retry
if (_writer.had_file_write_error() && !_writer.is_started(LogType::Full, LogWriter::BackendFile)
&& _prev_file_log_start_state) {
if (_statistics[(int)LogType::Full].start_time_file != 0
&& hrt_absolute_time() > _statistics[(int)LogType::Full].start_time_file + 10_s) {
PX4_DEBUG("Restarting due to write failure");
start_log_file(LogType::Full);
}
}
}
void Logger::perf_iterate_callback(perf_counter_t handle, void *user)
{
perf_callback_data_t *callback_data = (perf_callback_data_t *)user;