bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subsys/loggin/log_backend_fs: added recovery after file lost

Browse Source 
Added recovery for case when log file was lost somehow.
Back-end will try to create new file if possible.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2021-02-26 18:45:45 +01:00 committed by Anas Nashif
parent 2cbaf01b3a
commit 6b18e6992d
1 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
subsys/logging/log_backend_fs.c
View File

@ -29,6 +29,7 @@ static int file_ctr, newest, oldest;
static int allocate_new_file(struct fs_file_t *file);
static int del_oldest_log(void);
static int get_log_file_id(struct fs_dirent *ent);
static int check_log_dir_available(void)
{
@ -51,6 +52,41 @@ static int check_log_dir_available(void)
return -ENOENT;
}
static int check_log_file_exist(int num)
{
struct fs_dir_t dir;
struct fs_dirent ent;
int rc;
fs_dir_t_init(&dir);
rc = fs_opendir(&dir, CONFIG_LOG_BACKEND_FS_DIR);
if (rc) {
return -EIO;
}
while (1) {
rc = fs_readdir(&dir, &ent);
if (rc < 0) {
(void) fs_closedir(&dir);
return -EIO;
}
if (ent.name[0] == 0) {
break;
}
rc = get_log_file_id(&ent);
if (rc == num) {
return 1;
}
}
(void) fs_closedir(&dir);
return 0;
}
int write_log_to_file(uint8_t *data, size_t length, void *ctx)
{
int rc;
@ -84,18 +120,33 @@ int write_log_to_file(uint8_t *data, size_t length, void *ctx)
}
rc = fs_write(f, data, length);
if (rc == -ENOSPC) {
if (IS_ENABLED(CONFIG_LOG_BACKEND_FS_OVERWRITE)) {
if (rc >= 0) {
if (IS_ENABLED(CONFIG_LOG_BACKEND_FS_OVERWRITE) &&
(rc != length)) {
del_oldest_log();
return 0;
}
/* If overwrite is disabled, full memory
* is equivalent of corrupted backend.
* cause the log record abandonment.
*/
goto on_error;
} else if (rc < 0) {
return 0;
length = rc;
} else {
rc = check_log_file_exist(newest);
if (rc == 0) {
/* file was lost somehow
* try to get a new one
*/
file_ctr--;
rc = allocate_new_file(f);
if (rc < 0) {
goto on_error;
}
} else if (rc < 0) {
/* fs is corrupted*/
goto on_error;
}
length = 0;
}
fs_sync(f);